notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added cards.

Browse Source
This commit is contained in:
Remington Covert
2014-10-27 07:24:33 -07:00
parent 85500c3e77
commit af9f8fbd1e
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/cursor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

3
desktop/src-common/advent/screens/items.clj
View File

@@ -24,3 +24,6 @@
(actions/remove-item entities flask-1) (actions/remove-item entities flask-1)
(actions/give entities flask-1-with-mushrooms) (actions/give entities flask-1-with-mushrooms)
(actions/talk entities :ego "I'll just put a few of these in here."))}}) (actions/talk entities :ego "I'll just put a few of these in here."))}})
(def cards {:name "Warlock's Tower cards" :value :cards :cursor :cards})
(def cheat-deck {:name "Warlock's Tower cheat deck" :value :cheat-deck :cursor :cheat-deck})

3
desktop/src-common/advent/screens/scene.clj
View File

@@ -11,6 +11,7 @@
[advent.zone :as zone] [advent.zone :as zone]
[advent.utils :as utils] [advent.utils :as utils]
[advent.screens.rooms :as rooms] [advent.screens.rooms :as rooms]
[advent.screens.items :as items]
[advent.screens.rooms.outside-house :as rooms.outside-house] [advent.screens.rooms.outside-house :as rooms.outside-house]
[advent.screens.rooms.inside-house :as rooms.inside-house] [advent.screens.rooms.inside-house :as rooms.inside-house]
[advent.screens.rooms.inside-castle :as rooms.inside-castle] [advent.screens.rooms.inside-castle :as rooms.inside-castle]
@@ -163,7 +164,7 @@
{:rooms rooms {:rooms rooms
:state {:object nil :state {:object nil
:active? true :active? true
:inventory []} :inventory [items/cheat-deck items/cards]}
:actions {:object nil :actions {:object nil
:channel (chan) :channel (chan)
:current nil :current nil

2
desktop/src-common/advent/utils.clj
View File

@@ -11,7 +11,7 @@
(let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})] (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
(println (:input-x screen) (:input-y screen) "->" x y))) (println (:input-x screen) (:input-y screen) "->" x y)))
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents]) (def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck])
(defn cursor [filename which] (defn cursor [filename which]
(let [scale 2 (let [scale 2