From e8e2d8f70b674b5349512a8fbdacdc29865b0f9d Mon Sep 17 00:00:00 2001 From: Lynx Date: Mon, 26 Aug 2024 14:46:35 -0700 Subject: [PATCH] Storyteller - More balancing attempts --- code/__DEFINES/mobs.dm | 4 ++-- code/game/gamemodes/events/infestation.dm | 2 +- code/game/objects/effects/chem/chemsmoke.dm | 1 - code/game/objects/random/mob/roach.dm | 4 ++-- .../living/carbon/superior_animal/roach/types/glowing.dm | 4 ++-- .../living/carbon/superior_animal/roach/types/hunter.dm | 4 ++-- .../living/carbon/superior_animal/roach/types/support.dm | 1 - .../mob/living/carbon/superior_animal/roach/types/tank.dm | 4 ++-- .../living/carbon/superior_animal/roach/types/tazntz.dm | 8 ++++---- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 35adebef6a6..d860e4357f9 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -115,8 +115,8 @@ // Defines mob health modifier, all mobs of a subtype will have their health modified by this. Mobs may have multiple types, attached to a max() operator. // Mobs may have multiple types, attached to a max() operator. this is mostly because some 'miscelaneous' mobs are grouped more generally. // If you don't see something here that seems to fit what you want, it may very well not have a define. -#define ROACH_HEALTH_MOD 1 //all roaches other than kaisers./ -#define SPIDER_HEALTH_MOD 0.5 //all spiders other than reapers./ +#define ROACH_HEALTH_MOD 0.5 //all roaches other than kaisers./ +#define SPIDER_HEALTH_MOD 0.66 //all spiders other than reapers./ #define TERMITE_HEALTH_MOD 0.5 //all termites./ #define CAVEMOB_HEALTH_MOD 0.70 //wurms, Sargoyle./ #define AMGOLEM_HEALTH_MOD 0.70 //ameridien golems./ diff --git a/code/game/gamemodes/events/infestation.dm b/code/game/gamemodes/events/infestation.dm index 984aa457f9f..3d7531a09a0 100644 --- a/code/game/gamemodes/events/infestation.dm +++ b/code/game/gamemodes/events/infestation.dm @@ -183,7 +183,7 @@ It focuses on spawning large numbers of moderate-to-weak monsters, and includes if(INFESTATION_ROACHLINGS) event_name = "Roachling Infestation" chosen_verb = "have burrowed into" - chosen_mob_classification += /mob/living/carbon/superior_animal/roach/roachling + chosen_mob_classification += /obj/random/cluster/roachlings //Event spawns are being weird with Roachlings. if(INFESTATION_SPIDERS) event_name = "Spider Infestation" chosen_verb = "have burrowed into" diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index d6f9d3a7f8c..3bfae12c412 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -76,7 +76,6 @@ var/list/wallList var/density var/show_log = 1 - var/alpha /datum/effect/effect/system/smoke_spread/chem/spores show_log = 0 diff --git a/code/game/objects/random/mob/roach.dm b/code/game/objects/random/mob/roach.dm index 98faa28bd98..e4fc5990e8c 100755 --- a/code/game/objects/random/mob/roach.dm +++ b/code/game/objects/random/mob/roach.dm @@ -92,8 +92,8 @@ name = "hoard of roachlings" icon_state = "hostilemob-brown-cluster" alpha = 128 - min_amount = 6 - max_amount = 16 + min_amount = 1 + max_amount = 1 // Set to 1 since the event spawner is being weird with Roachlings. spread_range = 0 /obj/random/cluster/roachlings/item_to_spawn() diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm index 2517d5baca8..b7549c26149 100644 --- a/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm +++ b/code/modules/mob/living/carbon/superior_animal/roach/types/glowing.dm @@ -20,8 +20,8 @@ toxin_immune = TRUE knockdown_odds = 2 //Well we still can knockdown we dont tend to over other affects - melee_damage_lower = 6 - melee_damage_upper = 8 //Weaker than hunter as we are a support mob + melee_damage_lower = 4 + melee_damage_upper = 6 //Weaker than hunter as we are a support mob armor_divisor = 1 /mob/living/carbon/superior_animal/roach/glowing/UnarmedAttack(var/atom/A, var/proximity) diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/hunter.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/hunter.dm index 2b17056c6a8..ad67502f7ac 100644 --- a/code/modules/mob/living/carbon/superior_animal/roach/types/hunter.dm +++ b/code/modules/mob/living/carbon/superior_animal/roach/types/hunter.dm @@ -11,8 +11,8 @@ blattedin_revives_left = 2 knockdown_odds = 0 // We are hunters, we kill, not cap. - melee_damage_lower = 8 // We are hunters, meant to kill, not meant to tickle. - melee_damage_upper = 12 + melee_damage_lower = 6 // We are hunters, meant to kill, not meant to tickle. + melee_damage_upper = 10 meat_type = /obj/item/reagent_containers/food/snacks/meat/roachmeat/jager meat_amount = 3 diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/support.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/support.dm index a4514060ffc..311147685d9 100644 --- a/code/modules/mob/living/carbon/superior_animal/roach/types/support.dm +++ b/code/modules/mob/living/carbon/superior_animal/roach/types/support.dm @@ -35,7 +35,6 @@ S.attach(location) S.set_up(gas_sac, gas_sac.total_volume, 0, location) - S.alpha = 100 // This smoke has always hidden them, and I personally find that strange and not fun to fight against. Reduced to 100 for now. src.visible_message(SPAN_DANGER("\the [src] secretes strange vapors!")) spawn(0) diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm index 8f9b23c2313..e21c9dbbc2e 100644 --- a/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm +++ b/code/modules/mob/living/carbon/superior_animal/roach/types/tank.dm @@ -4,8 +4,8 @@ icon_state = "panzer" meat_amount = 4 turns_per_move = 2 - maxHealth = 120 * ROACH_HEALTH_MOD - health = 120 * ROACH_HEALTH_MOD + maxHealth = 100 * ROACH_HEALTH_MOD + health = 100 * ROACH_HEALTH_MOD move_to_delay = 7 mob_size = MOB_MEDIUM density = TRUE diff --git a/code/modules/mob/living/carbon/superior_animal/roach/types/tazntz.dm b/code/modules/mob/living/carbon/superior_animal/roach/types/tazntz.dm index 87c6596b733..a407a08695b 100644 --- a/code/modules/mob/living/carbon/superior_animal/roach/types/tazntz.dm +++ b/code/modules/mob/living/carbon/superior_animal/roach/types/tazntz.dm @@ -4,15 +4,15 @@ icon_state = "tzantz" meat_amount = 2 turns_per_move = 4 - maxHealth = 175 * ROACH_HEALTH_MOD - health = 175 * ROACH_HEALTH_MOD + maxHealth = 133 * ROACH_HEALTH_MOD + health = 133 * ROACH_HEALTH_MOD move_to_delay = 4 mob_size = MOB_MEDIUM density = TRUE knockdown_odds = 1 - melee_damage_lower = 15 - melee_damage_upper = 20 + melee_damage_lower = 8 + melee_damage_upper = 12 armor = list(melee = 3, bullet = 2, energy = 1, bomb = 5, bio = 20, rad = 0, agony = 0) armor_divisor = 1.3