From 3e96654ba3ba26f71e7a886118b7f6172a3a8966 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Thu, 18 Sep 2014 17:19:43 -0700 Subject: [PATCH] removed jump from talk start. --- desktop/resources/ego/talk.png | Bin 2118 -> 2198 bytes desktop/resources/ego/talk.pxa/0.pxi | Bin 264124 -> 264124 bytes desktop/resources/ego/talk.pxa/1.pxi | Bin 264124 -> 264124 bytes desktop/resources/ego/talk.pxa/2.pxi | Bin 264124 -> 264124 bytes desktop/resources/ego/talk.pxa/3.pxi | Bin 264124 -> 264124 bytes desktop/resources/ego/talk.pxa/4.pxi | Bin 264124 -> 264124 bytes desktop/resources/ego/talk.pxa/5.pxi | Bin 264124 -> 264124 bytes desktop/resources/ego/talk.pxa/6.pxi | Bin 264124 -> 264124 bytes desktop/resources/ego/talk.pxa/7.pxi | Bin 264124 -> 264124 bytes desktop/src-common/advent/screens/scene.clj | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/resources/ego/talk.png b/desktop/resources/ego/talk.png index f3ac2f3ba3b670107bf19eef5def37f88f343841..aa0024a4a44c31764ec78b8718936cb315f742a3 100644 GIT binary patch delta 1142 zcmV-+1d02`5S9@kiBL{Q4GJ0x0000DNk~Le0001x0000a2nGNE0A?Mt+p!@s1b+lA zNklLJ1QT{+q$#T*&EuQzLCH7#RBvO@l)W{L8ie38KQnN)N$v#HiyQ@->f6k(Chi) zBX2UT(m7BpcC8$9nvHFv)4E@ZxXBD$gf+xEw3X)XeDQ&L!;ZPxkE5mH>VLsiq9{|N zEm&69tn9HiVB$g?KiVSQ>a|#SrO~t~oC7p@LxX30g=eE}%5);D-G5 z{;Bf;SJcCnsC=|XSoY0tAu_6oD27YVgLl);ftTXSx@u?7u;QPGPn?BkY}#ly z;OUL(M>&CDsOj0D@`!;UGUZv*x5+xbXq=9G@pEMo_yMnZ*kP#*w_M=h*Bb*+@6njUU%MaY0@+UB;nK%dCFW&`* zPi@O$v*h;`m<(!)!h{a$^2UeNzTW+C{kef{Cr#{;^>)7ZBkrqDMX|lO>wr_&G z>R%+5*L(_e3bBqofzrZ9JAq7L4_`d#TrT=nB9KH;3+vd)C4Z5RZvqW=FLk4>ICkEx zhpn)VomkTO_$JW!g4|0p!lygKj>6o_I%Y0(HR*h`1TsCMqMSgiLn&hZP75C`fz09Z zRVH925ITXLS53YfnI(f=WgR=Gr0~%a=0P0%C~ zGrQ*~1ee4RXg@JO{h@DddMX1hw0{{a*C1GLW+HgOe0bHK^*Vdht4r}7wH}Xg0kp5B_{{oc^8G=bE0O~^lblmx-)KNdy=f+Pqig0sh8C? z2YjPWru>zU0Ic-P0P5>$ihrMN%~B&+WxYK=GO%vDYkouPCDGAxM9f;eLF_%e->CQH#m_ zD<1*rH@}2P`6o3Afc5tL@UGQ4@KRh^SM7KJ(|b7 zD|kWt$`9NP{RTkVO#gKJwSx_x+Li`<`MHgtvIRlrLXWy^U{o!1 zJip5iET~kR>(+Wk{qPxue_#iY2WTvQEGQFUyovc32YM8Yfn#;oYo{Ic56|!NBVH!v zLlcF6Xf_?amrB1K{C_T%RhQ8G0&SGumLH)y>dg9N@Kf#pWFDCb<9nJ8dC7q5bWQci zde?kn6K8(PmAtuicBsLx`WK1iH6OLR0PB;(Pq_n7=E|SL7f(9PqOTiJx8?7UZxT48QY)SRa3W%6|krNhi;eRB9I{~Zit z>7Nhtu3hl?T-LHg`P+f76YCShPiyAxeeZlf2o3aJ7ek-VYBh2qus;6$LU#b!$lEvF zRbRRAv@ap#K6<)3>*LE$`3@kPN#@DtOzNzU_Q(ul`oH;QO@Oe#_eh4`M^20~#yWj+{MmG(FTT*j;U;EI`Jg38u*_ZXn;wMZE%S;B=n;9NAewp!b fn+Y(1d?WA|*C7`i1j_SE00000NkvXXu0mjfCJps7 diff --git a/desktop/resources/ego/talk.pxa/0.pxi b/desktop/resources/ego/talk.pxa/0.pxi index 54154a51402bfe49e04cc57f4dce07d7c725aaa4..a98c483cc72732b119a951aa404f78702744177f 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(tkUiCN}11ePi|mjnV!YS63i&HeIFysKUM%Mf(|VJ delta 38 ucmdnfFR-UyprM7ag=q`(tkTI1j4az{l`@~{o}R_X63i&DeIFysKUM%GEDk3C diff --git a/desktop/resources/ego/talk.pxa/1.pxi b/desktop/resources/ego/talk.pxa/1.pxi index 5a512d07b94bd4cd00d08d488c0818abb8ca9bbd..93cf54a11103d530fb010f86f60e5b2b7f912723 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(tkUiCN}11ePi|mjnV!YS63i&HeIFysKUM%Mf(|VJ delta 38 ucmdnfFR-UyprM7ag=q`(tkTI1j4az{l`@~{o}R_X63i&DeIFysKUM%GEDk3C diff --git a/desktop/resources/ego/talk.pxa/2.pxi b/desktop/resources/ego/talk.pxa/2.pxi index 54154a51402bfe49e04cc57f4dce07d7c725aaa4..a98c483cc72732b119a951aa404f78702744177f 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(tkUiCN}11ePi|mjnV!YS63i&HeIFysKUM%Mf(|VJ delta 38 ucmdnfFR-UyprM7ag=q`(tkTI1j4az{l`@~{o}R_X63i&DeIFysKUM%GEDk3C diff --git a/desktop/resources/ego/talk.pxa/3.pxi b/desktop/resources/ego/talk.pxa/3.pxi index 83fd44efff992da4866700104290fb68248e27d7..3f7b9133ca56c26e096398de53c9e4b7af5a57e3 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(tkUiCN}11ePi|mjnV!YS63i&HeIFysKUM%Mf(|VJ delta 38 ucmdnfFR-UyprM7ag=q`(tkTI1j4az{l`@~{o}R_X63i&DeIFysKUM%GEDk3C diff --git a/desktop/resources/ego/talk.pxa/4.pxi b/desktop/resources/ego/talk.pxa/4.pxi index 54154a51402bfe49e04cc57f4dce07d7c725aaa4..a98c483cc72732b119a951aa404f78702744177f 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(tkUiCN}11ePi|mjnV!YS63i&HeIFysKUM%Mf(|VJ delta 38 ucmdnfFR-UyprM7ag=q`(tkTI1j4az{l`@~{o}R_X63i&DeIFysKUM%GEDk3C diff --git a/desktop/resources/ego/talk.pxa/5.pxi b/desktop/resources/ego/talk.pxa/5.pxi index 83fd44efff992da4866700104290fb68248e27d7..3f7b9133ca56c26e096398de53c9e4b7af5a57e3 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(tkUiCN}11ePi|mjnV!YS63i&HeIFysKUM%Mf(|VJ delta 38 ucmdnfFR-UyprM7ag=q`(tkTI1j4az{l`@~{o}R_X63i&DeIFysKUM%GEDk3C diff --git a/desktop/resources/ego/talk.pxa/6.pxi b/desktop/resources/ego/talk.pxa/6.pxi index 83fc4c441f6a0d6017bfe92bc213239ebd99ee53..fb5116e0ca60ea6a030ec8d689da4254fc8da260 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(q{8jf3Yo9;Pi|mjnV!YS63i&HeIFysKUM%LHVz>G delta 43 zcmdnfFR-UyprM7ag=q`(q{7J!j4adZDw#R9&njd-(?30nktLW>VEaBsmVc}OY#R@> diff --git a/desktop/resources/ego/talk.pxa/7.pxi b/desktop/resources/ego/talk.pxa/7.pxi index 83fd44efff992da4866700104290fb68248e27d7..3f7b9133ca56c26e096398de53c9e4b7af5a57e3 100644 GIT binary patch delta 38 ucmdnfFR-UyprM7ag=q`(tkUiCN}11ePi|mjnV!YS63i&HeIFysKUM%Mf(|VJ delta 38 ucmdnfFR-UyprM7ag=q`(tkTI1j4az{l`@~{o}R_X63i&DeIFysKUM%GEDk3C diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 703aaee2..37d6bde2 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -58,7 +58,7 @@ (defn get-ego [screen] (let [player-sheet (texture! (texture "player.png") :split 18 36) - talk-sheet (texture! (texture "ego/talk.png") :split 16 36) + talk-sheet (texture! (texture "ego/talk.png") :split 18 36) stand-sheet (texture! (texture "ego/stand.png") :split 18 36) ego {:right (animation 0.075 (for [i (range 8)] (texture (aget player-sheet 0 i))))