diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml index 56e7f791c4..6d9fa654f1 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml @@ -45,3 +45,35 @@ - type: ConditionalSpawner prototypes: - CP14MobDinoYumkaraptor + +- type: entity + name: pig spawner + id: CP14SpawnMobPig + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - sprite: Markers/cross.rsi + state: green + - sprite: _CP14/Mobs/Animals/pig.rsi + state: live + - type: ConditionalSpawner + prototypes: + - CP14MobPig + +- type: entity + name: boar spawner + id: CP14SpawnMobBoar + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - sprite: Markers/cross.rsi + state: green + - sprite: _CP14/Mobs/Animals/boar.rsi + state: live + - type: ConditionalSpawner + prototypes: + - CP14MobBoar diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml index 78316b04b8..595cc85c51 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml @@ -75,3 +75,117 @@ interactSuccessSpawn: EffectHearts interactSuccessSound: path: /Audio/Animals/fox_squeak.ogg + +- type: entity + id: CP14MobPig + parent: SimpleMobBase + name: pig + description: An omnivorous and unpretentious animal that is sure to make juicy cuts of meat. + 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/pig.rsi + state: live + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 100 + mask: + - MobMask + layer: + - MobLayer + - type: Tag + tags: + - CP14Pig + - type: Reproductive + partnerWhitelist: + tags: + - CP14Pig + offspring: + - id: CP14MobPig + maxAmount: 2 + - type: ReproductivePartner + - type: Appearance + - type: MobThresholds + thresholds: + 0: Alive + 60: Dead + - type: CombatMode + - type: MeleeWeapon + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 2 + Slash: 2 + - type: MovementSpeedModifier + baseWalkSpeed: 4 + baseSprintSpeed: 4 + - type: DamageStateVisuals + states: + Alive: + Base: live + Dead: + Base: dead + - type: Butcherable + spawned: + - id: CP14FoodMeatLamb # to replace the pig meat and add chunks of fat + amount: 5 + - type: Bloodstream + bloodMaxVolume: 150 + - type: Grammar + attributes: + gender: epicene + - type: ReplacementAccent + accent: pig + +- type: entity + id: CP14MobBoar + parent: CP14MobPig + name: boar + description: A distant relative of pigs, same pros, but unlike its peaceful relatives, will definitely try to pick you up on its fangs if you show aggression towards it. + categories: [ ForkFiltered ] + components: + - type: HTN + rootTask: + task: RuminantHostileCompound + - type: Sprite + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: _CP14/Mobs/Animals/boar.rsi + state: live + - type: MeleeWeapon + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 5 + Slash: 2 + - type: Tag + tags: + - CP14Boar + - type: Reproductive + partnerWhitelist: + tags: + - CP14Boar + offspring: + - id: CP14MobBoar + maxAmount: 1 + - type: ReproductivePartner + - type: MovementSpeedModifier + baseSprintSpeed: 4.5 + - type: NPCRetaliation + attackMemoryLength: 10 + - type: FactionException diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 50de3f6831..0c3f2555ee 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -52,5 +52,11 @@ - type: Tag id: CP14Rabbit +- type: Tag + id: CP14Pig + +- type: Tag + id: CP14Boar + - type: Tag id: CP14Wheat diff --git a/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/dead.png new file mode 100644 index 0000000000..01f142ee03 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/dead.png differ diff --git a/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/live.png b/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/live.png new file mode 100644 index 0000000000..b8bb524dd3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/live.png differ diff --git a/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/meta.json new file mode 100644 index 0000000000..b89e74c23f --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Animals/boar.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CLA", + "copyright": "Created by jaraten (github/discord)", + "states": [ + { + "name": "live", + "directions": 4 + }, + { + "name": "dead" + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/dead.png new file mode 100644 index 0000000000..d2894db831 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/dead.png differ diff --git a/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/live.png b/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/live.png new file mode 100644 index 0000000000..f766cbbaff Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/live.png differ diff --git a/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/meta.json new file mode 100644 index 0000000000..b89e74c23f --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Animals/pig.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CLA", + "copyright": "Created by jaraten (github/discord)", + "states": [ + { + "name": "live", + "directions": 4 + }, + { + "name": "dead" + } + ] +}