Syndicate Shocktroops event rebalance (#2708)

Monkestation · Sep 10, 2024 · 35dadfe · 35dadfe
1 parent 6fd88a4
commit 35dadfe
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm
@@ -64,10 +64,10 @@
 		number_of_hostiles += hostile_types[hostile]
 
 	while(number_of_bosses > boss_spawn.len)
-		boss_spawn += get_random_station_turf()
+		boss_spawn += get_safe_random_station_turf() // monkestation edit: use [get_safe_random_station_turf] so they don't spawn in weird stupid places
 
 	while(number_of_hostiles > hostiles_spawn.len)
-		hostiles_spawn += get_random_station_turf()
+		hostiles_spawn += get_safe_random_station_turf() // monkestation edit: use [get_safe_random_station_turf] so they don't spawn in weird stupid places
 
 	next_boss_spawn = start_when + CEILING(2 * number_of_hostiles / number_of_bosses, 1)
 	setup = TRUE //MONKESTATION ADDITION
@@ -81,7 +81,7 @@
 	sound_to_playing_players('sound/magic/lightningbolt.ogg')
 
 /datum/round_event/portal_storm/tick()
-	spawn_effects(get_random_station_turf())
+	spawn_effects(get_safe_random_station_turf()) // monkestation edit: use [get_safe_random_station_turf] so they don't spawn in weird stupid places
 
 	if(spawn_hostile() && length(hostile_types))
 		var/type = pick(hostile_types)

diff --git a/monkestation/code/modules/events/portal_storm.dm b/monkestation/code/modules/events/portal_storm.dm
@@ -0,0 +1,6 @@
+/datum/round_event/portal_storm/syndicate_shocktroop
+	boss_types = list(/mob/living/basic/trooper/syndicate/melee/space/stormtrooper/lesser = 2)
+	hostile_types = list(
+		/mob/living/basic/trooper/syndicate/melee/space/lesser = 8,
+		/mob/living/basic/trooper/syndicate/ranged/space/lesser = 2,
+	)
diff --git a/monkestation/code/modules/mob/living/basic/trooper/syndicate.dm b/monkestation/code/modules/mob/living/basic/trooper/syndicate.dm
@@ -0,0 +1,21 @@
+// Weaker variants of the syndie trooper NPCs for the Shocktroops event
+/mob/living/basic/trooper/syndicate/melee/space/lesser
+	maxHealth = 45
+	health = 45
+	melee_damage_lower = 8
+	melee_damage_upper = 15
+	melee_attack_cooldown = 1.5 SECONDS
+
+/mob/living/basic/trooper/syndicate/melee/space/stormtrooper/lesser
+	maxHealth = 100
+	health = 100
+	melee_damage_lower = 10
+	melee_damage_upper = 18
+	melee_attack_cooldown = 1.5 SECONDS
+
+/mob/living/basic/trooper/syndicate/ranged/space/lesser
+	maxHealth = 45
+	health = 45
+	melee_damage_lower = 5
+	melee_damage_upper = 10
+	ranged_cooldown = 3 SECONDS
diff --git a/tgstation.dme b/tgstation.dme
@@ -6937,6 +6937,7 @@
 #include "monkestation\code\modules\events\artifact_spawn.dm"
 #include "monkestation\code\modules\events\brand_intelligence.dm"
 #include "monkestation\code\modules\events\gravity_generator_blackout.dm"
+#include "monkestation\code\modules\events\portal_storm.dm"
 #include "monkestation\code\modules\events\radiation_storm.dm"
 #include "monkestation\code\modules\events\scrubber_clog.dm"
 #include "monkestation\code\modules\events\scrubber_overflow.dm"
@@ -7243,6 +7244,7 @@
 #include "monkestation\code\modules\mob\living\basic\ggg\glerm.dm"
 #include "monkestation\code\modules\mob\living\basic\ggg\susflash.dm"
 #include "monkestation\code\modules\mob\living\basic\pets\parrot\parrot_ai\parroting_action.dm"
+#include "monkestation\code\modules\mob\living\basic\trooper\syndicate.dm"
 #include "monkestation\code\modules\mob\living\basic\vermin\frog.dm"
 #include "monkestation\code\modules\mob\living\basic\vermin\mouse.dm"
 #include "monkestation\code\modules\mob\living\carbon\carbon.dm"