From c2de7ec5b3c4e84aa9bb3a5671be564bddd66d5b Mon Sep 17 00:00:00 2001 From: ravage <142820619+ravage123321@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:24:00 +0300 Subject: [PATCH] Adding a kitten (#20726) * Update animals.yml * Update * ANOTHER UPDATE change mobcat meleeweapon from brute to piercing, deleting extra lines * oops * Update npc.yml * Update npc.yml * Update animals.yml --- .../Prototypes/Catalog/Fills/Crates/npc.yml | 3 ++ .../Entities/Markers/Spawners/mobs.yml | 14 +++++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 38 ++++++++++++++++++ .../Textures/Mobs/Pets/cat.rsi/kitten.png | Bin 10442 -> 2183 bytes .../Mobs/Pets/cat.rsi/kittencollar.png | Bin 140 -> 153 bytes .../Textures/Mobs/Pets/cat.rsi/kittentag.png | Bin 140 -> 151 bytes 6 files changed, 55 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 8dc0104bbb..6ff49fb8ec 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -31,6 +31,9 @@ - id: MobCatCaracal prob: 0.5 orGroup: MobCat + - id: MobCatKitten + prob: 0.25 + orGroup: MobCat - id: MobBingus prob: 0.005 orGroup: MobCat diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index bf77600f5b..501d0f0264 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -164,6 +164,19 @@ - type: ConditionalSpawner prototypes: - MobCatSpace + +- type: entity + name: Kitten Spawner + id: SpawnMobCatKitten + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobCatKitten - type: entity name: Cat Spawner @@ -195,6 +208,7 @@ - MobCat - MobCatCalico - MobCatCaracal + - MobCatKitten rarePrototypes: - MobCatSpace rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 95657cc431..57aae21347 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2318,6 +2318,10 @@ interactSuccessSpawn: EffectHearts interactSuccessSound: path: /Audio/Animals/cat_meow.ogg + - type: MeleeWeapon + damage: + types: + Piercing: 5 - type: Grammar attributes: gender: epicene @@ -2392,6 +2396,39 @@ Dead: Base: caracal_dead +- type: entity + name: kitten + parent: MobCat + id: MobCatKitten + description: Small and fluffy. + components: + - type: Sprite + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: kitten + - type: DamageStateVisuals + states: + Alive: + Base: kitten + Critical: + Base: kitten_dead + Dead: + Base: kitten_dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 1 + - type: MobPrice + price: 100 + - type: MeleeWeapon + damage: + types: + Piercing: 3 + - type: MobThresholds + thresholds: + 0: Alive + 25: Dead + - type: entity name: sloth parent: SimpleMobBase @@ -2711,3 +2748,4 @@ - type: NpcFactionMember factions: - Passive + diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png index fd579cb8cd117f637cdb382537352eeb0ebd1a59..62c4883e632518b0ad998aef0c060165fc0cfa2c 100644 GIT binary patch delta 1801 zcmV+k2ln{NQHK$bBNYLJX+uL$Nkc;*aB^>EX>4Tx04R~OP7`$je>#CyMF0Q>zDYzu zRCt{2ntx1`_Z`Py=kaUf*CDK&3Zn<2^p=2d>*=($t_%=Y8WS%=$7BiBHLfwTITL5+ zYL;qDT-@xB(5}p+KbFdn%%ueCSvIz1{A$6$g<}d4ub#&#v>cBdmBR7e9|%H~`|${v zCC}@>d+zyuKJV}Qe?H&m`#kq~KtVx4K|w)5K_>0(?V`QCT|8_Za#`{qgRkyFERT!P63OELjE|)mKs6tz~DCgy*{_*jXfT_>1ivP@j<# zP8N~wyVaKdmwmG1$THwX>o!uZpJ9h#oJ%*F*r-+ec%^$*;njSySIwL?sL>9>rP3(K`94~F!geI(qQ@gi5lsm$K8}&r$bZEn_1w2-k z0ot%@Z2aY4Ny*!fuvr;P=#?!%EQF(U6=5CcJ$0c(F&L0D)w z-*Ek%f2A7^sebx?JYS4@7<7-z2^TOg=C9zXAC^!h3}hPfRKHvHD{eY_$uJ#Tl>GEL z>_U>HS>^ur;b%m}Uc;g+fr`Bb@%G_oX62G3N%T4Fi?alsjjxMKosF}S6&Un_JI@D; zfVh)ynoFIH!rAzG!1-k@fuX1@qNTQ3$3AGae^Ox3%Lx}SQ_mqYiI&S-WqW}0n-QlmIi&2Y@UONszNAdjqIWlGH_cncd-c9gn zz`)f3F>rOjucRv?CVPY(#fb2{6AviuE+4&ieA)zc?0{cm{MGH%fc`y*(AZEyV?(*v ze{$YyFkOsVq^&a2@30Y)Rf_xk0l$R$!;cRhp!TJ`^gC=sx?Mi2;9|@9Y2E#MyjS9! z2K4Vi#HDX0qOydZt_CuVd0rb1Q@{S&)Ns;DM+nI(otI_sL?WVme<^9DBdkpg2YgpS zrZG>|)73ykWeIWVo4uOgeF@wi!q!mfe{=ExX{(IHlacb|tiIq}WE%5SwuVZ$J>>PgISuG@!-(C&%e_XQ$;t{5hPW2u zMJJlzAd0)Sys##YD-(8~V|{UD!p;k8;wbLcq6rQnUUc&L%~r|^eOK4Zy+%gte-`@O zbDuNkFRP1Di>b0sTVv`bEk8dyFTKK= zlO~b8B!PI*$(g1Lv+~W%|88w7*N4^g4ti9(vW?=umnYlhQ^)QX+pEBtCR`s@GjsC! zNgdPY)!Nc|O8+FTvB}Pm{`q4>e?>*jYok<>Bw>B?5CEFsApT+f*F75Gt_d@B&oz1Q z@rKCcK()xuGVt5YlS|>zCm!R=zm<|Wwt>N%Tw*Sm$xr$>jKicEE7`1r+f6yLQtzXWl zuK1qsLwnyL=7O0^nl-q_#z`tVNO(llf>eNeSi<(F<7k3|Snc``gE_f#YP#IuV8^jC zp9c865$YZEsHEg9Ms>x6M?_(1G-GKr17K-1^NCZ-8(sCR7R}S!)O=5VX3Vvz;j9+T zywO$9Cr<4wEtWr~kxeZ6f6dr{~auSeIjB+*adP%z&N+;zCF7dpvhriKZSYqYIBHF6Uyzam2a!fwYXOW30Fz9*qy&+l$ z?tgF6R$V4mZY;t*ED@BnWqz}pt4@oWlP2M9a&6URqR(MpkUo8ZK`(r@;M=OpM9oQ) rFjt-azkPXIK|w)5K|w)5VX^ohF15bJF|>%<00000NkvXXu0mjfqXUav literal 10442 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 diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png index 079698ec85ddbfb8a1ca49524b43380d458b04f0..09bf4c2526a47bcdcb03d29a14d0b97215fe5a9f 100644 GIT binary patch delta 102 zcmeBSoXI#rg^RH`$lZxy-8q?;6BVTb=QhN$DCHDi=VbZ6>Z%k21H%DLrB8<6=S@Bv z%?;!Mfy3VKv)^1hv$R9!Cx6(}ns4C;-}18q#Vw97Sl(Bhe|eu}1W1{utDnm{r-UW| Dr(q_A delta 91 zcmbQq*uywMWul>Y;M;~+7A2YD>zpkAS6!820E0QYO3QbCkIA_g1>rNivb~?OJuS~Q n;_UbIH|PF#I{ku=1(m{N1M)fR%Z=`njxgN@xNA&etKg diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png b/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png index 6f3bf14f5cd1a2e6c73dccbee8ca06edb1e9fff0..b37123fb0061c562619df323fba20b3f0c97ee8f 100644 GIT binary patch delta 122 zcmeBSoX$8wrI@ie$lZxy-8q?;3=9l`o-U3d6?5L++{oKtz~kyT`=hb=DW*jE%fW#x zteWM_Hb1ZT0hKW{Tz5OYO3pOu+N+$wLJSNpA^n;9n`f?F{&@9=(r5b7ATjf+ W5<)YsU$FQK;&{6HxvXSZnSm5|y85}S Ib4q9e0NVX0y8r+H -- 2.51.2