From 2e4fb285012f950e4cd2373934c95091baa12dd6 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:17:26 +0000 Subject: [PATCH] swap carp and carp plushie sprites (april 1) (#26080) * add plushie textures * swap carp and plushie sprites --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Prototypes/Entities/Mobs/NPCs/carp.yml | 41 +++++++++--------- .../Prototypes/Entities/Objects/Fun/toys.yml | 11 +++-- .../Objects/Specific/rehydrateable.yml | 2 +- .../Objects/Fun/holoplush.rsi/carpplush.png | Bin 0 -> 1467 bytes .../Fun/holoplush.rsi/carpplush_mouth.png | Bin 0 -> 121 bytes .../Objects/Fun/holoplush.rsi/meta.json | 35 +++++++++++++++ .../Objects/Fun/magicplush.rsi/carpplush.png | Bin 0 -> 565 bytes .../Fun/magicplush.rsi/carpplush_mouth.png | Bin 0 -> 121 bytes .../Objects/Fun/magicplush.rsi/meta.json | 17 ++++++++ .../Objects/Fun/toys.rsi/carpplush_mouth.png | Bin 0 -> 121 bytes .../Textures/Objects/Fun/toys.rsi/meta.json | 3 ++ 11 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/holoplush.rsi/carpplush.png create mode 100644 Resources/Textures/Objects/Fun/holoplush.rsi/carpplush_mouth.png create mode 100644 Resources/Textures/Objects/Fun/holoplush.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/magicplush.rsi/carpplush.png create mode 100644 Resources/Textures/Objects/Fun/magicplush.rsi/carpplush_mouth.png create mode 100644 Resources/Textures/Objects/Fun/magicplush.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/carpplush_mouth.png diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 73082674736452..eef9ec07c0eb3e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -1,8 +1,8 @@ - type: entity - name: space carp + name: carp plushie id: BaseMobCarp parent: [ SimpleSpaceMobBase, FlyingMobBase, MobCombat ] - description: It's a space carp. + description: An adorable stuffed toy that resembles the monstrous space carp. abstract: true components: - type: InputMover @@ -18,10 +18,10 @@ - SimpleHostile - type: Sprite drawdepth: Mobs - sprite: Mobs/Aliens/Carps/space.rsi + sprite: Objects/Fun/toys.rsi layers: - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive + state: carpplush - type: CombatMode - type: Physics - type: Fixtures @@ -45,11 +45,11 @@ - type: DamageStateVisuals states: Alive: - Base: alive - BaseUnshaded: mouth + Base: carpplush + BaseUnshaded: carpplush_mouth Dead: - Base: dead - BaseUnshaded: dead_mouth + Base: carpplush + BaseUnshaded: carpplush_mouth - type: Butcherable spawned: - id: FoodMeatFish @@ -87,36 +87,36 @@ - type: Sprite layers: - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive + state: carpplush - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] - state: mouth + state: carpplush_mouth shader: unshaded - type: RandomSprite available: - enum.DamageStateVisualLayers.Base: - alive: Rainbow + carpplush: Rainbow enum.DamageStateVisualLayers.BaseUnshaded: - mouth: "" + carpplush_mouth: "" - type: entity - name: magicarp + name: magicarp plushie parent: BaseMobCarp id: MobCarpMagic - description: Looks like some kind of fish. Might be magical. + description: Looks like some kind of fish plushie. Might be magical. components: - type: Sprite - sprite: Mobs/Aliens/Carps/magic.rsi + sprite: Objects/Fun/magicplush.rsi - type: TypingIndicator proto: guardian - type: entity - name: holocarp + name: holocarp plushie parent: BaseMobCarp id: MobCarpHolo - description: Carp made out of holographic energies. Sadly for you, it is very much real. + description: Plush carp made out of holographic energies. Luckily for you, it is very much real. components: - type: Sprite - sprite: Mobs/Aliens/Carps/holo.rsi + sprite: Objects/Fun/holoplush.rsi - type: Physics - type: Fixtures fixtures: @@ -135,8 +135,8 @@ - type: entity parent: MobCarp id: MobCarpRainbow - name: rainbow carp - description: Wow such a shiny fishie! + name: rainbow carp plushie + description: Wow such a shiny fish plushie! components: - type: PointLight radius: 1.5 @@ -152,7 +152,6 @@ - type: SalvageMobRestrictions - type: entity - name: space carp id: MobCarpDragon suffix: DragonBrood parent: MobCarp diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 902735bb303ad5..3ab2dbc6f2ff87 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -490,11 +490,16 @@ - type: entity parent: BasePlushie id: PlushieCarp - name: carp plushie - description: An adorable stuffed toy that resembles the monstrous space carp. + name: space carp + description: It's a space carp. components: - type: Sprite - state: carpplush + sprite: Mobs/Aliens/Carps/space.rsi + layers: + - state: alive + color: '#BB07F6' + - state: mouth + shader: unshaded - type: Item heldPrefix: carpplush storedRotation: -90 diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 2adce1e66b3b26..992fb251c77c4d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -154,7 +154,7 @@ parent: PlushieCarp id: DehydratedSpaceCarp name: dehydrated space carp - description: Looks like a plush toy carp, but just add water and it becomes a real-life space carp! + description: Looks like a regular space carp, but just add water and it becomes a real-life carp plushie! components: - type: SolutionContainerManager solutions: diff --git a/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush.png b/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush.png new file mode 100644 index 0000000000000000000000000000000000000000..811bf9e649f176ef4dbf847374d99acd9459769f GIT binary patch literal 1467 zcmZWne>l?#82`F;RIYZ1a(ZM7XGPih{TydY`I(sHiew`{N@A(a&$X@Lx(FRXS?`eZ0HCY)&b9jZR0se*kN0tR3rcylaI-7UjQll+ zMJTrC57jkSkwSV+#Pc3-6Zg5)^aqx03>t&Eo{{njzYad-7GUXJyD!3!60&Dti|eT{ zic9J-%etx>k8-~f`z~nhhEMU6=)QvmsXPiMpxEDbMdoVPKM@sJM)c5(@vntTZDLIz zu{b-v5vms2WMH4`hZ9=lVLv40nyIIg%U=iIIj(eRgrGtiAiraGn4YbO87>KoBdUSFUni_0} zbF|Ny4`iTZ1cIHtx>*AzU8%OVe8G~B#$DECJm4=E;R($nD z#K&iaCGj{&gm7qrUR-N|A|ieJ;nUH|wKB;g>m!~da`KmXzmHcA>6VNm>p+`fOX|{! zgKUOVaXqSG#W9BdrLGmT)}6{(cYNA| zM1>QfIBqwK;C#+yZu1G+P1%TWJR#%lrFo~;FXl#kalCrF9r}?+@Tm&H+Hbm|{YDT> ztYcE1o>SkF7}`DDF6kc38T7I?uozEWI1%S!Wo7jXRqwjHdaO|J^M%{ab8;A*5)i4(Hdp>B{8kKkRTEVc##D4s zy_~Ca>P_PgsUH9epP~K0t8hAt0zfd8`TfJRw4mCNX_&b^0-3E(rvS_U(+aTR%UZUJ zCad7-qFo0AU|`hwRc_O%H~mLTD(?k@Fpw zI#en9F@Ow6Q1;y;OjRM?AK(KQ8~``v#4{z!`PGtwav}WXjDsT`e7I->n)l)`d(*+pNv8Qft72*?zNyyC z;cT3#CD&vig?>*m%cCm`f;39mPd$HZ!D80Y#$@X*LK;oa`7D;0LJv^JzR>AN!?^t= z15k2-Wb_(W=jzUR318hhz#5_ev2xt^h+dz$3;D}zR5kTK1>UG+fNarB?p?H1yes*5 L_`BEb3upWd!sp$r literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush_mouth.png b/Resources/Textures/Objects/Fun/holoplush.rsi/carpplush_mouth.png new file mode 100644 index 0000000000000000000000000000000000000000..c33c17310326e939b96a3d505a6542fc043e7cf0 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*B^` z#W5t}@Y@R;1sM!Dm<_+h&vNjW)mXy%=Q#&MgX1(|L2X&vsz;0rKb|t?{}+7!@zu>w PKy3`3u6{1-oD!MF zbNMbovh__=kwiB3CiGyIDASret_TWj_lO!DA`AOBB!E09554jkQv?BjZR53l^@OR=N``=QIwLxj%Z zTNX!L7A~=F;$R6BJxQM>aDl6M-l?3U8(}$qBM#cz>P%N>Z|O2{pnKdZ!)`;j;Ap`< zYM)nmBBPw^FP~IYm<~86!Scc2GekvFO~;*Iheo0E&|N@mkSY&<%Z&l|Odyp?iIciH z*t-lA5bz7lw~BBu4oy8Bgc+&9VZbivq^zKSfoYoZ!Z2tP>ouW(o~7#cGq^ zDVjg9Zs<8s(J_vNLzYv5(l0EGY{GNHa4geT)(vD2ediK%;4i?wLz}uWd&5AIw PKy3`3u6{1-oD!Mw PKy3`3u6{1-oD!M