diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 57748e9e..b8c7afbf 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -4,17 +4,15 @@ + ending + proper save/settings file location + descriptions for all items when used on self. -+ alternate solutions to puzzle in jail (strength potion etc) ++ mark the squeaky board a bit + Antique shop dialogue + Have a gag that is that the room is dark + Have to open curtains + "Specialty lava mints, hand delivered by Gandarf!" -+ sometimes you can walk on stuff (like gandarf's door) ++ Update all collisions + + Should be able to put back or give back antique shops stuff -+ putting out the candle in jail -+ lighting the hay on fire in jail -+ mark the squeaky board a bit + you can drink the strength potion while in blood clots hand + try to have dialogue for every wrong interaction diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 01a460da..0258f240 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -135,6 +135,7 @@ (actions/do-dialogue entities :ego "What's this?" :ego "Hello hello!" :ego "It's the key!") + (actions/give entities :key) (actions/do-dialogue entities :ego "Come on! It's that easy to escape?" :ego "We're not going to at least do that dog and bone scenario?" :ego "I get to just take the key and leave?" @@ -315,7 +316,7 @@ (get-in entities [:room :entities :ego :right :walk])} (get-in entities [:room :entities :ego :anim]))] (if is-walking? (let [entities (-> entities - (update-in [:actions] #(assoc % :channel (chan) :current nil :started? false)) + (update-in [:actions] #(assoc % :channel (chan) :current nil :started? false :script-running? false)) (update-in [:room :entities :ego] #(actions/start-animation screen % :stand)))] ((actions/get-script entities (actions/stop-walking entities :ego)