many many bug fixes.
This commit is contained in:
@@ -25,6 +25,8 @@
|
||||
(assoc (animation->texture screen coin-flip)
|
||||
:x 212 :y 114 :baseline 151
|
||||
:opacity 0.0
|
||||
:label "Coin"
|
||||
:cursor :hand
|
||||
:origin-x 5
|
||||
:origin-y 5
|
||||
:night-profile :none
|
||||
@@ -42,6 +44,8 @@
|
||||
(let [stand (utils/make-anim "castle-gate/goon-1.png" [13 33] 0.21 [0 0 0 0 0 0 0 0 0 1])]
|
||||
(assoc (animation->texture screen stand)
|
||||
:x 244 :y 102 :baseline 138
|
||||
:label "Goon"
|
||||
:cursor :talk
|
||||
:scale-x 1.4
|
||||
:scale-y 1.4
|
||||
:night-profile :sprite
|
||||
@@ -61,6 +65,8 @@
|
||||
:scale-y 1.4
|
||||
:origin-x 6
|
||||
:origin-y 0
|
||||
:label "Bubba"
|
||||
:cursor :talk
|
||||
:anim stand
|
||||
:talk talk
|
||||
:flip flip
|
||||
@@ -127,6 +133,7 @@
|
||||
(actions/walk-to entities :ego [245 90] :skip-type :end))
|
||||
|
||||
(defn flip-coin [screen entities]
|
||||
(println "here")
|
||||
(if (and (= 0 (rand-int 2))
|
||||
(not (get-in entities [:state :has-dropped-coin?]))
|
||||
(not (get-in entities [:state :bubba-gone?]))
|
||||
@@ -182,6 +189,8 @@
|
||||
|
||||
(defn make-note []
|
||||
{:box [97 102 111 132]
|
||||
:label "Note"
|
||||
:cursor :look
|
||||
:script (actions/get-script entities
|
||||
(look-at-note entities))
|
||||
:scripts {:charcoal (actions/get-script entities
|
||||
@@ -207,6 +216,8 @@
|
||||
:cursor :left}
|
||||
|
||||
:window {:box [192 157 215 215]
|
||||
:label "Window"
|
||||
:cursor :look
|
||||
:script (actions/get-script entities
|
||||
(actions/talk entities :ego "That's a big window!"))
|
||||
:scripts {:walkie-talkies (actions/get-script entities
|
||||
@@ -260,8 +271,7 @@
|
||||
|
||||
(if (and (not (actions/has-obtained? entities :money))
|
||||
(get-in entities [:state :has-dropped-coin?]))
|
||||
(do
|
||||
(update-in entities [:room :entities :coin-flip] assoc :x 185 :y 44 :opacity 1.0))
|
||||
(do (update-in entities [:room :entities :coin-flip] assoc :x 185 :y 44 :opacity 1.0))
|
||||
entities)
|
||||
(if (actions/has-obtained? entities :money)
|
||||
(update-in entities [:room :entities] dissoc :coin-flip)
|
||||
|
||||
Reference in New Issue
Block a user