diff --git a/desktop/fight-blergh.edn b/desktop/fight-blergh.edn index 2e6d8e53..648e7343 100644 --- a/desktop/fight-blergh.edn +++ b/desktop/fight-blergh.edn @@ -1 +1 @@ -{:active? true, :seen-bloodclot? true :convinced-wizard? true, :time :day, :inventory [:ladder :glass-eye :recipe :grass :medal :kiss :trophy :flask-1-strength :sword], :wizard-left? false, :clues #{}, :current-riddle :wool, :last-room :space, :wants-toy true, :mints-eaten 0, :object nil, :obtained-items #{:kiss :medal :sword :flask-1 :grass :ladder :trophy}} +{:active? true, :seen-intro? true :seen-bloodclot? true :convinced-wizard? true, :time :day, :inventory [:ladder :glass-eye :recipe :grass :medal :kiss :trophy :flask-1-strength :sword], :wizard-left? false, :clues #{}, :current-riddle :wool, :last-room :space, :wants-toy true, :mints-eaten 0, :object nil, :obtained-items #{:kiss :medal :sword :flask-1 :grass :ladder :trophy}} diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 43e76097..51807e51 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -3,7 +3,6 @@ + drool icon + loop sounds update every frame instead of each play + shitty plates -+ better gross-out animation + sudden night befoe switching + too small area for bars + more visible crowbar diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 47a7f4f5..e31abf62 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -14,11 +14,11 @@ [play-clj.g2d :refer :all])) (defn go-to-jail [entities] - (actions/update-state entities #(assoc % :time :night)) + (actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key :ladder} (:inventory %)) (:chest-contents %)))) (actions/update-state entities #(assoc % :inventory [])) (actions/update-state entities #(assoc % :opened-bars? false)) - (actions/transition-background entities :inside-jail [130 85])) + (actions/transition-background entities :inside-jail [130 85] :between #(assoc-in %2 [:state :time] :night))) (defn make-wizard [screen wizard-spec] (let [wizard-sheet (texture! (texture "wizard/talk.png") :split 20 46)