From e54e8a95ee38d1145fc0439e80ae769a0ed10b87 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Wed, 5 Mar 2025 16:30:06 +0200 Subject: [PATCH] Sheep (#972) * sheep * demi mod --- .../en-US/_CP14/demiplane/modifiers.ftl | 1 + .../ru-RU/_CP14/demiplane/modifiers.ftl | 1 + .../_CP14/Entities/Markers/Spawners/mobs.yml | 16 ++++ .../_CP14/Entities/Mobs/NPC/animals.yml | 89 +++++++++++++++++- .../Demiplane/Modifiers/Reward/misc.yml | 18 ++++ Resources/Prototypes/_CP14/tags.yml | 3 + .../_CP14/Mobs/Animals/sheep.rsi/dead.png | Bin 0 -> 1040 bytes .../_CP14/Mobs/Animals/sheep.rsi/meta.json | 18 ++++ .../_CP14/Mobs/Animals/sheep.rsi/sheep.png | Bin 0 -> 2071 bytes 9 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/dead.png create mode 100644 Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/sheep.png diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl index 1fe01cd27c..aecd02ba47 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -18,6 +18,7 @@ cp14-modifier-mole = predatory moles cp14-modifier-rabbits = rabbits cp14-modifier-boars = wild boars cp14-modifier-invisible-whistler = invisible whistlers +cp14-modifier-sheeps = sheeps cp14-modifier-chasm = bottomless chasms cp14-modifier-air-lily = air lilies cp14-modifier-time-limit-10 = temporary disintegration (10 minutes) diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl index 9528bdefa0..92d94a608e 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl @@ -17,6 +17,7 @@ cp14-modifier-dyno = доисторической фауны cp14-modifier-mole = хищных кротов cp14-modifier-rabbits = кроликов cp14-modifier-boars = диких кабанов +cp14-modifier-sheeps = овец cp14-modifier-invisible-whistler = невидимых свистунов cp14-modifier-chasm = бездонных пропастей cp14-modifier-air-lily = воздушных лилий diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml index 334932cc9c..60a5f2584a 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml @@ -89,6 +89,22 @@ prototypes: - CP14MobFrog +- type: entity + name: sheep spawner + id: CP14SpawnMobSheep + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - sprite: Markers/cross.rsi + state: green + - sprite: _CP14/Mobs/Animals/sheep.rsi + state: sheep + - type: ConditionalSpawner + prototypes: + - CP14MobSheep + # Dino - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml index 8108ae1d2b..365288c597 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml @@ -105,7 +105,7 @@ shape: !type:PhysShapeCircle radius: 0.35 - density: 100 + density: 150 mask: - MobMask layer: @@ -330,3 +330,90 @@ volume: -8 variation: 0.125 - type: SoundWhileAlive + +- type: entity + id: CP14MobSheep + parent: CP14SimpleMobBase + name: sheep + description: White and fluffy as a cloud sheep. + categories: [ ForkFiltered ] + components: + - type: HTN + rootTask: + task: RuminantCompound + - type: NpcFactionMember + factions: + - CP14PeacefulAnimals + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: _CP14/Mobs/Animals/sheep.rsi + state: sheep + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 100 + mask: + - MobMask + layer: + - MobLayer + - type: Tag + tags: + - CP14Sheep + - type: Reproductive + partnerWhitelist: + tags: + - CP14Sheep + offspring: + - id: CP14MobSheep + maxAmount: 1 + - type: ReproductivePartner + - type: Speech + speechSounds: Goat + speechVerb: Goat + - type: Vocal + sounds: + Female: Goat + Male: Goat + Unsexed: Goat + - type: Appearance + - type: MobThresholds + thresholds: + 0: Alive + 50: Dead + - type: CombatMode + - type: MeleeWeapon + angle: 0 + animation: WeaponArcPunch + damage: + types: + Blunt: 5 + - type: MovementSpeedModifier + baseWalkSpeed : 4 + baseSprintSpeed : 4 + - type: DamageStateVisuals + states: + Alive: + Base: sheep + Dead: + Base: dead + - type: Butcherable + spawned: + - id: CP14FoodMeatLamb + amount: 4 + - id: CP14String # As long as there are no mechanics to shearing wool, the only way to get string. + amount: 4 + - type: Bloodstream + bloodMaxVolume: 200 + bloodReagent: CP14Blood + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-goat + interactFailureString: petting-failure-goat + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/goat_bah.ogg diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml index 1b5559dde0..04ce8a8d4c 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml @@ -71,6 +71,24 @@ minGroupSize: 2 maxGroupSize: 3 +- type: cp14DemiplaneModifier + id: Sheep + tiers: + - 1 + - 2 + name: cp14-modifier-sheeps + generationWeight: 0.4 + categories: + Reward: 0.2 + requiredTags: + - CP14DemiplanePeacefulAnimals + layers: + - !type:OreDunGen + entity: CP14MobSheep + count: 1 + minGroupSize: 4 + maxGroupSize: 5 + # TIER 2 - type: cp14DemiplaneModifier diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 0d41504c86..6bd6ea8851 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -132,3 +132,6 @@ - type: Tag id: CP14Dayflin + +- type: Tag + id: CP14Sheep diff --git a/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..e39f74638b06ac409244bcffa3d018db55954ee5 GIT binary patch literal 1040 zcmV+r1n>KaP)Px&%1J~)R9J=Wm0wJoRT##9m4V0_7HQHnYq8%p$_g?w8%H%|Q6dXVgluyq*~UI+ z%*>1qZ%CtAm={3emC-~mT;jikWl_5*lkH-E6q3P`LQ-R3(1~tM`28ocDR&=e*~9P(T3%6i~qb9fp6qVP$1SS?k);($a_KUz30j3V{6s$P%(K0gd)G|s=eXs6mfH3-vC;8<3F2WwY8xE z5eLUcdAYR(NEPLjo)98(3YeUl7O`tbJ%Aw3hKWkd;78AMscMRf0I;~-ls>hc=Y5^JV^GO! zYaASE^BMpi0r>pA4h10eYidDLqX%cT1822^rbZ6{LxGT(Kl$oj0AlC9XSlbA`06SE ziDZ&QGRfl145o5phBLJ_4i3N4E{;SvaB!zfv02T`%}0d*6)LGZXS14x6P?~804yxU z0J!nh7Zk0m@Mwhz+-|mSs}p(D{z<SH8X%+Pg` zU~_Yd1W>(DiB)pDEVJO;Dy+YMGos6x^=FiREnD9{0l@Obi&WYr?6NGnU)y-OFx=Y0 z?S%yr_wE7Ewfv|48m6PG`+a3%{5k-x2lv@%F;i)m0Qh6}p9<7(c3IZ#zw}~bM$ULR z%vEnY0R8^cxdrTPJFL`gdlG<&@$2;aPa8fv`nv9xoL_t(;+74Mu{`)wwmOK1!@BWR zZ#(I^vkFjStuy#7`H)ZCf5l%Uubiq|4#Ir^0000< KMNUMnLSTZnH1^s6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/meta.json new file mode 100644 index 0000000000..8d680fb824 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Jaraten (discord/Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sheep", + "directions": 4 + }, + { + "name": "dead" + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/sheep.png b/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/sheep.png new file mode 100644 index 0000000000000000000000000000000000000000..58f2cf719f7dfbae105f483305781579c084a0b7 GIT binary patch literal 2071 zcmV+y2Px+(Md!>RCt{2TTMt@R}}s%U1XibV_=3b&`g-$MF&(+0t!m9h%ls8lE#GCmL{7N zvM{v8B-Dlo&7zQQTr^3EKP`@xfpJlYU?3QXf?cRHgJVI$2r>)T?p_z>T+hAlzQ6fN zOPLP>FZ1rb-#O==d+vSr9NSPM4i67adOmUDL|d)nc*T=@x6GyG6@-EYqGuwO_oeMJ zDtlG*^>*Wn@t-}*Qjmld4zbHLi{H^Yhlht| zy^7Tn2i^z2?aO+CkLrrGEQ9yOZyN;b31p2}0(SiLyOVr=_ivB9X z0Yg%Z2S_r63O9c3+MwVQ4j35e??PX1xA@qgvvw$WEQtDh^h^Xx%PZnkw!2^T6$d!K z6UZaT5ULmOc6R)>OMsKpSJ+PF007X}+by*vg?B0k2n7u+Ew4BV?ghkex9sTmaKJ#= zL2)-Dx}F64db`E!zABaw3K}SFm!&qP?J`0^1FwoD;RW1CjXD<)_{=Zl7cEBO0djZ0 z>Ufs0T>|t>Usv4iqh}(L5%~Z4a-byu_&X19e)Swc3UPPm-oV>)#qB=VwI1-`$DhQ& z_os5=QC#Uk_Tm9LK*OKzP`&BWXS8#q(EF3VfkYBXSraHqsP|_|^D9Rqo zp^X8X8(U&9GQ#@Ws!;ND=%m!1{?CoT6`=9FLgnYPzK~x;p;$(tXf-O21>75)_-);i zwhq5N)jp1Wc#CqX-Ya(yxc0K{Vv%MRd`-!=$F!>8J&pU(im zJB!P1)YBQo>Cj2^bVjwLBz&!3gKqp62QFaj&TWj{xh<5hh2Qlg$gKwP%PuYy>IKj5^FZUCl3IQ_i+-4lM;weCUa{2jUOt;P`+B=EIhEJ;>*kf2s z&^w+UTVGq1ZjNa(gb)<``2D_aP=e}ScduteW|-1uH?Iyz0!~ilMH-D)b@NK_mv2hi ze!y`Gju%VQGUd4goy=S>9t@>f;5z^xWFfx@ULCF)N39|OAf?g?R5+nlbgR|iytaU+ z-KnpgCve%EQs{gq5D&UK8r6k3cwkw1`ba3ZQ#lYWtg9p7F8=8EKidFc^wN2gFA-hs z0llY8bYE{bx<4Nklc3fJsY_S|ZOxWsgPMlYK@CC+`9=Ko$1l=)-0n{IW zWenc`<4?YH%m~{-4Tjk?X9J<-c;KX zDtlFY)ISJ7pDi#=??TT%+mX6HH2sFcPf68+CY}y21>8mR5 zHYr?gsxzSe{5&EZg}L%PA5R0SMT+Xy!uzS<3c10qEsY%x7*e#is}UmE)!FBeW+O9r zluk;f62kr6pptQ6@{b=1h5Y;>le#SqeEpqxr*6Ss>zSvY&uCL^7JzRARt?f|I;aHxX`} zx^~o7{T|U~hp8dY&#OebiVXEbBQrQ`CQ}K-V-e)C)3$=@Ff^1wp;*S;Tuw3`$)pxZ z*vSVRd7s_qwPXObAc2&j*`PI)OeMs7+CJ^R_TsTf&7Z^ZSj3X+=gN@5$Hpg2UPq8j zC9t`%B^l1HXhJf8ojcJil9IXX@w?59Eo^RV38Sd}sEuE2ZfqeQiy)awfb)?ud`zwo zpJ}xpVAWA