From 1be059e43ebeabf967af1a3bef28de5d14196e91 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 27 Aug 2015 13:54:03 -0700 Subject: [PATCH] adding ending stuff. --- desktop/.lein-repl-history | 2 ++ desktop/gametodos.txt | 4 +++ desktop/resources/ending-castle/Untitled.png | Bin 0 -> 1727 bytes .../resources/ending-castle/game-player.png | Bin 0 -> 1727 bytes .../ending-castle/game-player.pxa/0.pxi | Bin 0 -> 264102 bytes .../ending-castle/game-player.pxa/1.pxi | Bin 0 -> 264102 bytes .../game-player.pxa/CelData.plist | 14 +++++++++ .../advent/screens/rooms/ending.clj | 29 ++++++++++++++---- 8 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 desktop/.lein-repl-history create mode 100644 desktop/resources/ending-castle/Untitled.png create mode 100644 desktop/resources/ending-castle/game-player.png create mode 100644 desktop/resources/ending-castle/game-player.pxa/0.pxi create mode 100644 desktop/resources/ending-castle/game-player.pxa/1.pxi create mode 100644 desktop/resources/ending-castle/game-player.pxa/CelData.plist diff --git a/desktop/.lein-repl-history b/desktop/.lein-repl-history new file mode 100644 index 00000000..7ca4dbe3 --- /dev/null +++ b/desktop/.lein-repl-history @@ -0,0 +1,2 @@ +vim + diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 2e286b0e..f24e96a9 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -12,10 +12,14 @@ PROGRAMMING + ending + you can drink the strength potion while in blood clots hand + proper save/settings file location ++ Save slots? + descriptions for all items when used on self. + try to have dialogue for every wrong interaction + Have to open curtains + grime on portrait ++ impersonate bubba dialogue tree ++ Dialogue frozen + AUDIO + Walking + blink diff --git a/desktop/resources/ending-castle/Untitled.png b/desktop/resources/ending-castle/Untitled.png new file mode 100644 index 0000000000000000000000000000000000000000..fb6ce84d5fd3215a1f6fbcd916ca2fc160b879bc GIT binary patch literal 1727 zcmV;w20;0VP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zL@((Da2|3*-usyMd%yQ)XD1;l5Ye6!1u4#DA1+a|MYArbc3TY*9lvKk8T+c`s!1_8 ztq22^N*g<8>|L9zu!evA?y-i!LJUp=ufM8^(Tnq3-2AE6ma ze8L*G^f8I+-E=3+^CYGSm#&le^W%sg(}wRO#2OluO{%tuJC_D5xxZPX6hzQc;HL+N zHa@=HLW&RYvMdIKW z>%E`PS^IuMaTXy8p1%G@)#>wj?auZoEw?JP()M3(p*V}MIW>V3#{!~I3B_6O@LB7S zIUc>u4hVca3nL9ui<*su;{S6DKAu=HalwSK zM85q0j1V_{8HvGJr}V>%edauQxl5UqwQzH5v1c!#IPD#dJYKVI5y_(dxsoxdV{lG_ zE1v{k;FwZMb8XC-E7zezaN2|_`192y2_aE2u#0eBLbFi6{J|qEv#r<-A8zm_?AN=K zbp~U?^k~b5qI6jtNb>*Ox{RjpYsAbmeR6H7mE@~##LME0GTF3ciUCswXEpFofxifD Vr5XBqy0HKN002ovPDHLkV1i}{O?&_V literal 0 HcmV?d00001 diff --git a/desktop/resources/ending-castle/game-player.png b/desktop/resources/ending-castle/game-player.png new file mode 100644 index 0000000000000000000000000000000000000000..fb6ce84d5fd3215a1f6fbcd916ca2fc160b879bc GIT binary patch literal 1727 zcmV;w20;0VP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zL@((Da2|3*-usyMd%yQ)XD1;l5Ye6!1u4#DA1+a|MYArbc3TY*9lvKk8T+c`s!1_8 ztq22^N*g<8>|L9zu!evA?y-i!LJUp=ufM8^(Tnq3-2AE6ma ze8L*G^f8I+-E=3+^CYGSm#&le^W%sg(}wRO#2OluO{%tuJC_D5xxZPX6hzQc;HL+N zHa@=HLW&RYvMdIKW z>%E`PS^IuMaTXy8p1%G@)#>wj?auZoEw?JP()M3(p*V}MIW>V3#{!~I3B_6O@LB7S zIUc>u4hVca3nL9ui<*su;{S6DKAu=HalwSK zM85q0j1V_{8HvGJr}V>%edauQxl5UqwQzH5v1c!#IPD#dJYKVI5y_(dxsoxdV{lG_ zE1v{k;FwZMb8XC-E7zezaN2|_`192y2_aE2u#0eBLbFi6{J|qEv#r<-A8zm_?AN=K zbp~U?^k~b5qI6jtNb>*Ox{RjpYsAbmeR6H7mE@~##LME0GTF3ciUCswXEpFofxifD Vr5XBqy0HKN002ovPDHLkV1i}{O?&_V literal 0 HcmV?d00001 diff --git a/desktop/resources/ending-castle/game-player.pxa/0.pxi b/desktop/resources/ending-castle/game-player.pxa/0.pxi new file mode 100644 index 0000000000000000000000000000000000000000..5890015e0e324c15d289da50a0b7146fbabb610a GIT binary patch literal 264102 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 + + + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index c0593525..b45f7794 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -25,12 +25,13 @@ warden-sheet (texture! (texture "inside-jail/warden.png") :split 43 58) warden-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 2 (repeat 20 0) 2])] (aget warden-sheet 0 i))) - game-player-talk-sheet (texture! (texture "inside-castle/game-player-talk.png") :split 40 44) - game-player-stand-up (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]] - (aget game-player-talk-sheet 0 i))) + game-player-stand (utils/make-anim "ending-castle/game-player.png" [14 39] 0.2 (flatten [(repeat 5 0) 1] )) + ladder-guard-stand-1 (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")]) ladder-guard-stand-2 (utils/flip (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")])) - scaler (utils/scaler-fn-with-baseline 110 0.10 1.00)] + grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) + cat-stand (utils/make-anim "cat-tree/cat-stand.png" [22 10] 0.15 (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])) + scaler (utils/scaler-fn-with-baseline 20 0.01 1.20)] (rooms/make :music :dream :interactions {} :layers [(assoc (texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) @@ -63,10 +64,26 @@ :scaled true :scale-x (scaler [179 150]) :scale-y (scaler [179 150])) - :game-player (assoc (animation->texture screen game-player-stand-up) + :game-player (assoc (animation->texture screen game-player-stand) :x 216 :y 69 :baseline (- 240 69) - :anim game-player-stand-up + :anim game-player-stand :anim-start 0 + :scale-x (scaler [179 69]) + :scale-y (scaler [179 69]) + :scaled true) + :grandma (assoc (animation->texture screen grandma-stand) + :x 56 :y 77 :baseline (- 240 77) + :anim grandma-stand + :anim-start 0 + :scale-x (scaler [56 77]) + :scale-y (scaler [56 77]) + :scaled true) + :cat (assoc (animation->texture screen cat-stand) + :x 73 :y 194 :baseline (- 240 195) + :anim cat-stand + :anim-start 0 + :scale-x 0.65 + :scale-y 0.65 :scaled true)} :collision "ending-castle/ending-castle2-assets/collision.png" :scale-fn scaler