From 32acd489c2faf4ea5ee882680ba571461378908c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 3 Aug 2015 20:05:44 -0700 Subject: [PATCH] more fun animations. --- desktop/gametodos.txt | 4 +- desktop/resources/ego/fire.png | Bin 2490 -> 2230 bytes desktop/resources/ego/fire.pxa/0.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/1.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/10.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/11.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/2.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/3.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/4.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/5.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/6.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/7.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/8.pxi | Bin 264078 -> 264102 bytes desktop/resources/ego/fire.pxa/9.pxi | Bin 264078 -> 264102 bytes desktop/resources/inside-antique/dot.png | Bin 0 -> 1140 bytes .../resources/inside-antique/fire-particle | 339 ++++++++++++++++++ .../inside-antique/fire-particle.png | Bin 0 -> 1110 bytes .../resources/inside-antique/outside-particle | 325 +++++++++++++++++ .../resources/inside-antique/smoke-particle | 152 ++++++++ desktop/settings.edn | 2 +- .../advent/screens/rooms/inside_antique.clj | 27 +- 21 files changed, 842 insertions(+), 7 deletions(-) create mode 100644 desktop/resources/inside-antique/dot.png create mode 100644 desktop/resources/inside-antique/fire-particle create mode 100644 desktop/resources/inside-antique/fire-particle.png create mode 100644 desktop/resources/inside-antique/outside-particle create mode 100644 desktop/resources/inside-antique/smoke-particle diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index c6d7b05c..fe2002a8 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -4,10 +4,8 @@ + ending + proper save/settings file location + closing should stop all scripts -+ night gandarf text is bad + descriptions for all items when used on self. + revamp text -+ gandarf animation + alternate solutions to puzzle in jail (strength potion etc) + have warden wake up when you drop the cannonball + Opening should include dialogue tree @@ -15,3 +13,5 @@ + fire mints "Specialty fire mints, hand delivered by Gandarf!" + Test new gandarf dialogue + ++ sometimes you can walk on stuff diff --git a/desktop/resources/ego/fire.png b/desktop/resources/ego/fire.png index b44f808f70d304b9e441be0a010372f0c1e3defe..d1485913b18f170aac9836e86a2c69842f6eeb0a 100644 GIT binary patch delta 2219 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 diff --git a/desktop/resources/ego/fire.pxa/0.pxi b/desktop/resources/ego/fire.pxa/0.pxi index 0422adf50a638fc6043aa6a31c8cc8881a2c54fa..ed0859ac7b427c7ee77db805e3d7747548cde51c 100644 GIT binary patch delta 961 zcmX}qSxD4T6vy%Zax^i^g-|gA$QtO{cDi}5|X6DwY%-A?hF6mU7wzy4Z ze@x9B&B8JaDk&nwmX|0{BZvrtdI(#H7V06QuP9yk-1B?7=bp=LX$=}|4GP|0R%$JG z#>c-d(LoRn+{pptTofj_ldiL$qS00V=TFUnPuow<&zPHDiPg&LRaZ&L#9C)eEl3_{8wYhT3y4={$uc#Uby;5&XRqAAd^5TS@e z3M?pt15UV50h($w)tW(1tplc;trK1FVhE$S2QHy;3GE@C;yGU84L;(tBD#hJh{OtP zLOKdjjs~0sJ#>2LJ?O%r+{HL}O<@pui+74Fmk)dfmZ)=8xiVkpipb1A+8ezv delta 935 zcmYMyOGs2v9LMo{&pj&Egfodr3bqg>s)ZsUL#2#vIKo za~!p~>SX!Mq(taRL`knr5Lmhh1EFjaQPBe;g6caI^@q@>*j8v2lG_%4E+0MNtmIg+_ScLjXaHVFHtw!evZj2G=o*`*?`Qn8OP!VHxl69v|@u zU+@(_6h+k(#iK^hL}DdY!GvhUAQo$}4oTRARHR`u(y({4h1pE7{L^7;x;&h;1J>gp5Q4K@EULM9X}PRMI#<5*n#~hM-w{G4FWX+wE!+* z8Vsg+*jRgo4~mp3!og-T0cqHZ9PB|6xJGG5DY#Bq4KLczg
9KtvlNM6Ma+`}B^ T5qcw39HDQtO{cDi}5|X6DwY%-A?hF6mU7wzy4Z ze@x9B&B8JaDk&nwmX|0{BZvrtdI(#H7V06QuP9yk-1B?7=bp=LX$=}|4GP|0R%$JG z#>c-d(LoRn+{pptTofj_ldiL$qS00V=TFUnPuow<&zPHDiPg&LRaZ&L#9C)eEl3_{8wYhT3y4={$uc#Uby;5&XRqAAd^5TS@e z3M?pt15UV50h($w)tW(1tplc;trK1FVhE$S2QHy;3GE@C;yGU84L;(tBD#hJh{OtP zLOKdjjs~0sJ#>2LJ?O%r+{HL}O<@pui+74Fmk)dfmZ)=8xiVkpipb1A+8ezv delta 935 zcmYMyOGs2v9LMo{&pj&Egfodr3bqg>s)ZsUL#2#vIKo za~!p~>SX!Mq(taRL`knr5Lmhh1EFjaQPBe;g6caI^@q@>*j8v2lG_%4E+0MNtmIg+_ScLjXaHVFHtw!evZj2G=o*`*?`Qn8OP!VHxl69v|@u zU+@(_6h+k(#iK^hL}DdY!GvhUAQo$}4oTRARHR`u(y({4h1pE7{L^7;x;&h;1J>gp5Q4K@EULM9X}PRMI#<5*n#~hM-w{G4FWX+wE!+* z8Vsg+*jRgo4~mp3!og-T0cqHZ9PB|6xJGG5DY#Bq4KLczg
9KtvlNM6Ma+`}B^ T5qcw39HDOtCw7V06QuP9yk-1B?7=bp=LXbkOY3=P{-Sl}q~ zBqTgDEhRytIy(JfGt7AZqUiDN;u2qV&B2D_%_mNt@^48tT&(&h{lhXBG6+wETw6{V{>$zU629>U@Qc*+kwd(QKsx=iMJ8bJ$WhA=_T<(6y z_TVDjXUR-!XQ}>cN#rPRS^2JtN*%4lV^!_ZO-d$NwR`nNB~d~9_8+LU4aJE%Q%P)0 zUvkQ!x=o?s>Gq_ot@(LwSFtlY+2zc2Y!(n{6bmD^Hjen^3`lr`zr6_T(&QNmfxHVEdmpg@&xkNXzl&WG{7Z-R3CC zard6-()}WFzAVEq^58)^YS09YR&=5Z=g^G{xP;5Nj=Q*r2Y7^Dyu<+B;}gE%E56|e ze&UZ|m|_?{a|~fDf-wQ%h(IKw5RF*GVK(Ms9_C{KmLLf!SdLVrVI@|>j!a}5Vs3{E zWvE7z;S=)+p%v}8jBB`!JGhI7c!dFcz<2yM#4?~T4w0CJRM=4nH#{goDQIfZ)T#$P ztz*zWwq~>-fNu2Q7Py4PC9L~+jHh^xH~5IphA0c85rb)1h}FnN5%%IR=%MJL+HeY2 za09+4Z2e#|^~(?$ix6;_#3K>QuofGUj{-Qsl){waMI9QT(TWaq;UaiZxruw=HHAUs YE#4V2MF#l{EHQ_xadxB*7m*MD00EHA`v3p{ delta 997 zcmYMyYeEq6*?$!E!0()g1Lr*FIh+fAqt9cwUh*6D8?~?_xONM_>8ak zhM$U}3Ptg%;Up25ftfI24k8hS1z3coScwEAVil6G7Rg9O8Z6j=O-RQ!>_E06RXd8{ zMh*OmSE@}U?dZf64B{4UV+ap0hH<>Z7ktN*A~g-u5s4MBU>k~23Ma}?0g7rA)sBOj zS_=YRhE|-$dGzB3Zh}i_Ttd5tM|gq}yv7^+z%NCLIfy|#)?+6M;K31`1O){JMF1Bu z02&is4i>NQQIS$b7&uHWL?YH;Beq~Sct)9vJn)>d1huGx56z$%*?}I=ki3fPxPxIl TN9d0b(G>j?p-=Wdq#XMVBI(b+ diff --git a/desktop/resources/ego/fire.pxa/11.pxi b/desktop/resources/ego/fire.pxa/11.pxi index 858ce138e8f5e81ea7f9db7e922df3896f19ac88..4c0a2441c53e0c844ef0b7685380e23c3a59a7d6 100644 GIT binary patch delta 968 zcmX}qSxD4T6vy%Zax^i^g-|gA$7M5YOND(2nyhMQ-K|~nTL)b#JkPi`kMd`xlp5N0w_grpko8MrYpZ~$)B1=hW zbo5JA)5XKHf57R#MvZiC30YzU*K^S~~BbzOw>TDQ8j-lR5})H&Ly zN!9li->Oq*_0g^}J*LI?uxW2{TD+~uW}mVY_>>rvnyl51R2Y9X3G}S2syk{nIbn;ZKX)XpC8M=gpPR1vkY0mTuNHxc0Wf$h#ZDrP+c$+oP zlJ9OYR)_?7wY58a!aL4&8nGhlRl~4~geP{p(o@YQyCuinV_Hb*)zML5(KQ@+sn48h zj?c1|XO+0!rvEw9&o?7n}hd!lo{ri7%VeX4%YTW~p;( zd(>t5nn{U}l|+>Eb`u1aUW9>A)>QEoEI0m_t7 zRu5E&ck9*V$x3-io$7U{TUtZP4YSq~olSeCh>fw;HF@EyvrRdrW_z(S&0KJ_$X4zs zD;z!MtUZ3BPK#4Tl~R97>rq9Fa=KC5tBR=Lkuyza>kNTDCFn)^&U5FrFd^0`Er!4v z89LYIY1hSdbarVOLL|vPtwxBrv|j)IY?HxeEgZaP_}lUCrOT#lQ@XjV+H4=}H~j1K z!o#w1GA&L^VXCd5*jjC|Js%p@7KKP~9hM~N2<)hZ8y@)J#}Gy^iZNWnI3{ot(|CYK zc!C+c!~z!a0Uz-hU+@h}_$f)UDoHLmgeDX#u?l)bAQDkni*<;{W+WjQTakhtNJTm_ zV8m|hK^Agx5CxKuttf*N4e&@VA$QRD(T@pC;x6uC8jmrL1-!>se8;jR6a^~~iA^vf z7v-pg9S+ohP=!#X1!O8+@VWSOqZb1h!)@FFhfp|#@(@q)40CvcxA=iyl29WMgGB7Y zA(WsF&1eUKDuJpGS1}F-Q(bJVzQ!j>2pPd(GZBkqY)2;cAs<|$u%HNBr>KA%jc7wB g7)JDA7z`wC;1=#<2D1pf5h|L{KNWan|4WGZ--xoiivR!s diff --git a/desktop/resources/ego/fire.pxa/2.pxi b/desktop/resources/ego/fire.pxa/2.pxi index c59c6d47db991252afcc112c13e8e81c6e51d88d..35768e6055f8faf49bc422867ed6b609c27a1d0c 100644 GIT binary patch delta 961 zcmX}qSxD4T6vy%Zax^i^g-|gA$QtO{cDi}5|X6DwY%-A?hF6mU7wzy4Z ze@x9B&B8JaDk&nwmX|0{BZvrtdI(#H7V06QuP9yk-1B?7=bp=LX$=}|4GP|0R%$JG z#>c-d(LoRn+{pptTofj_ldiL$qS00V=TFUnPuow<&zPHDiPg&LRaZ&L#9C)eEl3_{8wYhT3y4={$uc#Uby;5&XRqAAd^5TS@e z3M?pt15UV50h($w)tW(1tplc;trK1FVhE$S2QHy;3GE@C;yGU84L;(tBD#hJh{OtP zLOKdjjs~0sJ#>2LJ?O%r+{HL}O<@pui+74Fmk)dfmZ)=8xiVkpipb1A+8ezv delta 935 zcmYMyOGs2v9LMo{&pj&Egfodr3bqg>s)ZsUL#2#vIKo za~!p~>SX!Mq(taRL`knr5Lmhh1EFjaQPBe;g6caI^@q@>*j8v2lG_%4E+0MNtmIg+_ScLjXaHVFHtw!evZj2G=o*`*?`Qn8OP!VHxl69v|@u zU+@(_6h+k(#iK^hL}DdY!GvhUAQo$}4oTRARHR`u(y({4h1pE7{L^7;x;&h;1J>gp5Q4K@EULM9X}PRMI#<5*n#~hM-w{G4FWX+wE!+* z8Vsg+*jRgo4~mp3!og-T0cqHZ9PB|6xJGG5DY#Bq4KLczg
9KtvlNM6Ma+`}B^ T5qcw39HDQtO{cDi}5|X6DwY%-A?hF6mU7wzy4Z ze@x9B&B8JaDk&nwmX|0{BZvrtdI(#H7V06QuP9yk-1B?7=bp=LX$=}|4GP|0R%$JG z#>c-d(LoRn+{pptTofj_ldiL$qS00V=TFUnPuow<&zPHDiPg&LRaZ&L#9C)eEl3_{8wYhT3y4={$uc#Uby;5&XRqAAd^5TS@e z3M?pt15UV50h($w)tW(1tplc;trK1FVhE$S2QHy;3GE@C;yGU84L;(tBD#hJh{OtP zLOKdjjs~0sJ#>2LJ?O%r+{HL}O<@pui+74Fmk)dfmZ)=8xiVkpipb1A+8ezv delta 935 zcmYMyOGs2v9LMo{&pj&Egfodr3bqg>s)ZsUL#2#vIKo za~!p~>SX!Mq(taRL`knr5Lmhh1EFjaQPBe;g6caI^@q@>*j8v2lG_%4E+0MNtmIg+_ScLjXaHVFHtw!evZj2G=o*`*?`Qn8OP!VHxl69v|@u zU+@(_6h+k(#iK^hL}DdY!GvhUAQo$}4oTRARHR`u(y({4h1pE7{L^7;x;&h;1J>gp5Q4K@EULM9X}PRMI#<5*n#~hM-w{G4FWX+wE!+* z8Vsg+*jRgo4~mp3!og-T0cqHZ9PB|6xJGG5DY#Bq4KLczg
9KtvlNM6Ma+`}B^ T5qcw39HDQtO{cDi}5|X6DwY%-A?hF6mU7wzy4Z ze@x9B&B8JaDk&nwmX|0{BZvrtdI(#H7V06QuP9yk-1B?7=bp=LX$=}|4GP|0R%$JG z#>c-d(LoRn+{pptTofj_ldiL$qS00V=TFUnPuow<&zPHDiPg&LRaZ&L#9C)eEl3_{8wYhT3y4={$uc#Uby;5&XRqAAd^5TS@e z3M?pt15UV50h($w)tW(1tplc;trK1FVhE$S2QHy;3GE@C;yGU84L;(tBD#hJh{OtP zLOKdjjs~0sJ#>2LJ?O%r+{HL}O<@pui+74Fmk)dfmZ)=8xiVkpipb1A+8ezv delta 935 zcmYMyOGs2v9LMo{&pj&Egfodr3bqg>s)ZsUL#2#vIKo za~!p~>SX!Mq(taRL`knr5Lmhh1EFjaQPBe;g6caI^@q@>*j8v2lG_%4E+0MNtmIg+_ScLjXaHVFHtw!evZj2G=o*`*?`Qn8OP!VHxl69v|@u zU+@(_6h+k(#iK^hL}DdY!GvhUAQo$}4oTRARHR`u(y({4h1pE7{L^7;x;&h;1J>gp5Q4K@EULM9X}PRMI#<5*n#~hM-w{G4FWX+wE!+* z8Vsg+*jRgo4~mp3!og-T0cqHZ9PB|6xJGG5DY#Bq4KLczg
9KtvlNM6Ma+`}B^ T5qcw39HDmwix8|82!nbETZk6wA);?2UHIJdd%EYI%WZA5_}eVu+jf@O z%PW$SMs-6;Q1JO)Pk4eJ?^zx*)m2&LZfHExdh*oiGiNk z@=J?d&Pqo?s?$+qFZLZXXNg3Gw6%Le=X9LtG?PUZ>Za)snUmhtot?!85-CW-8l+<#)*}-(Or_co-`Vhcv za0!D;829i9Pw)({@E#vEQ3fVqCgx%pGEszbG~qbtq3EH!IE!nz3HM{R5ipthp@~dJ z7&uJgk&M;Yh%G2Z8603rVM?h%3tC~K8|UFiKX_5Og(2{o!XWY*Z#0=L@AwQX(f?KL L;za#dM8^LBv)jg> delta 966 zcmYMySx8h-9LMpy95u^uCNU|&9z>DqL6Hz50yUc{&Gv9WB-$;>jx zahdCq<(f%}l$Au3w7o=u)AlYk`$$l^Va`$#V%1(NVq=uOCRev6)094%=w3ltmV~Z1!G4Ywa1RvY0;{vQtD4?J*tRQPBm(KR1pz4db;UMox$HH1-wk% zarT@RD#Ti)#o&L32m4yxZ6VR^9i3X55DBtZs}UkPrME9T(`2w(3WhEimOK8vc*&G$ zN;Q|+&97ktBa{E{SDl_aMeL=%ivSPebG5RM3}!v@4) zGZK)9El9$4BqJ4RFk%;WBLg|uk9t(2Dl}sklShcFn~!+;V$lB29Gh11-!>s z{J@eV6a_00j!iHk2j!@Q4b`Xtp$ef&3&>PD;dS!pMlS|2j@!5cHleTyojmk`oOD@?|TH4|= zmHjbiGDowp41;PYBE*)LC~zT)2!(nGTZk6wA)>D+UHIJdd%EYI%WZ55>TU`O-m|~R zR$LMvKcX8-rcLkcatFuiG48bybDX7RuA16YjTc%kUTSym-mI1!iFRLa)7RBl^g4?^ z!SGvjwX@#u^{NqNmNuwZzt^o^DSxS3#fsnCs>YPRx>cpx0uNYrq^2i1iX6^iTR}jv zIb_IE<6yb@*O1WZ6_r(ost=nHN=l5Q$INCW^Nr&t%w8qo)9UI^9=1%xFf&t0H zSuIXmuFq?kN*Pu0agp)W9C*3Inr2PPwwGlW`+S!FIV&hIHGNB7MPBX(XU;xbS)Oz7 zO1C*I679;?G%X(`s6s88VZwthbmJO&a055dhdb!U03PEh2JsrBc#lu`g0J|7ANYws znx>1Ux%8QYSqQ*fgkT;*5snB%A{xuE0xPi!tFa!5NX90lU<MM znl+c`=LjBjpbxk401wfRCwPNVjN?0gYhq|nn2k`xAq7_KhZ7|zLpf+_(9~!EJ&hKa zF1A**!G|9BaUWd5;1b3oJi`mT#9MsCXHArW8CZbDSc7fYi(;I>SCyU7VKcwW#QUCw| delta 990 zcmYMyTS!z<6oBD#*=p8=Gl@wG_8^K>4~m2k5vbV=874?ML}8;&IwoFbbWBUfG*e3* zN6n*7me)*5q^u;Oq}xjrSo#nKLfK11MHh$&vVTZ&!FSGD2hLu5ZT1znzRj&SWS11$ z9A&Yw^Rl7}KmWlYk0C~m_Us7Lm6ny))YUh)Ug+uV_gGA-t~SbZ-76dFO>(12_EDxy zvU;d#&CHF-WuK{1`MIh&Th$n`QqHT>P7kHdS4+g|_nKZc%@$B>oU;|^?AjYeY>9AI zWa&4gn==Y6j{M3bOV05;dvSSD?%0XSs*|UxwMbQzDYd7yUR8uEXBxEqstENTJ=@q+ zZS>^{ey@^upF6Jw39(UWG5X#if%9$dc3osgXP1^DM4a5MRR|H8)aN~zZZ_I&xkDF? zD;fV@x@=B2CtHe~7RS(l@qeDB4@%2OwN_el6YV+qHmBA8a(F~r5+d4ll!=bPfhyF) zjc#}`j8TkX9M>>`N!-E=9^x^cVivElh$Vc)Cw#$Ie8&&`mLyq~B$pgO5{PwJ4+DY` zf>3P2W<+5d;t-GRNWd;6A{i+#VK4R}4VgHM97)JF6rmDza7!*BcaV57fJsc@9`0iX zPq2VRe84yS#Iht51#1z4tuP@I#VCaX<){En6`Cq7pr_J>ZWoUp^kER=xP!Z36AGJ9 z9^n~YU>@)A9>4HM5^6BQ5sN)If&x^d8SS8_jRKAR8Q`up$o}rzk-^8qkJLFpTKO2pCA*#BDslEau?5BSaWY|Ap_8t%eW_e*x|* B(8mA( diff --git a/desktop/resources/ego/fire.pxa/7.pxi b/desktop/resources/ego/fire.pxa/7.pxi index a7d0e5bf5d9c6c7914cf83451f253cdab1d65f0e..4c0a2441c53e0c844ef0b7685380e23c3a59a7d6 100644 GIT binary patch delta 1043 zcmX}qeQ3>59LMqB?{~gfjNM72nOepsO^qZ^B^$1_%!;`GFncn0TlaFeJGaR^1-mrDVdez5Dj>un)xXdYzKQguaX=2M^`i#^yNE^9o9fJ#Me7FvIQI z=qwJ`>q#QxqZ*rn(Md;+HtU5VGfk~sB1xGot!r`|c8{|#+-4t2YpT;y6Vv=`c&goz zRJhnvu*q3j^{K%*6>(Sa^-qjDX0z-HG4P2wI2-4N=D|ti!#^}c B-gy83 delta 1088 zcmZwFTS!zv7{Kv!&Wze+!!Fy}qSMvpNl zvuL-?Q4$j~u4+R1`Je0b21Tin-ZhI1#U-Ux2de9jHnp^Nc&%n(*caiw)UF0qo7FnA z>Z1*rRgqaPhc6FI4i>8qg6+aY36^i0k0|;hgF6JQ!!3aSp z7GfzP5RF*GVHH+m9paIQB$%-gn~;KZY(thJRT~Q6!U1>`w^WZ4wBsxWFo>JDg<*`~ z8D8QoKI0oE6{%^MgAlBQ8R;lQF&rpG87QhzRBHe=wUcOe^JqaE&Y=(2aRV$uV-eb2 zJisH2<2BykJANus1S1SF*nsWGMZ)(_V<|qjmTeq2EB_oXOJIpR6*=fx?cWt)+iCN|nC3(3IZ6$kJDlNmx z9kZM()>QkvwH}wv>sjfpPV6;DiewFF3rEsN??2FP7K=>KP17SXy0jx!QSPw&+^$62 z-j^!stwnj(1`a%O)KTuRIXywAKasHi&y|*pvW4@i>Z)8beJfVEgH^rJrY6WPc?9`Z3B6EO*sF$FU)3niF?Qq04AEPw+`;L=224KFsL5n(MP`hG$T zN70Q7xQc7Ij@x*KUcAK@{LsYEpfCuTC_*V5SPLHl2x0?hYS7f!3wj#uFhgunbRdD# zNZ|^&gux|@o4AYnc#Ic#hYy-41O1VUF_?-4SP4INU?1qA=%M21#Ccpo=pI`Sm`r`w zLTCg;h31DU=N~5`JhM$5rLY`kYR$PJ`^@C>6p08xHOiIIhk4J zIBwS^%Qce{AuEX}X?qC*O9?R$%6f>XXn}|z`wmI{;dAf*UO4A>&f#2f8CqS2fSj^o zi>)FiWD%UGj+Wp)#6iXoVOJDS@l<%+!j_< zoo(2ZmX%&?wiVhF&AG=4tfiGDdE>|JH78Ei>fu6GX!WP`ULixZ(~bH8A%nfg&NQ8^ zHG2AZuNO&s&Yjo&rQEEw7(MSG--T9Jn_qZ)N2i`FWvtq*S4$b5*w>$tmSwbB@`f)O z*E+^tx}24km1HidGTVj+jsN;=gMVszO1?cmFTt8yXsOD#J|7v?SEP(|98nbIC~T;K z6E1Y4A0rsUI3{onlbFIy%;Eta;R)ujh-Iwc13uz2zTg|a9ic)9{ac<(_P?ZD`U6Mn B%FO@( diff --git a/desktop/resources/ego/fire.pxa/9.pxi b/desktop/resources/ego/fire.pxa/9.pxi index 65c8b6bfe4e2a46ff582bd9328daf52485692fd0..4c0a2441c53e0c844ef0b7685380e23c3a59a7d6 100644 GIT binary patch delta 995 zcmX}qc}P@I6vy%R-aVF>rA3&SfwX8ufki}%5T!LqRDxkc&|+#fDl;|XOpaz_xn;Rc zWfxO3C$ngyXptf!Z22b&%!newp#BJ3h!*OPh`wU<;B(J;|J>g_m)qDB-P063e%sC> zho?9>`I%`c2^)2)J2-x(nG{?cH`eX-1uCl!HXds|exftDb(NY?kr+JRW-h6;nYA`^ znAK}D)y9gee)E~q-fA_ox3xpPP`bgd!gYC_N*MX?^){$1Z`3Z^hP9cgt|FIvz)=wC z(N8UzW$iA}e=La^>2jdY^N{V6AIb>_gkW))@H8G^XKI*bLZ@E`10KS zr+f5(NMaz{FpPW@qYPDOhDJNO(Sx%%hYPrb%eaoa=)-+HL_c0)5by92pYa7>@f|<# z+b~QqjDQ(V6M;yK!vsu33}O+71SDb(=3zb-U?G-bInuBa=~#_5SO+^cA=ePI04|iG z63s?H%p)}I=)z@O!)@HbT|B@m3}Oi1@XHX(fWjEWU^dcW$4 z=m1MA+7QAy^x_scgvBAOdw7H=c#hZjfKP@f3!@Q_=~#qy*bWbBa2RALGE@gTaRoOJ zc+4^YCR0BRkqAVA%_IpaSb_D}j6xK_38oaL6hG?G2#t1}LJuy28TDLM4FhSV1X!7Jtz`FM4)CfWSAhSL}BBSj)}{Rj*X>bnwh0D zZh2j@Tr(*VvXY3BwwEZdln?`@wK~~_v~CMFl$MoO*VZ*QpX=)GYc-pMp(ecbYOm^FXHpwXs)sgZ zQpNt7DOaDE6S}=#L{7Py#k|m64zWV7ZWJ30Z(qbOE0kxQELER~DSNX>EB7fj&RPl# zR{fv_V?GiUWRQm)gQjGi^nch2Q*F@&|Xcj$>yMys8Ag_L3OJ-ulu z8AhumXYjo7Z^yqEE@q@;B$$irX4_!D@n4_mwu=^su8L+flRFfolZVo=)nNS za1*z{Av6x5-N$1*#T;Ja4SwL4B1Hf~5QSYhhyqlh5iKB45GXov8RK9u;bdd+3Lh0I zRd|EVWGG^=9ZA@SEO3o77kS`1WeMs~4;R|OFtQKBU?6!7H*gm-n1$z!P{D-$DbFMO IUs5jo1|T@e{r~^~ diff --git a/desktop/resources/inside-antique/dot.png b/desktop/resources/inside-antique/dot.png new file mode 100644 index 0000000000000000000000000000000000000000..8802f8e036c6a9fb2087205859f6aff9bc78156f GIT binary patch literal 1140 zcmV-)1dIELP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000BNkl4Tx062|}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 zu8wgc*>*(`!y(L68I!Tw<#| cgo&;N0Bq0@Bia`9q5uE@07*qoM6N<$g40nQZU6uP literal 0 HcmV?d00001 diff --git a/desktop/resources/inside-antique/outside-particle b/desktop/resources/inside-antique/outside-particle new file mode 100644 index 00000000..c28fbf1c --- /dev/null +++ b/desktop/resources/inside-antique/outside-particle @@ -0,0 +1,325 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 500.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 8.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.1632653 +scaling2: 0.63265306 +scaling3: 0.4489796 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.26027396 +timeline2: 0.31506848 +timeline3: 0.6164383 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 15.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.42465752 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 50.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.4520548 +- Tint - +colorsCount: 6 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +colors3: 0.21176471 +colors4: 0.21176471 +colors5: 0.21176471 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.01754386 +scaling1: 1.0 +scaling2: 0.8947368 +scaling3: 0.14035088 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.0890411 +timeline2: 0.5890411 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 200 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 75.0 +highMax: 75.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.3 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 6.0 +highMax: 10.0 +relative: false +scalingCount: 6 +scaling0: 0.0 +scaling1: 0.26530612 +scaling2: 0.9183673 +scaling3: 0.4489796 +scaling4: 0.53061223 +scaling5: 0.0 +timelineCount: 6 +timeline0: 0.0 +timeline1: 0.14383562 +timeline2: 0.30136988 +timeline3: 0.5273973 +timeline4: 0.8561644 +timeline5: 1.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 100.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 15.0 +relative: true +scalingCount: 3 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5410959 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Tint - +colorsCount: 9 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +colors3: 1.0 +colors4: 1.0 +colors5: 1.0 +colors6: 0.0 +colors7: 0.0 +colors8: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.19104992 +timeline2: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.7368421 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.8082192 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: true +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +fire-particle.png diff --git a/desktop/resources/inside-antique/smoke-particle b/desktop/resources/inside-antique/smoke-particle new file mode 100644 index 00000000..b04c8d80 --- /dev/null +++ b/desktop/resources/inside-antique/smoke-particle @@ -0,0 +1,152 @@ +Untitled +- Delay - +active: true +lowMin: 1500.0 +lowMax: 1500.0 +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 500.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 8.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.1632653 +scaling2: 0.63265306 +scaling3: 0.4489796 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.26027396 +timeline2: 0.31506848 +timeline3: 0.6164383 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: -20.0 +highMin: 15.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.42465752 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 50.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.4520548 +- Tint - +colorsCount: 6 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +colors3: 0.21176471 +colors4: 0.21176471 +colors5: 0.21176471 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.01754386 +scaling1: 1.0 +scaling2: 0.8947368 +scaling3: 0.14035088 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.0890411 +timeline2: 0.5890411 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/settings.edn b/desktop/settings.edn index 03c7f454..fbf18cf0 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 82.0, :music-volume 86.0} \ No newline at end of file +{:sound-volume 82.0, :music-volume 33.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 0b3da725..e6d3013a 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -30,7 +30,7 @@ "Is there anything here you will sell?" {:run #(actions/respond entities % :shopkeep "No." - :shopkeep "But I do have some free magical fire mints that Gandarf brewed up." + :shopkeep "But I do have some free magical lava mints that Gandarf brewed up." :shopkeep "Careful! They're spicy.") :choices actions/previous-choices} "So in order to continue on my quest, I'll need to solve some puzzle here?" @@ -210,6 +210,12 @@ :x 70 :y 86 :baseline 120) + :smoke-particle (doto (assoc (particle-effect "inside-antique/smoke-particle") :x 162 :y 108 + :baseline 240) + (particle-effect! :set-position 162 108)) + :fire-particle (doto (assoc (particle-effect "inside-antique/fire-particle") :x 162 :y 108 + :baseline 240) + (particle-effect! :set-position 162 108)) :bowl (assoc (texture "inside-antique/bowl.png") :x 165 :y 110 @@ -217,19 +223,32 @@ :script (actions/get-script entities (if (= 3 (get-in @entities [:state :mints-eaten])) (do (actions/walk-to entities :ego [159 62] :face :right) + + (actions/update-state entities (fn [s] (assoc s :mints-eaten 0))) (actions/do-dialogue entities :ego "She's all out." - :ego "Maybe Gandarf can brew her up another batch.")) + :shopkeep "That's right I'm all out." + :shopkeep "Go tell Gandarf that I need some more brewed up." + :shopkeep "Pronto!")) (do (actions/walk-to entities :ego [159 62] :face :right) (actions/talk entities :ego "I'll just try one of these mints.") (actions/play-animation entities :ego :reach) (actions/update-state entities (fn [s] (assoc s :mints-eaten (inc (s :mints-eaten))))) (sound! (sound (str "inside-antique/fire-" (get-in @entities [:state :mints-eaten]) ".ogg")) :play (utils/current-sound-volume)) + (cond + (= 2 (get-in @entities [:state :mints-eaten])) + (do (particle-effect! (get-in @entities [:room :entities :smoke-particle]) :reset) + (particle-effect! (get-in @entities [:room :entities :smoke-particle]) :start)) + (= 3 (get-in @entities [:state :mints-eaten])) + (do (particle-effect! (get-in @entities [:room :entities :fire-particle]) :reset) + (particle-effect! (get-in @entities [:room :entities :fire-particle]) :start))) (actions/play-animation entities :ego [:fire (get-in @entities [:state :mints-eaten])]) (actions/talk entities :ego "WOWZA! Those are hot.") (when (= 3 (get-in @entities [:state :mints-eaten])) - (actions/talk entities :shopkeep "You brat! You ate the last mint.") - (actions/talk entities :shopkeep "Since you ate the last one, you have to go tell Gandarf to bring me some more.")))))) + (actions/do-dialogue entities :shopkeep "Oh drat! You ate the last mint." + :shopkeep "It seems like I'm always running out." + :shopkeep "Now be a good lad and tell Gandarf that I need some more brewed up." + :shopkeep "Pronto!")))))) :teddy teddy} :collision "inside-antique/collision.png" :apply-state (fn [_ entities]