From 2b2d9d491acaa8ae016fc22aa73a28dd67467c3d Mon Sep 17 00:00:00 2001 From: Pancake Date: Sun, 30 Jan 2022 06:35:00 -0800 Subject: [PATCH] Implement Some Unused Mob Sprites (#6391) --- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 111 +++++++++++++++++ .../Prototypes/Entities/Mobs/NPCs/mimic.yml | 5 +- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 116 ++++++++++++++++++ 3 files changed, 231 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index ac56321f16..9c928b1455 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -429,6 +429,38 @@ crit: kangaroo-dead dead: kangaroo-dead +- type: entity + name: boxing kangaroo + parent: MobKangaroo + id: MobKangarooBoxer + description: A large marsupial herbivore. It has powerful hind legs and... boxing gloves? + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: kangaroo-boxing + sprite: Mobs/Animals/kangaroo.rsi + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: kangaroo-boxing + crit: kangaroo-boxing-dead + dead: kangaroo-boxing-dead + - type: UnarmedCombat + range: 1.5 + arcwidth: 0 + arc: claw + damage: + types: + Blunt: 10 + - type: UtilityAI + behaviorSets: + - UnarmedAttackHostiles + - type: AiFactionTag + factions: + - SimpleHostile + - type: entity name: monkey id: MobMonkey @@ -571,6 +603,85 @@ crit: dead-2 dead: splat-2 + +- type: entity + name: lizard + parent: SimpleMobBase + id: MobLizard + description: I think it's lost. + components: + - type: MovementSpeedModifier + baseWalkSpeed : 2 + baseSprintSpeed : 3 + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: lizard + sprite: Mobs/Animals/lizard.rsi + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.2 + mass: 5 + mask: + - Impassable + - MobImpassable #Bullets?! + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: lizard + crit: dead + dead: dead + - type: Butcherable + meat: FoodMeat + pieces: 1 + +- type: entity + name: frog + parent: SimpleMobBase + id: MobFrog + description: Hop hop hop. Lookin' moist. + components: + - type: MovementSpeedModifier + baseWalkSpeed : 4 + baseSprintSpeed : 6 + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: frog + sprite: Mobs/Animals/frog.rsi + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.2 + mass: 2 + mask: + - Impassable + - MobImpassable #Bullets?! + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: frog + crit: dead + dead: dead + - type: Butcherable + meat: FoodMeat + pieces: 1 + # Would be cool to have some functionality for the parrot to be able to sit on stuff - type: entity name: parrot diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml index 53f1ab5ba6..ea749401e4 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml @@ -46,4 +46,7 @@ arc: fist damage: types: - Blunt: 90 + Blunt: 20 + - type: MovementSpeedModifier + baseWalkSpeed : 1 + baseSprintSpeed : 1 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index b1dc2e1112..c0e380ed16 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -39,6 +39,39 @@ - type: ReplacementAccent accent: dog +- type: entity + name: corrupted corgi + parent: MobCorgi + id: MobCorgiNarsi + description: Ian! No! + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/corgi.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: narsian + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: narsian + crit: narsian_dead + dead: narsian_dead + - type: UnarmedCombat + range: 1.5 + arcwidth: 0 + arc: bite + damage: + types: + Piercing: 5 + Slash: 5 + - type: UtilityAI + behaviorSets: + - UnarmedAttackHostiles + - type: AiFactionTag + factions: + - SimpleHostile + - type: entity name: Ian parent: MobCorgi @@ -58,6 +91,63 @@ crit: ian_dead dead: ian_dead +- type: entity + name: Old Ian + parent: MobCorgi + id: MobCorgiIanOld + description: Still the favorite pet corgi. Love his wheels. + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/corgi.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: old_ian + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: old_ian + crit: old_ian_dead + dead: old_ian_dead + +- type: entity + name: Lisa + parent: MobCorgi + id: MobCorgiLisa + description: Ian's favorite corgi. + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/corgi.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: lisa + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: lisa + crit: lisa_dead + dead: lisa_dead + +- type: entity + name: corgi puppy + parent: MobCorgi + id: MobCorgiPuppy + description: A little corgi! Aww... + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/corgi.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: puppy + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: puppy + crit: puppy_dead + dead: puppy_dead + - type: entity name: cat parent: SimpleMobBase @@ -115,6 +205,32 @@ crit: cat2_dead dead: cat2_dead +- type: entity + name: space cat + id: MobCatSpace + parent: MobCat + description: Feline pet, prepared for the worst. + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/cat.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: spacecat + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: spacecat + crit: spacecat_dead + dead: spacecat_dead + - type: Respirator #Space kitty should be immune to Asphyxiation. Taken from xenos.yml + damage: + types: + Asphyxiation: 1 + damageRecovery: + types: + Asphyxiation: -1 + - type: entity name: caracal cat id: MobCatCaracal