diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl index 3c55067b1f..dce462a6a9 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -12,7 +12,6 @@ cp14-modifier-explosive = explosive mines cp14-modifier-ruins = ancient ruins cp14-modifier-zombie = zombies cp14-modifier-slime = slimes -cp14-modifier-cackle = cackles cp14-modifier-skeleton = sentient skeletons cp14-modifier-dyno = dynos cp14-modifier-mole = predatory moles @@ -26,9 +25,9 @@ cp14-modifier-air-lily = air lilies cp14-modifier-shadow-kudzu = spreading astral haze cp14-modifier-night = darkness cp14-modifier-spiders = spider's web -cp14-modifier-flem = flemings cp14-modifier-silver-needle = silver needles cp14-modifier-additional-entry = multiple entry points +cp14-modifier-meme-mobs = ancient horrors cp14-modifier-storm = storm cp14-modifier-fire-storm = fire storm diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl index 0776815b60..940ee4c02d 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl @@ -12,7 +12,6 @@ cp14-modifier-explosive = взрывные мины cp14-modifier-ruins = древние руины cp14-modifier-zombie = зомби cp14-modifier-slime = слаймы -cp14-modifier-cackle = кэклзы cp14-modifier-skeleton = разумные скелеты cp14-modifier-dyno = динозавры cp14-modifier-mole = хищные кроты @@ -28,6 +27,7 @@ cp14-modifier-night = темнота cp14-modifier-spiders = паучье логово cp14-modifier-silver-needle = серебрянные иглы cp14-modifier-additional-entry = несколько точек входа +cp14-modifier-meme-mobs = древние ужасы cp14-modifier-storm = гроза cp14-modifier-fire-storm = огненный шторм diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml index 211a5488f7..28a0b98af1 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml @@ -212,28 +212,15 @@ - type: entity parent: CP14BaseMobGroupSpawner - id: CP14MobGroupSpawnerFlem - suffix: 1-3 Flems + id: CP14MobGroupSpawnerMeme + suffix: 1-2 Meme Mobs components: - type: EntityTableSpawner deleteSpawnerAfterSpawn: false offset: 1 table: !type:GroupSelector rolls: !type:RangeNumberSelector - range: 1, 3 - children: - - id: CP14MobMonsterFlem - -- type: entity - parent: CP14BaseMobGroupSpawner - id: CP14MobGroupSpawnerCackle - suffix: 2-3 Cackles - components: - - type: EntityTableSpawner - deleteSpawnerAfterSpawn: false - offset: 1 - table: !type:GroupSelector - rolls: !type:RangeNumberSelector - range: 2, 3 + range: 1, 2 children: - id: CP14MobMonsterCackle + - id: CP14MobMonsterFlem diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml index b49d3c2320..ceee753c80 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml @@ -253,3 +253,24 @@ - type: ConditionalSpawner prototypes: - CP14MobBigBear + +- type: entity + name: meme mobs spawner + id: CP14SpawnMobMonsterMeme + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - sprite: Markers/cross.rsi + state: green + - sprite: _CP14/Mobs/Monster/flem.rsi + state: flem_live + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - !type:GroupSelector + weight: 40 + children: + - id: CP14MobMonsterCackle + - id: CP14MobMonsterFlem \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml index 5c5696f554..d66706bcf2 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml @@ -2,7 +2,7 @@ id: CP14MobMonsterFlem parent: CP14SimpleMobBase name: flem - description: An odd looking fish standing on two stubby legs. you know what that means... + description: An odd, dangerous looking fish standing on two stubby legs. You know what that means... categories: [ ForkFiltered ] components: - type: HTN @@ -41,7 +41,7 @@ - type: MobThresholds thresholds: 0: Alive - 30: Dead + 60: Dead - type: Stamina critThreshold: 200 - type: CombatMode @@ -50,8 +50,8 @@ animation: WeaponArcPunch damage: types: - Blunt: 8 - Structural: 20 + Blunt: 15 + Structural: 30 - type: MovementSpeedModifier baseWalkSpeed: 2.6 baseSprintSpeed: 2.6 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/cackle.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/cackle.yml index f6ad1ba5b1..55c5c54690 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/cackle.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/cackle.yml @@ -60,10 +60,10 @@ - type: MobThresholds thresholds: 0: Alive - 45: Dead + 60: Dead - type: SlowOnDamage speedModifierThresholds: - 30: 0.5 + 45: 0.5 - type: DamageStateVisuals states: Alive: @@ -105,13 +105,13 @@ - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute from base.yml. allowedStates: - Alive - damageCap: 45 + damageCap: 60 damage: types: - Poison: -0.07 + Poison: -0.1 groups: - Brute: -0.07 - Burn: -0.07 + Brute: -0.1 + Burn: -0.1 - type: BasicEntityAmmoProvider proto: CP14SpikeCackleSpread capacity: 2 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index 045ef54b9f..3dd5289664 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -89,25 +89,6 @@ minGroupSize: 2 maxGroupSize: 3 -- type: cp14LocationModifier - id: EnemyFlem - levels: - min: 0 - max: 2 - name: cp14-modifier-flem - generationWeight: 0.33 - categories: - Danger: 0.25 - requiredTags: - - CP14DemiplaneOpenSky - - CP14DemiplaneHerbals - layers: - - !type:CP14OreDunGen - entity: CP14MobMonsterFlem - count: 3 - minGroupSize: 3 - maxGroupSize: 4 - # TIER 2 - type: cp14LocationModifier @@ -323,22 +304,24 @@ minGroupSize: 7 maxGroupSize: 12 +# TIER 3: MINIBOSSES + - type: cp14LocationModifier - id: EnemyCackle + id: EnemyMemeMobs levels: - min: 2 + min: 4 max: 5 - name: cp14-modifier-cackle + name: cp14-modifier-meme-mobs generationWeight: 0.33 categories: - Danger: 0.3 + Danger: 0.6 requiredTags: - CP14DemiplaneOpenSky blacklistTags: - CP14DemiplaneCold layers: - !type:CP14OreDunGen - entity: CP14MobMonsterCackle - count: 4 + entity: CP14SpawnMobMonsterMeme + count: 3 minGroupSize: 1 - maxGroupSize: 3 + maxGroupSize: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/monster_toxins.yml b/Resources/Prototypes/_CP14/Reagents/monster_toxins.yml index 4c69891812..8724896b1c 100644 --- a/Resources/Prototypes/_CP14/Reagents/monster_toxins.yml +++ b/Resources/Prototypes/_CP14/Reagents/monster_toxins.yml @@ -44,9 +44,9 @@ metabolismRate: 0.5 effects: - !type:ModifyBleedAmount - amount: 2 + amount: 3 - !type:HealthChange damage: types: - Piercing: 1.5 + Piercing: 2.5 pricePerUnit: 4.0 #arbitrary for now