From d975792ebd52fc59ba09ad60e86db619cbef455b Mon Sep 17 00:00:00 2001 From: logsol Date: Thu, 12 Mar 2015 19:55:26 +0100 Subject: [PATCH] added a couple of items --- app/Game/Config/ItemSettings.js | 53 +++++++++++++++++++++++- static/img/Items/outdoor/fence.gif | Bin 1708 -> 0 bytes static/img/Items/outdoor/fence_door.gif | Bin 1447 -> 0 bytes static/img/Items/outdoor/fencedoor.png | Bin 0 -> 4078 bytes static/img/Items/outdoor/fencepiece.png | Bin 0 -> 3944 bytes 5 files changed, 52 insertions(+), 1 deletion(-) delete mode 100755 static/img/Items/outdoor/fence.gif delete mode 100755 static/img/Items/outdoor/fence_door.gif create mode 100644 static/img/Items/outdoor/fencedoor.png create mode 100644 static/img/Items/outdoor/fencepiece.png diff --git a/app/Game/Config/ItemSettings.js b/app/Game/Config/ItemSettings.js index aea2aee..5da7ff2 100644 --- a/app/Game/Config/ItemSettings.js +++ b/app/Game/Config/ItemSettings.js @@ -246,6 +246,18 @@ function () { "height": "9", }, + "Table": + { + "category": "kitchen", + "image": "table.gif", + + "weight": "3.5", + "width": "60", + "height": "21", + + "grabAngle": "-0.2", + }, + "Banana": { "category": "kitchen", @@ -321,6 +333,45 @@ function () { "grabAngle": "-0.2", }, + "Couch": + { + "category": "livingroom", + "image": "couch.gif", + + "weight": "7", + "width": "50", + "height": "29", + "bounce": "3", + + "grabAngle": "-0.2", + }, + + "Cactus": + { + "category": "livingroom", + "image": "cactus.gif", + + "weight": "2.5", + "width": "17", + "height": "31", + + "danger": "1.9", + + "grabAngle": "-0.2", + }, + + "Piano": + { + "category": "livingroom", + "image": "piano.gif", + + "weight": "15", + "width": "66", + "height": "48", + + "grabAngle": "-0.2", + }, + "Bible": { "category": "livingroom", @@ -372,7 +423,7 @@ function () { "grabAngle": "0.5", } - } + }; return ItemSettings; }); \ No newline at end of file diff --git a/static/img/Items/outdoor/fence.gif b/static/img/Items/outdoor/fence.gif deleted file mode 100755 index 75642fc9103ad12a2c3794c3bf3e4cb63a446dde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1708 zcmaKr`CHTX0f0XV5yZ-6X^F^@5ab9UfFbucJf=>hTBdBnDX#6jcs$yb$8J^G`VZ{=`Tgbn;T4Jn6sk23WP;~w zpjJf!_798+k%vR@kiyxylTi%MsDps>mu&YjLmyx_WR#OeH44={IP`WgbzlLLyk)`yU79+RcukEZAxwTBU zhGtVxoN9`rg2pV)w8_c7YUW5#+hUVgWMpp@M8j@ts$$fLb_5KZppj=+(#$f7TgM{g zA|=%A3MkjB=j!=|9$i_`$oJ@&a$0V44V##QYO=aLQiD}6QG3TD2VnP0D>K==$D5AUy{zZDxVsK=%1t`~P$ zdEE}FoSf|_r?r~6BdvN*CFHK88HI#^u56D}+G^qj%tC_*-)`o&ScN`=AYc-jWn@A%yuh(ph*+ZvwS*6qlW4zC)s61MscaS4BKYr znPntCG3$daQ@ye@VB`*Y6#hy`!@*Va@%1X|zFjqL4aFiZ>9PxZ8&&N#QG2b#DlP7I zsvPCydId3P7AT<{yOJC*i;RLo5eZ|L6T9mr!$Dnxn(q2vcm>U=BDU(Gpn5_2w!{g*qFKiF-3`rWnobeT~UGs8iYaL-4|S+)Pgd(UZh+vl7y=+S0*wR5?#Qddq~3^JJ0u&< zs!Y8ZqQl_5inG|A%O{)OAM-4@_8sXtW<1l!cU#i-M#sE^YTK5A{4)A<^TJ#13xzAc z4?exOp%D>1k|f=N6dbhdA5OZGoT-=_`{BEbdofjt;t)IzXq?L`(7o6_zwq>T=T2W7i*7KE`9U`8xem8`P1*tZ-r$< zfu2{?C{}2_Fb@@u&KlSgM&d?zTY=AF-O6?RH6Env+gN?uM%%0dnSEmy2GT;RD28m} zZWbsBhhm3!EM1QU)N^B)cS-QWn7vlY^~mZUUzv{d4Cb*FbKYHRlOu^@b7y8xDPesok`QrGJ3kHk^RNn>z@WGJRCAThpxuBk( zI(}1e>+y+OVKy9)F5KM|s{x67-gp3iCeHbG|2+QGy_2)v*{2t0y@34AKhAF}`a1|E zI1rm-(KB-(bjI;)wI~9Ay|MV*CPEr3zWTSJfkY~Zgj3Rf_Df4RVB}azO2eH0Qf5EY z{HNR)6=G|_44ME6AoTH^Ycq)el&(U71@is5z%^z}dI&L>JrP+1o!?I*&d(H|psI^* z|9GQZXWM~J+Duw4ef{)rQpx!->DRPw=H z@uwerI{sCEyqB=1 h%cS|q0E0ft8@*caU8H&U+Fu&Z?0&w|pP2~g{{@iVd5r)7 diff --git a/static/img/Items/outdoor/fence_door.gif b/static/img/Items/outdoor/fence_door.gif deleted file mode 100755 index 561d35a087d1cdd31f87f827d0d4b64c5b14042e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1447 zcmWmDiBD4p0D$plv9ux%3M$NFrBDG&k(S={mEQMzuk_?WOAks*X`vjY99lVxhN5`>4oDz^CXJzj2 zXxl4QEiPrNL)vJQ8O78PS_~KG%h=gg70W24SC#N2v=2f~wOv`z>{K^Z$V?)NoI#3I zsXD5)1C17hza?l>>Ftv$KL$X={b35@NMgYEbF6o`Bw= zX4V+ER#joRLhgdu5udKnDhZ-Oogi0Rl-*HN53X@Q2fMMxvMAvP+dhHR3E4++^7 z<6}o)eoh@)+~wB~Hd$&*MP@NoU%Zu-ogOTg1}s8GPI@K6Etlt`5{l0VR;ZaWW=2g3 ztI-TLlnLulp$q1?5nhK&t}WW?hFDEjaoC}Nxa3fUG+4^_o4`6V=+!ZUrC^{;R$nRz zI~C^-H@J00CNSHBFwY(cxDk%u$m{Vz^{6OZCTy|Gr-tg9Y|X8ox=<=|ci$us?{nbzHZO*Bd~(0(uoI%P69B`%CJ}L}8mKWLJh9$_A^X!782X z^Gx=8{gz_CMFf_79+i0xdH%U02O%G|4#t;7!dpXjfEP$k}MpZN9jGg4--m# z59Wt^`X)MK2|M>F#S4Q;8Pc9a31)6pn#g&2)^}=OYGv)c=P2f+dU(akwu|^@*Zb3Q zzP{~D1mY1IL3uh|eQfsn{tcPJ6H@QKn?i!^GB7%&z#gPp64%b?CF;afhT;9Z5AUSm z2`Dp?OTezajBWlj(xpt(QiHQJ{q)QA@h6fb=*<0#dGwP>Gbyu6p4H`j>n}XSTv>Lh z5;E4mY4<+s9(_`j{+ZynyI;iNleaxDzCqyMs>Kp(bNJctY@cFVV)v`o%A5TZ&YthZ z$kX19qFc^iew-`d^*_p8={q8ho9lndEZiAey7+YLn-#d}<4)E@lt|2`47~z=*tE)X zbS=1JWU+T3kF26Sz~$d0%yPvM=OTTWwtyoMm+oH0(f1}tpM94{i(Tx@p;Vt9OD9J&l=!d*U2^5(Qn1O;H8HC#Ai+hp7$NJ+)X|; zzbqb)UmBPSGR8A-LszfiddmM^8p~|{DoS{Q_TJ8ap1v$i8>yn* zNFv(CuxI|XtrI7;bN|6@eApcAmEj4~KWi|g$U@w@3muDB%moveE7(Vn`znDFUB0?@ z75Qz?hIz`{Jp3Q{<2Q;wswE|*CeR-z%Tn}J1jY1Zw*mmFhG0|HNV7q+dFpWrrT;O* y2y=eFXw(U@ER(+N-l2O2STOe&ZV-K;vsl9~%&2=L{A;2aq(_sF{hOK$@c#qT&kODV diff --git a/static/img/Items/outdoor/fencedoor.png b/static/img/Items/outdoor/fencedoor.png new file mode 100644 index 0000000000000000000000000000000000000000..a2c07f0bd8323c34ce9843e8542cb0c31ee10730 GIT binary patch literal 4078 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 literal 0 HcmV?d00001 diff --git a/static/img/Items/outdoor/fencepiece.png b/static/img/Items/outdoor/fencepiece.png new file mode 100644 index 0000000000000000000000000000000000000000..1bc055ba8e2585570b102cefa814334a52b90b4e GIT binary patch literal 3944 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