Mobwavespawner MK2 [DONE] (#2491)

Mobwavespawner MK2

ModularTegustation/lc13_structures.dm

@@ -76,6 +76,38 @@
 	base_pixel_y = -8
 	anchored = TRUE
 
+/*
+* Wave Spawners. Uses the monwave_spawners component.
+*/
+/obj/structure/den
+	name = "spawning_den"
+	desc = "subtype for dens you shouldnt be seeing this."
+	icon_state = "hole"
+	icon = 'icons/mob/nest.dmi'
+	max_integrity = 200
+	anchored = TRUE
+	density = FALSE
+	var/list/moblist = list()
+
+/obj/structure/den/tunnel/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/monwave_spawner, attack_target = get_turf(src), new_wave_order = moblist)
+
+/obj/structure/den/proc/changeTarget(thing)
+	var/turf/target_turf = get_turf(thing)
+	if(!target_turf)
+		return FALSE
+	var/datum/component/monwave_spawner/target_component = datum_components[/datum/component/monwave_spawner]
+	target_component.GeneratePath(target_turf)
+	return TRUE
+
+/obj/structure/den/tunnel
+	name = "tunnel entrance"
+	desc = "A entrance to a underground tunnel. It would only take a few whacks to cave it in."
+	icon_state = "hole"
+	icon = 'icons/mob/nest.dmi'
+	moblist = list(/mob/living/simple_animal/hostile/ordeal/indigo_noon = 3)
+
 /**
  * List of button counters
  * Required as persistence subsystem loads after the ones present at mapload, and to reset to 0 upon explosion.

code/datums/components/monwave_spawners.dm

@@ -1,3 +1,8 @@
+/*
+* Highly Experimental Feature for spawning mobs
+* in a wave and commanding them to go to a location.
+*/
+
 #define SEND_ON_SIGNAL 1
 #define SEND_ON_WAVE 2
 #define SEND_TILL_MAX 3
@@ -23,11 +28,10 @@
 	//current wave of soldiers
 	var/list/current_wave = list()
 	//The wave order that wave_composition copies. The value of each type is how many are in each wave.
-	var/list/wave_order = list(
-		/mob/living/simple_animal/hostile/ordeal/steel_dawn = 6,
-		/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying = 2
-		)
+	var/list/wave_order = list()
 	var/list/wave_composition = list()
+	//Path to target
+	var/list/assult_path = list()
 
 //Experimental So i dont have to use the procs all the time
 /datum/component/monwave_spawner/Initialize(attack_target, assault_type = SEND_ON_WAVE, max_mobs = 30, list/wave_faction = list("hostile"), list/new_wave_order)
@@ -43,14 +47,15 @@
 
 	if(!assault_target && assault_pace != SEND_ON_SIGNAL)
 		qdel(src)
+	GeneratePath()
 	BeginProcessing()
 
 /datum/component/monwave_spawner/process(delta_time)
 	if(!parent || !assault_target)
 		qdel(src)
 		return
 	if(last_wave.len && world.time >= resume_cooldown)
-		ResumeAssault()
+		CleanupAssault()
 		resume_cooldown = world.time + (1 MINUTES)
 		return
 	if(world.time >= generate_wave_cooldown)
@@ -107,7 +112,7 @@
 /datum/component/monwave_spawner/proc/StartAssault(enemy_base)
 	if(!enemy_base)
 		return FALSE
-	wave_leader = new /obj/effect/wave_commander(pick(get_adjacent_open_turfs(parent)))
+	wave_leader = new /obj/effect/wave_commander(get_turf(parent))
 	for(var/i in current_wave)
 		if(isnull(i))
 			current_wave -= i
@@ -117,18 +122,25 @@
 				current_wave -= H
 				continue
 			walk_to(H, wave_leader, rand(0,2), H.move_to_delay)
-	wave_leader.DoPath(get_turf(enemy_base))
+	wave_leader.DoPath(assult_path)
 	wave_composition = LAZYCOPY(wave_order)
 	last_wave = LAZYCOPY(current_wave)
 	LAZYCLEARLIST(current_wave)
 	return TRUE
 
-//Is our soldiers interrupted in their march and should we command them to go to the enemy again. This option should be used if continuous wave is not on.
-/datum/component/monwave_spawner/proc/ResumeAssault()
+//Despawns any idle monsters who lost the wave.
+/datum/component/monwave_spawner/proc/CleanupAssault()
 	var/area/where_we_go = get_area(assault_target)
 	for(var/mob/living/simple_animal/hostile/H in last_wave)
 		if(get_area(H) != where_we_go && !H.target)
-			H.patrol_to(get_turf(assault_target))
+			H.dust()
+
+//Generates a path for the Mob Commander
+/datum/component/monwave_spawner/proc/GeneratePath(turf_to_go)
+	var/target_loc = assault_target
+	if(turf_to_go)
+		target_loc = get_turf(turf_to_go)
+	assult_path = get_path_to(parent, target_loc, /turf/proc/Distance_cardinal, 0, 200)
 
 //Invisible Effect only visible to ghosts. Uses a altered form of Hostile Patrol Code -IP
 /obj/effect/wave_commander
@@ -142,11 +154,8 @@
 	var/patrol_move_timer = 0
 	var/list/our_path = list()
 
-/obj/effect/wave_commander/proc/DoPath(turf/target_location = null)
-	if(isnull(target_location))
-		RemoveCommander()
-		return FALSE
-	our_path = get_path_to(src, target_location, /turf/proc/Distance_cardinal, 0, 200)
+/obj/effect/wave_commander/proc/DoPath(list/assault_path)
+	our_path = assault_path
 	if(our_path.len <= 0)
 		RemoveCommander()
 		return FALSE