From 5d0d37161dddcdf4f3c65d3a267e257273a82b7a Mon Sep 17 00:00:00 2001 From: zHonys <69396539+zHonys@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:49:05 -0300 Subject: [PATCH] Added support so that smile can use hats (#33924) * Added support so that smile can use hats Changed Prototypes/Entities/Mobs/NPCs/pets.yml Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi Added smile_displacement.rsi/meta.json Added smile_displacement.rsi/head.png * Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1 Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/ Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi * Minor fixes: removing comments and change naming Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi * Removed smile_inventory_template.yml and used head_inventory_template.yml instead --- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 14 ++++++++++++-- .../{ => Smile}/smile.rsi/inhand-left.png | Bin .../{ => Smile}/smile.rsi/inhand-right.png | Bin .../Mobs/Pets/{ => Smile}/smile.rsi/meta.json | 0 .../Smile/smile_displacement.rsi/head.png | Bin 0 -> 236 bytes .../Smile/smile_displacement.rsi/meta.json | 18 ++++++++++++++++++ 6 files changed, 30 insertions(+), 2 deletions(-) rename Resources/Textures/Mobs/Pets/{ => Smile}/smile.rsi/inhand-left.png (100%) rename Resources/Textures/Mobs/Pets/{ => Smile}/smile.rsi/inhand-right.png (100%) rename Resources/Textures/Mobs/Pets/{ => Smile}/smile.rsi/meta.json (100%) create mode 100644 Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/head.png create mode 100644 Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 5adb8914457d..4cee650e0f9e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -712,7 +712,7 @@ - type: entity name: Smile id: MobSlimesPet - parent: MobAdultSlimes + parent: [MobAdultSlimes, StripableInventoryBase] description: This masterpiece has gone through thousands of experiments. But it is the sweetest creature in the world. Smile Slime! components: - type: Sprite @@ -722,6 +722,16 @@ - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] state: aslime-_3 shader: unshaded + - map: [ "head" ] + - type: Inventory + speciesId: slime + templateId: head + displacements: + head: + sizeMaps: + 32: + sprite: Mobs/Pets/Smile/smile_displacement.rsi + state: head - type: MobThresholds thresholds: 0: Alive @@ -767,7 +777,7 @@ Caustic: 1 - type: MultiHandedItem - type: Item - sprite: Mobs/Pets/smile.rsi + sprite: Mobs/Pets/Smile/smile.rsi size: Huge - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-slime diff --git a/Resources/Textures/Mobs/Pets/smile.rsi/inhand-left.png b/Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Mobs/Pets/smile.rsi/inhand-left.png rename to Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-left.png diff --git a/Resources/Textures/Mobs/Pets/smile.rsi/inhand-right.png b/Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Mobs/Pets/smile.rsi/inhand-right.png rename to Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-right.png diff --git a/Resources/Textures/Mobs/Pets/smile.rsi/meta.json b/Resources/Textures/Mobs/Pets/Smile/smile.rsi/meta.json similarity index 100% rename from Resources/Textures/Mobs/Pets/smile.rsi/meta.json rename to Resources/Textures/Mobs/Pets/Smile/smile.rsi/meta.json diff --git a/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/head.png b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/head.png new file mode 100644 index 0000000000000000000000000000000000000000..a579919824015b187ab41f3e38719b6591ea2f93 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mU+53hE&XX zdvhaiLjcc_3oM2vvWq_-uVDSglpgtV(|hCl4q<)g&$NEGWWB&Niz$QAmvKwOGKMIJ zU<Ta<nhjzXL>#y?xE8RQ;E{fJmA~rDd;JBZ=|VE}ETh0Drs~pzlh*-V%;4$j=d#Wz Gp$Pyua!d07 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json new file mode 100644 index 000000000000..1d2a84bf6d87 --- /dev/null +++ b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Head displacement made by zHonys", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "head", + "directions": 4 + } + ] +}