diff --git a/desktop/asset-work/tongue-fight/bloodclot-swallow.ase b/desktop/asset-work/tongue-fight/bloodclot-swallow.ase index ba324422..f8852ff7 100644 Binary files a/desktop/asset-work/tongue-fight/bloodclot-swallow.ase and b/desktop/asset-work/tongue-fight/bloodclot-swallow.ase differ diff --git a/desktop/project.clj b/desktop/project.clj index 38b20d0a..92020ea5 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -2,7 +2,7 @@ (def packs (into ["do"] (mapcat (fn [directory] ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")]) - ["tongue-fight", "global" "space" "particles"] + ["title"] #_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title" "castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard" "cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ]))) diff --git a/desktop/resources/packed/title.atlas b/desktop/resources/packed/title.atlas index 3dead54d..036bcd0f 100644 --- a/desktop/resources/packed/title.atlas +++ b/desktop/resources/packed/title.atlas @@ -69,7 +69,7 @@ quill index: -1 save-indicator rotate: false - xy: 810, 766 + xy: 810, 644 size: 7, 7 orig: 7, 7 offset: 0, 0 @@ -228,3 +228,10 @@ screenshots/outside-house-night orig: 160, 120 offset: 0, 0 index: -1 +screenshots/tongue-fight + rotate: false + xy: 810, 653 + size: 160, 120 + orig: 160, 120 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/title.png b/desktop/resources/packed/title.png index 1e9ae5a9..de833742 100644 Binary files a/desktop/resources/packed/title.png and b/desktop/resources/packed/title.png differ diff --git a/desktop/src-common/advent/saves.clj b/desktop/src-common/advent/saves.clj index fc03bca7..39b38a26 100644 --- a/desktop/src-common/advent/saves.clj +++ b/desktop/src-common/advent/saves.clj @@ -28,6 +28,7 @@ :night "screenshots/inside-castle-night.png"} :space "screenshots/duel.png" :held "screenshots/held.png" + :tongue-fight "screenshots/tongue-fight.png" :inside-cafeteria "screenshots/cafeteria.png" :inside-antique "screenshots/inside-antique.png" :inside-jail "screenshots/inside-jail.png" @@ -37,6 +38,7 @@ :night "screenshots/fountain-night.png"} :outside-castle {:day "screenshots/outside-castle-day.png" :night "screenshots/outside-castle-night.png"}}] + (println (:last-room state)) (get-in answers [(:last-room state) (:time state)] (get-in answers [(:last-room state)])))) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 0cfb5ae4..97a3bdab 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -480,11 +480,12 @@ (-> e (assoc-in [:room :entities :penultimate :opacity] 1) (assoc-in [:room :entities :penultimate-wall :opacity] 1) + (assoc-in [:room :entities :bloodclot-swallow-top :opacity] 1) (assoc-in [:room :entities :bloodclot-swallow-bottom :opacity] 1) (update-in [:cam ] assoc :paused? true :x 160 :y 120) (update-in [:room :entities :ego ] assoc :x 200 :y 166 :baseline 4) - (update-in [:room :entities] dissoc :tongue) + (update-in [:room :entities] dissoc :tongue [:ego-heart 0] [:ego-heart 1] [:ego-heart 2] [:ego-heart 3] [:ego-heart 4]) (update-in [:room :entities :ego] actions/start-animation :fall-small)))) (if won?