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

bug fix tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2015-09-04 23:09:17 -07:00
parent c268e683f2
commit 967175ed0c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
desktop/src-common/advent/screens/rooms/castle_gate.clj
View File

@@ -74,10 +74,10 @@
:frankie "What?!" :frankie "What?!"
:frankie "Impossible!") :frankie "Impossible!")
(actions/play-animation entities :frankie :laugh) (actions/play-animation entities :frankie :laugh)
(actions/update-state entities (fn [s] (assoc s :bubba-gone? true)))
(actions/do-dialogue entities :frankie "Bubba, go check to make sure our stuff is safe." (actions/do-dialogue entities :frankie "Bubba, go check to make sure our stuff is safe."
:goon-2 "You got it boss.") :goon-2 "You got it boss.")
(actions/walk-straight-to entities :goon-2 [0 100]) (actions/walk-straight-to entities :goon-2 [0 100]))}
(actions/update-state entities (fn [s] (assoc s :bubba-gone? true))))}
"Nevermind." "Nevermind."
{:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]})) {:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]}))
@@ -202,7 +202,7 @@
(actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search) (actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search)
(actions/talk entities :ego "Umm, sorry!")) (actions/talk entities :ego "Umm, sorry!"))
(do (do
(actions/do-dialogue entities :ego "Hey Bubba!" (actions/do-dialogue entities :ego "Hi Bubba."
:goon-2 "Beat it, Dipstick.")))) :goon-2 "Beat it, Dipstick."))))
:scripts {:money (actions/get-script entities :scripts {:money (actions/get-script entities
(actions/do-dialogue entities :ego "I don't want to give it back!")) (actions/do-dialogue entities :ego "I don't want to give it back!"))
@@ -221,7 +221,10 @@
(defn flip-coin [screen entities] (defn flip-coin [screen entities]
(if (and (= 0 (rand-int 2)) (if (and (= 0 (rand-int 2))
(not (get-in entities [:state :has-dropped-coin?]))) (not (get-in entities [:state :has-dropped-coin?]))
(not (get-in entities [:state :bubba-gone?]))
(= (get-in entities [:room :entities :goon-2 :anim])
(get-in entities [:room :entities :goon-2 :stand])))
(-> entities (-> entities
(update-in [:room :entities :coin-flip] (fn [cf] (-> (actions/start-animation screen cf :coinflip) (update-in [:room :entities :coin-flip] (fn [cf] (-> (actions/start-animation screen cf :coinflip)
(assoc :opacity 1.0)))) (assoc :opacity 1.0))))

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

@@ -224,6 +224,7 @@
:ego "No, not the Slinger's Shot!" :ego "No, not the Slinger's Shot!"
:frankie "Look like we hit the jackpot tonight boys!") :frankie "Look like we hit the jackpot tonight boys!")
(frankie-comment-on-item entities) (frankie-comment-on-item entities)
(actions/update-state entities #(assoc % :bubba-gone? true))
(actions/do-dialogue entities (actions/do-dialogue entities
:frankie "Bubba, put this stuff in the secret stash." :frankie "Bubba, put this stuff in the secret stash."
:goon-2 "You got it boss.") :goon-2 "You got it boss.")
@@ -238,7 +239,6 @@
(actions/remove-item entities :medal) (actions/remove-item entities :medal)
(actions/remove-item entities :trophy) (actions/remove-item entities :trophy)
(actions/remove-item entities :slingshot) (actions/remove-item entities :slingshot)
(actions/update-state entities #(assoc % :bubba-gone? true))
(actions/walk-to entities :ego [181 79]) (actions/walk-to entities :ego [181 79])
(actions/do-dialogue entities (actions/do-dialogue entities