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

more minor bug fixes.

Browse Source
This commit is contained in:
Remington Covert
2014-11-02 08:03:33 -08:00
parent 862dfc158e
commit 2b7e957f28
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/outside-castle/steer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

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

@@ -5,6 +5,7 @@
(declare stick)
(declare wool)
(declare cat-toy)
(declare flask-1-with-milk)
(def make-cat-toy
(actions/get-script entities
(actions/remove-item entities stick)
@@ -20,19 +21,22 @@
(def flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents})
(defn make-cream-of-mushroom-from [from]
(defn make-cream-of-mushroom []
(actions/get-script entities
(actions/remove-item entities from)
(actions/remove-item entities flask-1-with-mushrooms)
(actions/remove-item entities flask-1-with-milk)
(actions/remove-item entities mushrooms)
(actions/give entities flask-1-with-cream-of-mushroom)
(actions/talk entities :ego "It's just like cream of mushroom soup.")))
(def flask-1-with-milk {:name "Flask with milk" :value :flask-1-with-milk :cursor :flask-with-contents
:scripts {:mushrooms (make-cream-of-mushroom-from flask-1-with-milk)}})
:scripts {:mushrooms (make-cream-of-mushroom)}})
(def flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-contents})
(def flask-1 {:name "Flask" :value :flask-1 :cursor :flask
:scripts {:mushrooms (actions/get-script entities
(actions/remove-item entities flask-1)
(actions/remove-item entities mushrooms)
(actions/give entities flask-1-with-mushrooms)
(actions/talk entities :ego "I'll just put a few of these in here."))}})

2
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -187,7 +187,7 @@
(actions/give entities items/flask-1-with-milk)
(actions/talk entities :ego "Sheeps milk."))
(actions/talk entities :ego "She's too far away.")))
items/flask-1-with-mushrooms (items/make-cream-of-mushroom-from items/flask-1-with-mushrooms)}
items/flask-1-with-mushrooms (items/make-cream-of-mushroom)}
:left {:walk (utils/flip sheep-walk)
:stand (utils/flip sheep-stand)}
:right {:walk sheep-walk