From b9e71237c4c0b1ac43ec21d5a8e6b715ebc6c68d Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Mon, 10 Apr 2023 07:33:22 +0300 Subject: [PATCH] Predatory pet for HoS (#15237) --- .../Entities/Markers/Spawners/mobs.yml | 13 ++++ .../Prototypes/Entities/Mobs/NPCs/pets.yml | 66 ++++++++++++++++++ Resources/Prototypes/ai_factions.yml | 6 ++ .../Textures/Mobs/Pets/shiva.rsi/meta.json | 45 ++++++++++++ .../Textures/Mobs/Pets/shiva.rsi/shiva.png | Bin 0 -> 4543 bytes .../Mobs/Pets/shiva.rsi/shiva_dead.png | Bin 0 -> 725 bytes 6 files changed, 130 insertions(+) create mode 100644 Resources/Textures/Mobs/Pets/shiva.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png create mode 100644 Resources/Textures/Mobs/Pets/shiva.rsi/shiva_dead.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index c2db58ce14..fbf4d3ace9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -287,3 +287,16 @@ - type: ConditionalSpawner prototypes: - MobAlexander + +- type: entity + name: Shiva Spawner + id: SpawnMobShiva + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobSpiderShiva diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 947a7d059f..83f4c5963a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -462,3 +462,69 @@ tags: - CannotSuicide +- type: entity + name: Shiva + parent: MobGiantSpider + id: MobSpiderShiva + description: The first defender of the station. + components: + - type: Faction + factions: + - PetsNT + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: shiva + sprite: Mobs/Pets/shiva.rsi + - type: HTN + rootTask: SimpleHostileCompound + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 130 + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: shiva + Critical: + Base: shiva_dead + Dead: + Base: shiva_dead + - type: Butcherable + spawned: + - id: FoodMeatSpider + amount: 2 + - type: CombatMode + - type: MobThresholds + thresholds: + 0: Alive + 90: Critical + 150: Dead + - type: MeleeWeapon + hidden: true + angle: 0 + animation: WeaponArcBite + soundHit: + path: /Audio/Effects/bite.ogg + damage: + types: + Piercing: 8 + Poison: 8 + - type: ReplacementAccent + accent: xeno + - type: NoSlip + - type: Spider + - type: IgnoreSpiderWeb + - type: Grammar + attributes: + proper: true + gender: female diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml index 84c15c2e16..40bb8a5455 100644 --- a/Resources/Prototypes/ai_factions.yml +++ b/Resources/Prototypes/ai_factions.yml @@ -12,6 +12,12 @@ - Syndicate - Xeno +- type: faction + id: PetsNT + hostile: + - SimpleHostile + - Xeno + - type: faction id: SimpleHostile hostile: diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json b/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json new file mode 100644 index 0000000000..dbf2bccbef --- /dev/null +++ b/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Redid the original tarantulas. Made by Nimfar11 (github) for SS14", + "states": [ + { + "name": "shiva", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "shiva_dead", + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png new file mode 100644 index 0000000000000000000000000000000000000000..bcaef6034351da64f428948d6cd408e0fadf6c91 GIT binary patch literal 4543 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 Hu0mjfQJ_*M literal 0 HcmV?d00001 -- 2.51.2