From f8305a26a9bd1dc080daca8f45f7289829b91682 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 15 Mar 2024 02:58:17 +0000 Subject: [PATCH] add more carp plushies (#26081) * carp plushie textures * add the plushies * add plushies to spawners * rainbow carp and make special plushies rarer --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 20 + .../Entities/Objects/Decoration/present.yml | 6 + .../Prototypes/Entities/Objects/Fun/toys.yml | 32 + .../Structures/Machines/Computers/arcades.yml | 3 + .../Objects/Fun/toys.rsi/holoplush.png | Bin 0 -> 1467 bytes .../Objects/Fun/toys.rsi/magicplush.png | Bin 0 -> 565 bytes .../Textures/Objects/Fun/toys.rsi/meta.json | 667 +++++++++--------- .../Objects/Fun/toys.rsi/rainbowcarpplush.png | Bin 0 -> 692 bytes 8 files changed, 408 insertions(+), 320 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/holoplush.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/magicplush.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 70341cb019..bf9ac2f436 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -112,6 +112,16 @@ prob: 0.44 - id: PlushieCarp prob: 0.2 + orGroup: carp + - id: PlushieHolocarp + prob: 0.05 + orGroup: carp + - id: PlushieMagicarp + prob: 0.05 + orGroup: carp + - id: PlushieRainbowCarp + prob: 0.03 + orGroup: carp - id: PlushieSlime prob: 0.2 - id: PlushieSnake @@ -205,6 +215,16 @@ prob: 0.44 - id: PlushieCarp prob: 0.2 + orGroup: carp + - id: PlushieHolocarp + prob: 0.05 + orGroup: carp + - id: PlushieMagicarp + prob: 0.05 + orGroup: carp + - id: PlushieRainbowCarp + prob: 0.03 + orGroup: carp - id: PlushieSlime prob: 0.2 - id: PlushieSnake diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 5087e53980..8fdc479351 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -68,6 +68,12 @@ orGroup: GiftPool - id: PlushieCarp orGroup: GiftPool + - id: PlushieMagicarp + orGroup: GiftPool + - id: PlushieHolocarp + orGroup: GiftPool + - id: PlushieRainbowCarp + orGroup: GiftPool - id: PlushieSlime orGroup: GiftPool - id: PlushieSnake diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 902735bb30..d36b4b292c 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -521,6 +521,38 @@ angle: 0 animation: WeaponArcBite # Rrrr! +- type: entity + parent: PlushieCarp + id: PlushieMagicarp + name: magicarp plushie + description: An adorable stuffed toy resembling the exceedingly rare magicarp. + components: + - type: Sprite + state: magicplush + +- type: entity + parent: PlushieCarp + id: PlushieRainbowCarp + name: rainbow carp plushie + description: An adorable stuffed toy resembling the legendary rainbow carp. + components: + - type: Sprite + state: rainbowcarpplush + - type: PointLight + radius: 1.5 + energy: 2 + - type: RgbLightController + layers: [ 0 ] + +- type: entity + parent: PlushieCarp + id: PlushieHolocarp + name: holocarp plushie + description: A holographic stuffed toy resembling science's nemesis - the holocarp. + components: + - type: Sprite + state: holoplush + - type: entity parent: BasePlushie id: PlushieSlime diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index d2ba7cd544..85f6dc6894 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -63,6 +63,9 @@ - PlushieSpaceLizard - PlushieNuke - PlushieCarp + - PlushieMagicarp + - PlushieHolocarp + - PlushieRainbowCarp - PlushieRatvar - PlushieNar - PlushieSnake diff --git a/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png b/Resources/Textures/Objects/Fun/toys.rsi/holoplush.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/toys.rsi/magicplush.png b/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png new file mode 100644 index 0000000000000000000000000000000000000000..950de931a0766b000e65e8a497db1c763e7da3f1 GIT binary patch literal 565 zcmV-50?Pe~P)F 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&5AI*x~@WafDl~7OhqbMNv=`1pv?UI5{~c+=I3@XgH)jYfmR!$SZT7Z=eq4S+a~$!4-4jxx2e#Zf=f3 zq41$NB(xxt$z-II^62OYV3dHa>i{e*E%EU1KrZ*EJdR`f{XUAKP$(40<#PDGpQJnD zM^XYiJ3Bl-KQlc&&C}Bp&1RGP`+G{I5~`}w>-8uWi)6D|y4^0CrqS#5&@_$P+gr-z zG7Ad}c%Db8RQlQNc7J_3f$i;W04&SGvMhkVZqw;>2!a4z*U@zy&-3topE!NZKYC?uh%m(GgPZp6h-0q_;~af0bJJw7@2roJJut7k6NuJi^U@A z>+4KTPI7g1h3mTbzE2PY0EA)q>7n$cNqBH@z}ngx%gf7@%jL0V|35(pAzx-iN=iz~ aclixi!b-s^m*JoQ0000