From 4e3e8ad03cfe14ea9e053587fc3f19ea0e6620d4 Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Mon, 19 Aug 2024 23:20:12 -0500 Subject: [PATCH] Mothroaches can now wear hamster-wearable clothes + pet inventory tweaks (#28956) * moth displacement + inventory tweaks * Fix off by 1 on the head sprites * Move files to main mothroach folder * Fix mask up a bit * Fix side mask sprites * Change format because it changed forever ago --- .../Catalog/Cargo/cargo_livestock.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 39 +++++++++++++++++- .../hamster_inventory_template.yml | 7 ++-- .../pet_inventory_template.yml | 5 +-- .../mothroach/displacement.rsi/eyes.png | Bin 0 -> 308 bytes .../mothroach/displacement.rsi/head.png | Bin 0 -> 703 bytes .../mothroach/displacement.rsi/mask.png | Bin 0 -> 731 bytes .../mothroach/displacement.rsi/meta.json | 35 ++++++++++++++++ .../mothroach/displacement.rsi/neck.png | Bin 0 -> 324 bytes .../displacement.rsi/suitstorage.png | Bin 0 -> 672 bytes .../mothroach.rsi/0-equipped-HELMET.png | Bin .../{ => mothroach}/mothroach.rsi/icon.png | Bin .../mothroach.rsi/inhand-left.png | Bin .../mothroach.rsi/inhand-right.png | Bin .../{ => mothroach}/mothroach.rsi/meta.json | 0 .../mothroach.rsi/mothroach-moving.png | Bin .../mothroach.rsi/mothroach.png | Bin .../mothroach.rsi/mothroach_dead.png | Bin .../mothroach.rsi/mothroach_lazy.png | Bin .../mothroach.rsi/mothroach_sleep.png | Bin 20 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/eyes.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/head.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/mask.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/neck.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/suitstorage.png rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/0-equipped-HELMET.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/icon.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/inhand-left.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/inhand-right.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/meta.json (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/mothroach-moving.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/mothroach.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/mothroach_dead.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/mothroach_lazy.png (100%) rename Resources/Textures/Mobs/Animals/{ => mothroach}/mothroach.rsi/mothroach_sleep.png (100%) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index f44cb61f73..667b83ec3f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -221,7 +221,7 @@ - type: cargoProduct id: LivestockMothroach icon: - sprite: Mobs/Animals/mothroach.rsi + sprite: Mobs/Animals/mothroach/mothroach.rsi state: mothroach product: CrateNPCMothroach cost: 5000 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index a403486338..7d3acddcfe 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -444,7 +444,7 @@ insertingState: inserting_mothroach - type: MothAccent - type: Sprite - sprite: Mobs/Animals/mothroach.rsi + sprite: Mobs/Animals/mothroach/mothroach.rsi layers: - map: ["enum.DamageStateVisualLayers.Base", "movement"] state: mothroach @@ -459,7 +459,7 @@ size: Normal - type: Clothing quickEquip: false - sprite: Mobs/Animals/mothroach.rsi + sprite: Mobs/Animals/mothroach/mothroach.rsi equippedPrefix: 0 slots: - HEAD @@ -538,6 +538,41 @@ - type: FireVisuals sprite: Mobs/Effects/onfire.rsi normalState: Mouse_burning + - type: Strippable + - type: UserInterface + interfaces: + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface + - type: InventorySlots + - type: Inventory + speciesId: hamster + templateId: hamster + displacements: + head: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: head + mask: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: mask + suitstorage: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: suitstorage + eyes: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: eyes + neck: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: neck # Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures diff --git a/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml index 3170417d9d..f48ae94e69 100644 --- a/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml @@ -15,7 +15,7 @@ slotTexture: neck slotFlags: NECK uiWindowPos: 0,1 - strippingWindowPos: 1,0 + strippingWindowPos: 0,1 displayName: Neck whitelist: tags: @@ -24,7 +24,7 @@ slotTexture: glasses slotFlags: EYES stripTime: 3 - uiWindowPos: 0,1 + uiWindowPos: 0,2 strippingWindowPos: 0,0 displayName: Eyes whitelist: @@ -33,9 +33,8 @@ - name: suitstorage slotTexture: suit_storage slotFlags: SUITSTORAGE - slotGroup: SecondHotbar stripTime: 3 - uiWindowPos: 2,0 + uiWindowPos: 1,0 strippingWindowPos: 2,5 displayName: Suit Storage whitelist: diff --git a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml index 1297b65d8d..e6c2984221 100644 --- a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml @@ -4,7 +4,7 @@ - name: mask slotTexture: mask slotFlags: MASK - uiWindowPos: 1,0 + uiWindowPos: 0,2 strippingWindowPos: 1,1 displayName: Mask whitelist: @@ -14,9 +14,8 @@ - name: suitstorage slotTexture: suit_storage slotFlags: SUITSTORAGE - slotGroup: SecondHotbar stripTime: 3 - uiWindowPos: 2,0 + uiWindowPos: 0,1 strippingWindowPos: 2,5 displayName: Suit Storage whitelist: diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/eyes.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..2cb7e553b6ed9d0251cb83b4fbb88f2ed109889b GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g&w>hE&XX zdu=0Evw?`)!|a!L%=KJrUhBPmcS%A^Ui`nYrG$-Tr{d|?k@I&MnCmX^WI(|Nr*~c5 zl(+TG{QgZPyE*%OzMPm7#WExI?yCESQGb{=cbgckb8WaOYXG8*L3%Rzopr0FAnD4gdfE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/head.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/head.png new file mode 100644 index 0000000000000000000000000000000000000000..d77878fdcc45e6870c6723d5fa0f58883e78eccd GIT binary patch literal 703 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-x3^QF z$Z`9uRQ|;a+dA5;BTO_r98KCB^{y>oi`1>EWwq1$uBEuv(YyJAz}7EPzxcCwqqv(E za41R5uGUrDUK|?WbpC1i`S$nkYxtkf^MuplUjq)TU*mRN)A)P4+Twyy*cJ{ zRF_Bw{J3`MacSLVi`eJ--CsR27~h2XtKL2IQ7p{3%CExf#@y4>t{k(uHhssWpHnwH zF|>Rv(Zcb-UD2=8caz9RuXCr*-TGZ)df$lkQ^z3=gf_KhalV|UcZ&b9Ow9f1T3%4WGC9b8 z%SZOtf*A~~sxLW#AKHk75G+7{BSmoMDo(|gy4PD1v zHwa#P`M6xvb;A4ky`HoDs=88|*ZJw6f6TCjp_lmrlL?;#_XP_E-4D9OVY4;|{oFZK zl+UkYMYrE>`;F8~OL$lJ$TCvsO7RP%{b10yJZ-&t;lxw_feDkr)78&qol`;+ E01W;zzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/mask.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/mask.png new file mode 100644 index 0000000000000000000000000000000000000000..5eb6ea0163df86c6cbab0be09430e19b7656aa8e GIT binary patch literal 731 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Y-xA)-y zkz@7O)a}?sU1W?_SVRc0zSIzXvxskN)B2^onc6CbD!NMRn!242I+lDi{UQHCYljv` zlTwF;)$b^mM?05YQ2N$3`}5=7->v7=G+tP;GCJ<8L`2!S-s6jI-TBiL_TNdCw?t^6 z>B{PJSI)RJb-n)Frxluicvbk*>i_GOr5?V#aFt_4Nco*P8+;Bwi8>d!NB7Rc^vS0W zwI6C;$D>iR^h?Nr^IgV_`?br2KNfPVoENpMCpdLYdaQSa!;b4lpQ{SxzN(&Wv$a;< z8ePUOSD55-(PLsd>tvb4mD^Ij?azO4-TdsTijqp}HIKWLox}DtFM76gwW6u+F2(+n zyH5ShpBGn^V)5dhOzSQ6`}MDzf64yP`|;dZm9lW^+e>Sz}|pMRs0Kb zh0p1EM`ekh+rHrSLC;+$<5xzNY0PcA9-J|={hM?~49_O5dBsKioxDF?uW#7S|F>v= z?n`!4vkawezlwmt'?;uumf=j{wfz9s_^*67r?y`np|ald8~_ieuQ|FV_IK2IMX z7Hgk{O&`m6H6=RFo&V;M{`y6(<;KIGH5haq7Bg&N=w-UVWWwdZT@g85;Ckxr_owbh zcP_rmc}?cUo-6W~Q>5n|wA%gi+x;Y-Le7Y^E4$`vJ5=p0O4>00-`0xt?`QqJlkV{I z>^e;=hII_@H}y#*c9mdKI;Vst0QCGvIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/meta.json new file mode 100644 index 0000000000..30fcee2998 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Vermidia", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "head", + "directions": 4 + }, + { + "name": "mask", + "directions": 4 + }, + { + "name": "suitstorage", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "neck", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/neck.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/neck.png new file mode 100644 index 0000000000000000000000000000000000000000..c503f75e1d2e7ca9ee4a68d7f200d432ebec0060 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{&~7MhE&XX zJKd41*+787{Alw2J7OPiw|=`Iw`6+SVk4b%4G$D2opf=%{a0-L4Ts-yi*shxuZd{6)Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/suitstorage.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/suitstorage.png new file mode 100644 index 0000000000000000000000000000000000000000..b37a81363fc85e7526f0d321a6fab397536be710 GIT binary patch literal 672 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-x3^QF z$Z`9uRQ|;a+dA5;BTO_r98KCB^{y>oi`1>EWwq1$uBEuv(YyJAz}7EPzxcCwqqv(E za41R5uGUrDUK|?WbpC1i`S$nkYxtkf^MuplUjq)TU*mRN)A)P4+Twyy*cJ{ zRF_Bw{J3`MacSLVi`eJ--CsR27~h2XtKL2IQ7p{3%CExf#@y4>t{k(uHhssWpHnwH zF|>Rv(Zcb-UD2=8caz9RuXCr*-TGZ)df$lkQ^z3=gf_KhalV|UcZ&b9Ow9f1T3%4WGC9b8 z%SZOtf*A~~sxLW#5%AX2#WAE}&fDo51)Cjs4*aonOPVV(vn5%G>)J`bCCfKuwls%a zEI9G#XZ5j7#{~JGxpH5SXb@Xq$e`ITMB|C#?}{0{gvz W8i6x^I~oB!&fw|l=d#Wzp$P!H-XfU* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/0-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/0-equipped-HELMET.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/0-equipped-HELMET.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/icon.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/icon.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/icon.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-left.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-left.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-right.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-right.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/meta.json rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach-moving.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach-moving.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach-moving.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_dead.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_dead.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_dead.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_lazy.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_lazy.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_lazy.png diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_sleep.png similarity index 100% rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_sleep.png rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_sleep.png -- 2.51.2