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 0000000000..e39f74638b Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/dead.png differ 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 0000000000..58f2cf719f Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/sheep.rsi/sheep.png differ