From 4cffbf644e84385fc6e7b47f4a8f318c48b7d2ff Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:44:30 +0700 Subject: [PATCH 01/24] fix wooden spear wielded sprite not showing up --- .../overlay_wielded_spear_wood/overlay_wielded_spear_wood.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_wood/overlay_wielded_spear_wood.json diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_wood/overlay_wielded_spear_wood.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_wood/overlay_wielded_spear_wood.json new file mode 100644 index 0000000000..b1484709dc --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_wood/overlay_wielded_spear_wood.json @@ -0,0 +1 @@ +{"id": ["overlay_wielded_spear_wood", "overlay_wielded_spear_wood_simple"], "fg": ["overlay_wielded_spear_wood"], "rotates": false, "bg": []} From ebf993097c5553babee15272f1946892af883572 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:57:24 +0700 Subject: [PATCH 02/24] Create overlay_wielded_spear_knife.json --- .../overlay_wielded_spear_knife/overlay_wielded_spear_knife.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_knife/overlay_wielded_spear_knife.json diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_knife/overlay_wielded_spear_knife.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_knife/overlay_wielded_spear_knife.json new file mode 100644 index 0000000000..dd464714da --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_spear_knife/overlay_wielded_spear_knife.json @@ -0,0 +1 @@ +{"id": ["overlay_wielded_spear_knife", "overlay_wielded_spear_knife_proper"], "fg": ["overlay_wielded_spear_knife"], "bg": []} From 783a63a189f564b83c7444a1f2b89c4e959d1cc7 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:32:39 +0700 Subject: [PATCH 03/24] fix some fursuit worn sprites not showing --- .../pngs_tall_32x48/overlay/fursuits/fursuits.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_tall_32x48/overlay/fursuits/fursuits.json diff --git a/gfx/MShockXotto+/pngs_tall_32x48/overlay/fursuits/fursuits.json b/gfx/MShockXotto+/pngs_tall_32x48/overlay/fursuits/fursuits.json new file mode 100644 index 0000000000..5470ed0aca --- /dev/null +++ b/gfx/MShockXotto+/pngs_tall_32x48/overlay/fursuits/fursuits.json @@ -0,0 +1,14 @@ +[ + { + "id": [ "overlay_worn_fursuit_var_dragonsuit" ], + "fg": [ "overlay_worn_dragonsuit" ] + }, + { + "id": [ "overlay_worn_fursuit_var_felinesuit" ], + "fg": [ "overlay_worn_felinesuit" ] + }, + { + "id": [ "overlay_worn_fursuit_var_sharksuit" ], + "fg": [ "overlay_worn_sharksuit" ] + } +] From 6adddd4a5723bb2116c545adb104d7e35f3b1960 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:03:31 +0700 Subject: [PATCH 04/24] Create xe_f_balefire.json --- .../furniture/xe_f_balefire/xe_f_balefire.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json new file mode 100644 index 0000000000..b7f5d09d0a --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json @@ -0,0 +1,13 @@ +{ + "id": "xe_f_balefire", + "animated": true, + "fg": [ + { "weight": 8, "sprite": "xe_f_balefire1_0" }, + { "weight": 8, "sprite": "xe_f_balefire1_1" }, + { "weight": 8, "sprite": "xe_f_balefire1_2" }, + { "weight": 8, "sprite": "xe_f_balefire1_3" }, + { "weight": 8, "sprite": "xe_f_balefire1_4" }, + { "weight": 8, "sprite": "xe_f_balefire1_5" }, + { "weight": 8, "sprite": "xe_f_balefire1_6" } + ] +} From f93863ef783f60077da2daaa5126665af72b592f Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:04:03 +0700 Subject: [PATCH 05/24] Add files via upload --- .../furniture/xe_f_balefire/xe_f_balefire_0.png | Bin 0 -> 327 bytes .../furniture/xe_f_balefire/xe_f_balefire_1.png | Bin 0 -> 280 bytes .../furniture/xe_f_balefire/xe_f_balefire_2.png | Bin 0 -> 338 bytes .../furniture/xe_f_balefire/xe_f_balefire_3.png | Bin 0 -> 355 bytes .../furniture/xe_f_balefire/xe_f_balefire_4.png | Bin 0 -> 346 bytes .../furniture/xe_f_balefire/xe_f_balefire_5.png | Bin 0 -> 306 bytes .../furniture/xe_f_balefire/xe_f_balefire_6.png | Bin 0 -> 302 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_0.png create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_1.png create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_2.png create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_3.png create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_4.png create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_5.png create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_6.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_0.png new file mode 100644 index 0000000000000000000000000000000000000000..324b712742add57f0e140ed8b5d73640cd5ef6dc GIT binary patch literal 327 zcmV-N0l5B&P)C#XGxVRD#4M2*#Pr+qlY5)i~fER=oAiUN;9Fsd*fY$J|?R+r>dRu5L z0O9%oIPU>=tJX5@g??F79L?dan%_kYy%41^ujKg_^F%*Z4x)CE`oWQjwS!OdYCMM$YsMa}CzpPjbtvfgFnbr>nG+7nWnu=gRwOLA*2J(w2(KEall(!(mw(I&VjPx zLji>yINn6`&R$Uf9LKDF=xf-Xk(WR$Q5(-Ek?Z>U;Rx48GzDqvu>t!k#(cElh_M0M e;SNlI>A(Z&0T#Cd!V5(J0000UtP)65TYS!0c5RKdPwsP;Qi3=c*P+n)lcSF2Ot`z6WKkJTH*s500_n_7Yk~W z8UWNTvRi`F0-#1!7Z?C(A$0C<0jjm3#DOXh3_#VLzyP=p?sM=IyU?>I*!f`0!=8Sx zquZ9WD~tmJ#4mQ@x6}#kpV4=}@3+QWPdlTkK?*JEfLufLZu2#39tvdvpf9k1)bgnyV2M>5iAeQVk0MY0J@uKvfx)Mm^ zq)9GV`VI_6y>ZmU`0~hEB_jX;002ovPDHLkV1ht# BlS2Ri literal 0 HcmV?d00001 diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_4.png new file mode 100644 index 0000000000000000000000000000000000000000..d06ab82ec699cb26424172765094193f4d70ffac GIT binary patch literal 346 zcmV-g0j2(lP)J{Up5>wvOp6VuZ9dEX2L%#P<`G3Urfh+Fc^ zn`h|_EaR-Gg^5b(1)v}x_~YJR0BrRX{I*A1@9gbBZ^BqZ0!SVBNe9+f{V2)+NV%n4xj4vhIj(mn$Ab1Z)urvfNiFCW4Tf=mHW zRFCDhX~^Z)tcO-A04riXR95Xl{1C)XL3meQU&Pn3atN#TA}NG|SPg{h&FalXkU%-u ze)#3BdlzCqCyHAkRBOdyyFcnUNgUov2Rg|hX2p>R;^7u_{9*4K3IJj=BsUe-ZHLh- sj#%{&!Z)fi1Smu8fRfAQlK@f&UVt7lu4nG_ssI2007*qoM6N<$f_=%6ZU6uP literal 0 HcmV?d00001 diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_5.png b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_5.png new file mode 100644 index 0000000000000000000000000000000000000000..499896e8d477e5b2ae4549916796001e889ff857 GIT binary patch literal 306 zcmV-20nPr2P)eroW6NCu> zs-gaT&vn+a literal 0 HcmV?d00001 diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_6.png b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire_6.png new file mode 100644 index 0000000000000000000000000000000000000000..440fad2766d946ce9319364cd3712d3123edee67 GIT binary patch literal 302 zcmV+}0nz@6P)Nkl}KX2ZA=0t6BYwfNVZKItJXk0yR(iIFXB@i>Im!ifFC5OJWi*p$5t8|#b{I Date: Tue, 21 Jan 2025 17:07:02 +0700 Subject: [PATCH 06/24] Add files via upload --- .../mods/Xedra_evolved/furnitures/xe_f_throne.png | Bin 0 -> 680 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/MShockXotto+/pngs_tall_32x48/mods/Xedra_evolved/furnitures/xe_f_throne.png diff --git a/gfx/MShockXotto+/pngs_tall_32x48/mods/Xedra_evolved/furnitures/xe_f_throne.png b/gfx/MShockXotto+/pngs_tall_32x48/mods/Xedra_evolved/furnitures/xe_f_throne.png new file mode 100644 index 0000000000000000000000000000000000000000..b225497bfc3e74a627679fc1b04ee6a38ddcdfde GIT binary patch literal 680 zcmV;Z0$2TsP)-zxWe?IMM zEGEu>PuD3J9`2MZId#LNuRnDGku#}$6^J!A4?UCCIi}Uv05Y$h(~T-&+zJ~2*Uz+X z0+?ETtDU@rx`XeCel9YuL7c4$CV+{&lnAD>5eUu6cL8aoj^7(kffUxN%dsY(H$KP{ za|8oT<7E)ZT-+ReZv~pH{8H?@*JzCu;KGyrN_4PY^m$q5uWsAcIZT);fI7#u-dZn2 zwT&fb0@ozKkz>@xd1(MwV+D8s`rXgJ?|vFD6_W3NIY%+ts|r9S%WBH=nYMt>&%Eyi zxO?sgLujVyyplXCHlYdtiIA|-`mp5*9`|kmGRxI;2a~5F z*!@?i0`M6CC=@C+0E|k@lY1-geZYJ^H2@dORm*!GYwKqM;7NHE@XTnN3n15gOFl%j z2`P?_;3$Xnf82KrbM?pgiCGXVm!G}jhn$*b1>1N;E&NyM`wolNck O0000 Date: Tue, 21 Jan 2025 17:08:54 +0700 Subject: [PATCH 07/24] Create portable_generator.png --- .../items/portable_generator/portable_generator.png | 1 + 1 file changed, 1 insertion(+) create mode 100644 gfx/MShockXotto+/pngs_small_20x20/items/portable_generator/portable_generator.png diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/portable_generator/portable_generator.png b/gfx/MShockXotto+/pngs_small_20x20/items/portable_generator/portable_generator.png new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/gfx/MShockXotto+/pngs_small_20x20/items/portable_generator/portable_generator.png @@ -0,0 +1 @@ + From 2751a9f548fee5502c173118cb85d596577f23ec Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:09:39 +0700 Subject: [PATCH 08/24] Add files via upload --- .../portable_generator/portable_generator.png | Bin 1 -> 430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/portable_generator/portable_generator.png b/gfx/MShockXotto+/pngs_small_20x20/items/portable_generator/portable_generator.png index 8b137891791fe96927ad78e64b0aad7bded08bdc..e2c2711bc0502bb5d8d363bf254218bfc9b5e5a3 100644 GIT binary patch literal 430 zcmV;f0a5;mP)4{x!VGJA-=YiSkzo)N;K8B{ zA@u&k7lxa6o**Y1WHV6mB-lWNR@^KZX;H8wC_MrJih(#I#nw`rK}t*rj6rO4fXy(F z8km6?uKT!nC&RDbzrmPT!$9hgoeNI!pm4+oK;eg`4@Eh$fiMY_tOOH8qOs{glBO~f Y00>8DagZawxBvhE07*qoM6N<$f>o!kDgXcg literal 1 Icmd-A000XB3jhEB From ff08a35043433a9450150d90a98481df3b74dada Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:10:54 +0700 Subject: [PATCH 09/24] Create f_portable_generator.png --- .../furnitures/f_portable_generator/f_portable_generator.png | 1 + 1 file changed, 1 insertion(+) create mode 100644 gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/f_portable_generator.png diff --git a/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/f_portable_generator.png b/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/f_portable_generator.png new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/f_portable_generator.png @@ -0,0 +1 @@ + From f985bd7a85fb21190b835a98b6f5111ae88f5597 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:11:59 +0700 Subject: [PATCH 10/24] Add files via upload --- .../f_portable_generator/f_portable_generator.png | Bin 1 -> 448 bytes .../f_portable_generator/portable_generator.json | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/portable_generator.json diff --git a/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/f_portable_generator.png b/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/f_portable_generator.png index 8b137891791fe96927ad78e64b0aad7bded08bdc..97253a7a2c564e0d6de9f1a762af4bbfa2933bed 100644 GIT binary patch literal 448 zcmV;x0YCnUP)6YZ)Scwv)OfguS!LZQjsvQ3J1FXRG3=)jzuRMP=M|(UWew@ zx2tlYKj2|4r`~*xY%r_Fl0`ZC-G6kbw#71eb(~zQA-7lGS>H&t!@S^$$GQ!)!jLY zzf(Fp?5gDEeL{`RFE!s-3xs`j6DmzZC`}nB2VH9HPpi3UL{Xb=TTe`873!Ym=`#g8 zv$`~v&46JvA(8^WFTUaV3xfncQIh16@7L(#_>ww{`N9mivd|~&Bft`xr*jx|v3D8_ z8rwtsJyZZNps@7^38Vfn{DmKE)-qOj>-6v;9M-`N5Oev$ZPN9@p_Xn|Aw>ON>b6QS qV$2-AhnZJha>GWV9C{2iHva*j=Wx=8CTdCm0000 Date: Tue, 21 Jan 2025 17:13:44 +0700 Subject: [PATCH 11/24] Create f_12000_gasoline_generator.png --- .../f_12000_gasoline_generator/f_12000_gasoline_generator.png | 1 + 1 file changed, 1 insertion(+) create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/f_12000_gasoline_generator.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/f_12000_gasoline_generator.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/f_12000_gasoline_generator.png new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/f_12000_gasoline_generator.png @@ -0,0 +1 @@ + From b0021d2ab554e1f318177f370ababae711906c52 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:14:20 +0700 Subject: [PATCH 12/24] Add files via upload --- .../f_12000_gasoline_generator.png | Bin 1 -> 966 bytes .../gasoline_generator.json | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/f_12000_gasoline_generator.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/f_12000_gasoline_generator.png index 8b137891791fe96927ad78e64b0aad7bded08bdc..1250e61a840247cc48783e3fd97b4bfac47f3a08 100644 GIT binary patch literal 966 zcmV;%13CPOP)FCOtE^RMkVv&Lq(!NqSe zE--|aDRedfBy#AWDN$}D;CFlzw4zVo_qzw#2|$W4B6L1^NF@5oJ)?FH;srn{{A_TL z006v!xB+k_+}_zq0Nq_(Zb9gLr~o_(CspBoPftdW>gp4GP&F;hMWi>>aY%bTK4tdb zPMfLj@9m`lS-7pEgT^1-!ZQIdzX0&{8#Uon6F?FI)yauh##x&ihDgXHjP1Hvm7g;8bV&1;x2#8t%+z-fXE5-uyFGjgf0 z4ZxETgtvvq@Ni+7jzp+Naet_s+V6bDaCYM}wVfVW{~thc6uvt$1*1RmNTcO|4>sfT z06srl&7E`7wZ>d!ATl{g6Kd=0t%=+~@!`2GYsD}B6q6`I0L+nFAh4I+Q|gQvK=F-4 zf_@AlM{%>_s@ht48ugVKVDU4J#w%o$_hVzAg5VXCbMnE$cvW9-ZM95^^>x@bE`9{i zR)4L~O^8;01=$nDQ5Xxh(*dwQ*DTC8ABqq3ncslJM=SZ()i?v%_VyNih%kT%f#PBY z@(T)B!?Biy(Mc9gUili@7y#Saay(8D!BB`G@X+CkIRhw;=OJ%*KKk2=S7Dwk0^k@? zi69JtMij?vi1z>si+ikEF~$*#48S%Uh|}xGj;cKtQ_cQzoeqHgY#_KbPQ}ZL<@vV1 zWJiuw%67R=XCyi^OXK*3{4zTO!l}k_f|e(y>u1Vlu`r|j1$-y4DZ6|fga7~l07*qoM6N<$f_s&^<^TWy literal 1 Icmd-A000XB3jhEB diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json new file mode 100644 index 0000000000..08603e33dd --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json @@ -0,0 +1,6 @@ +[ + { + "id": [ "f_12000_gasoline_generator", "ap_12000_gasoline_generator" ], + "fg": "f_12000_gasoline_generator" + } + ] \ No newline at end of file From 3db09ed582b7bb5249ec85eaee5a0ef27c2b98ab Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:17:16 +0700 Subject: [PATCH 13/24] Create 12000_gasoline_generator.png --- .../pngs_tiles_32x32/item/generator/12000_gasoline_generator.png | 1 + 1 file changed, 1 insertion(+) create mode 100644 gfx/MShockXotto+/pngs_tiles_32x32/item/generator/12000_gasoline_generator.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/generator/12000_gasoline_generator.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/generator/12000_gasoline_generator.png new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/generator/12000_gasoline_generator.png @@ -0,0 +1 @@ + From a2c901c58c71cc1e4931d5cd8c2f1d49509a67a7 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:18:25 +0700 Subject: [PATCH 14/24] Add files via upload --- .../item/generator/12000_gasoline_generator.png | Bin 1 -> 985 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/generator/12000_gasoline_generator.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/generator/12000_gasoline_generator.png index 8b137891791fe96927ad78e64b0aad7bded08bdc..528d9f6990b4f87617b387861f42ff92695168f1 100644 GIT binary patch literal 985 zcmV;~119{5P)7@F4v;#o9rnx+vmBkCAxr5Rn%z zmDIsVvhY$DL6DY6Xw{PbtbzoAZu6V&(1)^WN|M-puohP%tS5Gm}=4 z5VjP=xR^LxOVtMs`uZ*W_)cqIR$&*!uk`0r_(*i- z0{OCF1E7Mja~{=(HUT)$AFrw+0D!ceCVKhUAA|{jBl{Y~;iu`xG0OPd=TguocFHVJ3%-fK8oVnOJweZ&nwWzWIeJ3453YKky=f#B>Bv_9>I zVqd!f*exwPw(MaJAbu?9095ukjBG37ag{w-z}j>V{x*BW(E(tsgegZ*l*1IwprISLrEgPT000>rO#}jmVI=Ikcl!o_$mi9(e5YchtJ$oyX>4qy z`MEi_y<9i7v`{XW+u0j&*l_muhllCT;2@0*4T*g_3yw>8?Dz>99dSBzco&O@OIs2c z0752ava;`g3PD^dCCe?7W&mJ8^>H}v@9QIEstbb0lJydVuGivj8^0iYa>>bOTV%yjalh0<(aF{34VS zZDPtE+a>_MEbv`8UoI~aUF^TBg(A{f@XFo>KsmFqP$+z(vzzaf-ObEN;=TYSz6W)& zWe*z@1JLhc!PFOE$a3q*bvZ>DAk2cT_R>iF@%nC8|0CWnF31+GXUPuSBc5(&TdAAk z!*p*lMm04F_3qvF_+MZXu;BQX`_unzM@o9I01(JNlWCTX$NPkR7c3OTT>y~Kzf9&- zQM6n>XN=-i0zRNh5wEOdU7%5KxwZpA0N|{n6gFoTy=RQyv$MCx&QXjl00000NkvXX Hu0mjf=|IoD literal 1 Icmd-A000XB3jhEB From 64124969267d5ae7623cde3ff42c7374e2fc2b3e Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:20:11 +0700 Subject: [PATCH 15/24] Create moonshine_still.json --- .../moonshine_still/moonshine_still.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json diff --git a/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json b/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json new file mode 100644 index 0000000000..160801aff7 --- /dev/null +++ b/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json @@ -0,0 +1,6 @@ +[ + { + "id": [ "moonshine_still", "moonshine_still_1", "moonshine_still_2" ], + "fg": "moonshine_still" + } + ] From 4c6d9acee5a131c724694f13fb2144833d056dd1 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:20:37 +0700 Subject: [PATCH 16/24] Add files via upload --- .../moonshine_still/moonshine_still.png | Bin 0 -> 754 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.png diff --git a/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.png b/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.png new file mode 100644 index 0000000000000000000000000000000000000000..a9111ec7ed2c77da5883d0c6a3aeae22df2ddfce GIT binary patch literal 754 zcmV)5W40*@I=Vv;-3g7lHcLRu5s!ThHY4sFbQ&5{f`-dj*v$KyX+|4Go2b zitOq#p$O2^)nN-SB9MrhF_zd%!bN~2yqO3(WfT&`dduM>KoYz#tXY^#8AOo&yyDD+ zmH;=91k)AePIv=_SsMv(vn)p#M^Q2K4UC{80XpTyT>Sh41J_1GjO`~?+?Y9!$Rv#B^NE^O)hJ(%BLzV9m|gHzJU1j?T_L{J9q zMFI&(=L~-7N&$CnT@WggkaLOYW(+JrC#M^YJ)c=-39N3;XZ9%~6VL^v*U5=2%667G zN_n|tp>J5O^rNc;&U)+Ndab+%GPqpp(Qd7afZJqV&D?%~cf0MAN+bhE3C?|50;{iT z;A4`9kLGcI_O3GXa*mFtMSDtR@?-*Y_b#Kk*)M!KeV!VOOIYydfI>PZV@E73Jf3rC z;K;~prDv-Ki7Nw6W$D7q%tPQkWF$$x3tXVDl zX$U>n6sbF&%b@o0E1HFN+6Cax%Sa$Qo&;+CUr66}{JrmV7m`I?W z`RO$q*QxbGMjH)^0KaUOZH2XGzWp6Nb!k)t!t7@j>S)@~SQxm#)U(9v>ra5I3#d3d zb%Mix6CZ(IBeQ#g#QBl0CD3ga82sEs5n)J3l3D`N72*q8xD@gGlq0gqheXH00gi2wiq07*qoM6N<$f>EMWs{jB1 literal 0 HcmV?d00001 From dd52cdf8a7dfab85d8aec412d083bff269986e3a Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:21:39 +0700 Subject: [PATCH 17/24] Create lighthouse.json --- .../pngs_overmap_tall_32x48/lighthouse/lighthouse.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_overmap_tall_32x48/lighthouse/lighthouse.json diff --git a/gfx/MShockXotto+/pngs_overmap_tall_32x48/lighthouse/lighthouse.json b/gfx/MShockXotto+/pngs_overmap_tall_32x48/lighthouse/lighthouse.json new file mode 100644 index 0000000000..681313810d --- /dev/null +++ b/gfx/MShockXotto+/pngs_overmap_tall_32x48/lighthouse/lighthouse.json @@ -0,0 +1,6 @@ +[ + { + "id": [ "lighthouse_small_ground", "lighthouse_ground" ], + "fg": "lighthouse" + } + ] From cf06e713dce74fb6a55de0f7b9a2e6610bf978ce Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:22:17 +0700 Subject: [PATCH 18/24] Add files via upload --- .../lighthouse/lighthouse.png | Bin 0 -> 1384 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/MShockXotto+/pngs_overmap_tall_32x48/lighthouse/lighthouse.png diff --git a/gfx/MShockXotto+/pngs_overmap_tall_32x48/lighthouse/lighthouse.png b/gfx/MShockXotto+/pngs_overmap_tall_32x48/lighthouse/lighthouse.png new file mode 100644 index 0000000000000000000000000000000000000000..1213ade3ff9b367366627dbaa87851d80cf01500 GIT binary patch literal 1384 zcmV-u1(*7XP)MSk%OAQ3E5y6;r8{3=R$=ltgN#Z506pC)#F6Y-dsfx;Q*M zY|`WLxZ3G-TC&+JRw8seDpsK5@av{nRO80Lh|J8)NYBv`S?qgNrl+S>N6D`sfTVgz zL;(wm2_#T2iHU1L5aGT?dqBH=_ta_G-P0rDY4kvcxBu&&U6Rl~XoNtqv$Ip0o0}z< z%c)*lTPxF?_xhtMiK<%w_WwsO)La3Ocoq+Jq*`G2B7` zzwMoX_QIS#Qn)PoSb1&^r|KerWE8yh!ckf69Z+zPaD~2V;D`qSoY8t8)KC&!esz>y z@PVW!RqID?Lc4G^8-U#ZYB8?AAp$L5pO=Jn7hpTk`6Pj!Sjy)`0-BFR8X~|V)QS9* zaNp6Cf~SVm-Gr#iCWK93*bsN@dn?}!5nwqiy(IfMG#dU=6B?guY}pp*-uFIb>a!R0 zCN$nkBb31X)<-pC<@9TnnV#pJzJ%n)rp*mVPz19P0~0N0AOQkzTlrmXjJ_*}`gd6= zzPYmM-SM70dn7G6uiMdd?kT`k+=8okv!?*SkRWgZYk>Fa?@IV2yp<5^6zF{E6x^B2 z>Tu`&<4iNUY7@HP0CvGyrTdYcN&=m)$FDTOlkm#1jP$3T6cS+`bRYp6JPeqHb~HU8 zHVOK1GH?p=v%eXaOCqob7+vj)Id5x_P_d39niBG>{46hZzbw7oPw4o}XjZr#Wdv+? z-(I?@!H@0Tp*rk!_0PM3(>Mw4Feg9P z9Do4E$+-K^hU!c6t7aw83s~thqvwL}0aK}l5d`k0kc8{!SbN~)bN6I<^@6nh9ryIQ zyt&ucZHc&ib1x(OIs!5o8guY7hI0VsDH;1|nQo)G<)#PBjAIah-~^(k-$~OUPl>st zJTERJEI*|t0T;j?lLU&vZ_i=xc}ieY@a6tpUC^ZfZ#~_VW}NT1xprHxB>*THR`zFsB2b$AUu*7+k1tvy>wg| zn;_nT@P`s$B8hMuq)|L5 qE(p}lk3_&u*lIhl2euj{tlocB)k>CT$K+oC0000- literal 0 HcmV?d00001 From 0c47442349549280fcc4a292c78eed56f6d862d1 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:32:54 +0700 Subject: [PATCH 19/24] Update xe_f_balefire.json --- .../furniture/xe_f_balefire/xe_f_balefire.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json index b7f5d09d0a..5997bfb688 100644 --- a/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json +++ b/gfx/MShockXotto+/pngs_tiles_32x32/mods/xedra_evolved/furniture/xe_f_balefire/xe_f_balefire.json @@ -2,12 +2,12 @@ "id": "xe_f_balefire", "animated": true, "fg": [ - { "weight": 8, "sprite": "xe_f_balefire1_0" }, - { "weight": 8, "sprite": "xe_f_balefire1_1" }, - { "weight": 8, "sprite": "xe_f_balefire1_2" }, - { "weight": 8, "sprite": "xe_f_balefire1_3" }, - { "weight": 8, "sprite": "xe_f_balefire1_4" }, - { "weight": 8, "sprite": "xe_f_balefire1_5" }, - { "weight": 8, "sprite": "xe_f_balefire1_6" } + { "weight": 8, "sprite": "xe_f_balefire_0" }, + { "weight": 8, "sprite": "xe_f_balefire_1" }, + { "weight": 8, "sprite": "xe_f_balefire_2" }, + { "weight": 8, "sprite": "xe_f_balefire_3" }, + { "weight": 8, "sprite": "xe_f_balefire_4" }, + { "weight": 8, "sprite": "xe_f_balefire_5" }, + { "weight": 8, "sprite": "xe_f_balefire_6" } ] } From 042935105bc49896c310944a5cfecdb69e9ce850 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:36:03 +0700 Subject: [PATCH 20/24] Delete gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still directory --- .../moonshine_still/moonshine_still.json | 6 ------ .../moonshine_still/moonshine_still.png | Bin 754 -> 0 bytes 2 files changed, 6 deletions(-) delete mode 100644 gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json delete mode 100644 gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.png diff --git a/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json b/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json deleted file mode 100644 index 160801aff7..0000000000 --- a/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "id": [ "moonshine_still", "moonshine_still_1", "moonshine_still_2" ], - "fg": "moonshine_still" - } - ] diff --git a/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.png b/gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still/moonshine_still.png deleted file mode 100644 index a9111ec7ed2c77da5883d0c6a3aeae22df2ddfce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 754 zcmV)5W40*@I=Vv;-3g7lHcLRu5s!ThHY4sFbQ&5{f`-dj*v$KyX+|4Go2b zitOq#p$O2^)nN-SB9MrhF_zd%!bN~2yqO3(WfT&`dduM>KoYz#tXY^#8AOo&yyDD+ zmH;=91k)AePIv=_SsMv(vn)p#M^Q2K4UC{80XpTyT>Sh41J_1GjO`~?+?Y9!$Rv#B^NE^O)hJ(%BLzV9m|gHzJU1j?T_L{J9q zMFI&(=L~-7N&$CnT@WggkaLOYW(+JrC#M^YJ)c=-39N3;XZ9%~6VL^v*U5=2%667G zN_n|tp>J5O^rNc;&U)+Ndab+%GPqpp(Qd7afZJqV&D?%~cf0MAN+bhE3C?|50;{iT z;A4`9kLGcI_O3GXa*mFtMSDtR@?-*Y_b#Kk*)M!KeV!VOOIYydfI>PZV@E73Jf3rC z;K;~prDv-Ki7Nw6W$D7q%tPQkWF$$x3tXVDl zX$U>n6sbF&%b@o0E1HFN+6Cax%Sa$Qo&;+CUr66}{JrmV7m`I?W z`RO$q*QxbGMjH)^0KaUOZH2XGzWp6Nb!k)t!t7@j>S)@~SQxm#)U(9v>ra5I3#d3d zb%Mix6CZ(IBeQ#g#QBl0CD3ga82sEs5n)J3l3D`N72*q8xD@gGlq0gqheXH00gi2wiq07*qoM6N<$f>EMWs{jB1 From 37233889f68cb497cd3c13bde0a0c1bd73c636f2 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:36:55 +0700 Subject: [PATCH 21/24] Create moonshine_still.json --- .../pngs_overmap_32x32/moonshine_still/moonshine_still.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_overmap_32x32/moonshine_still/moonshine_still.json diff --git a/gfx/MShockXotto+/pngs_overmap_32x32/moonshine_still/moonshine_still.json b/gfx/MShockXotto+/pngs_overmap_32x32/moonshine_still/moonshine_still.json new file mode 100644 index 0000000000..160801aff7 --- /dev/null +++ b/gfx/MShockXotto+/pngs_overmap_32x32/moonshine_still/moonshine_still.json @@ -0,0 +1,6 @@ +[ + { + "id": [ "moonshine_still", "moonshine_still_1", "moonshine_still_2" ], + "fg": "moonshine_still" + } + ] From 2099c77fd0151b9c1efdbeb0284651eb4e58898b Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:38:38 +0700 Subject: [PATCH 22/24] Add files via upload --- .../moonshine_still/moonshine_still.png | Bin 0 -> 754 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/MShockXotto+/pngs_overmap_32x32/moonshine_still/moonshine_still.png diff --git a/gfx/MShockXotto+/pngs_overmap_32x32/moonshine_still/moonshine_still.png b/gfx/MShockXotto+/pngs_overmap_32x32/moonshine_still/moonshine_still.png new file mode 100644 index 0000000000000000000000000000000000000000..a9111ec7ed2c77da5883d0c6a3aeae22df2ddfce GIT binary patch literal 754 zcmV)5W40*@I=Vv;-3g7lHcLRu5s!ThHY4sFbQ&5{f`-dj*v$KyX+|4Go2b zitOq#p$O2^)nN-SB9MrhF_zd%!bN~2yqO3(WfT&`dduM>KoYz#tXY^#8AOo&yyDD+ zmH;=91k)AePIv=_SsMv(vn)p#M^Q2K4UC{80XpTyT>Sh41J_1GjO`~?+?Y9!$Rv#B^NE^O)hJ(%BLzV9m|gHzJU1j?T_L{J9q zMFI&(=L~-7N&$CnT@WggkaLOYW(+JrC#M^YJ)c=-39N3;XZ9%~6VL^v*U5=2%667G zN_n|tp>J5O^rNc;&U)+Ndab+%GPqpp(Qd7afZJqV&D?%~cf0MAN+bhE3C?|50;{iT z;A4`9kLGcI_O3GXa*mFtMSDtR@?-*Y_b#Kk*)M!KeV!VOOIYydfI>PZV@E73Jf3rC z;K;~prDv-Ki7Nw6W$D7q%tPQkWF$$x3tXVDl zX$U>n6sbF&%b@o0E1HFN+6Cax%Sa$Qo&;+CUr66}{JrmV7m`I?W z`RO$q*QxbGMjH)^0KaUOZH2XGzWp6Nb!k)t!t7@j>S)@~SQxm#)U(9v>ra5I3#d3d zb%Mix6CZ(IBeQ#g#QBl0CD3ga82sEs5n)J3l3D`N72*q8xD@gGlq0gqheXH00gi2wiq07*qoM6N<$f>EMWs{jB1 literal 0 HcmV?d00001 From d0be6e0ff549aa905c3424f832b7582667b11be7 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:08:56 +0700 Subject: [PATCH 23/24] Update gasoline_generator.json --- .../f_12000_gasoline_generator/gasoline_generator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json index 08603e33dd..df310832f9 100644 --- a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json +++ b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_12000_gasoline_generator/gasoline_generator.json @@ -1,6 +1,6 @@ [ { - "id": [ "f_12000_gasoline_generator", "ap_12000_gasoline_generator" ], + "id": [ "f_12000_gasoline_generator", "vp_ap_12000_gasoline_generator" ], "fg": "f_12000_gasoline_generator" } - ] \ No newline at end of file + ] From 2067d6345b0996bc2a3e9e5719da2824a852e0d7 Mon Sep 17 00:00:00 2001 From: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:10:41 +0700 Subject: [PATCH 24/24] Update portable_generator.json --- .../furnitures/f_portable_generator/portable_generator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/portable_generator.json b/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/portable_generator.json index 4397059168..a452639d75 100644 --- a/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/portable_generator.json +++ b/gfx/MShockXotto+/pngs_small_20x20/furnitures/f_portable_generator/portable_generator.json @@ -1,6 +1,6 @@ [ { - "id": [ "f_portable_generator", "ap_portable_generator" ], + "id": [ "f_portable_generator", "vp_ap_portable_generator" ], "fg": "f_portable_generator" } - ] \ No newline at end of file + ]