Event system refactor and changes (#29420)

* meta resolution * emerald resolution * delta resolution * fartgas resolution * box box * stay out stay out * metastation fixes * faragus fix * delta fix * Changes to role impact on event weight * adds disaster level to the event config * weight changes and starts adding disaster level to the ui * ui fixes * adjust disaster level timing * changes disaster timing, weights, disease outbreak role requirements and weights * lots of weight an requirement adjustments * Update tear.dm * some fixes * meta changes * Starting over with farragus * Starting over in faragus * faragus changes * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * resolving some faragus conflicts * resolve faragus conflicts * resolves delta conflicts * resolves cyberiad conflicts * resolves emerald conflicts * fixes cables in faragus * fixes meta cables * fixes delta cables * more meta fixes * more farragus cable fixes * more cable fixes * meta and faragus fixes * box and delta fixes * more mapping fixes * hopefully the last fix * Update metastation.dmm * Update metastation.dmm * fixes shorts on cyberiad cerebron and farragus * CI fixes * move new event listing to new system * Adds tracking and cost calculation for blob * finishes setting up blob event detection and costs * minor boolog corrections * fixes events being created at the wrong severity * adds ongoing cost to disease outbreak * moves terror spider event to new system * moves to component based event cost calculation * morph abductor and carps adjusted for new system * various fixes and adjusts rev event * Update revenant_spawn_event.dm * various fixes and adjusts demon incursion to the new system * adjusts some major event weights * correct wrong values of autoend on vendor uprising and rev * Update event_container.dm * more event timing adjustments * adds requirements to traders and incursion * slightly lowers requirements for biohazards * timing changes * temporarily disable loading event times from the config and increases major nothing chance * adjustments to costs and weights of various events * Update event_container.dm * additional adjustments to weights and requirements. moves rev to major * typo fix * ion storm adjustment * Update event_container.dm * more moderate changes * e * Update meteors_event.dm * removes cooldown from nothing event and changes its weight based on the number of remaining enabled events in the container * increases morph event requirements and chance of nothing moderate event * makes morph a major event * Update morph_event.dm * adds viro requirement for disease outbreak and fixes a bug with incorrect resource calculation * allows varediting extra roles for the event system for debug and testing * Adjust weights of traders and abductors and corrects wrong nominal severity for demonic incursion * Adds crew cound to rev weight * makes disasters start rolling later * reduces weight of communications blackout and increases weight of major nothing * adjusts door runtime and prisonbreak weights to make them less frequent. kudzu now scales with total crew * apc overload made less frequent * oopsy * Gives the scrubber clog event a name * fixes a type in a define name * adjusts demonic incursion weight * changes brand intelligence weight an d reduces door runtime weight * more adjustments to demon incursion. Makes additional weight from surplus roles diminish * adjustments to some minor events * Increases event length and requirements of some engineering events and lowers their weight slightly. Also increases cost of ongoing diseases events * fixes a type * Update meteors_event.dm * corrects traders nominal severity and adjusts demon weights * shifts anomaly weights down and increases costs * rebalance rod requirements * Update cerestation.dmm * moves net resource calculation to its own proc and changes the ASSIGNMENT_TOTAL macro to ASSIGNMENT_CREW. * Adds individual first run time for some events and makes majors start rolling slightly later * reduces weight of major nothing * minor reduction to rev and apc overload weight * Changes the way event weight is calculated * end time corrections for anomaly rod and meteors * slightly adjusts down the weights of nothing and some minor events * Adjusts moedrates towards about 3.5 per round and mundanes towards 8 per round * adds first run restrictions on traders and incursion and increases the cooldown time of events * resolve faragus conflicts * resolve emerald conflict * fix some faragus cabling * more cabling correction in faragus * more cable fixes * Update cerestation.dmm * remove doubled scrubber pipe on tile * reduces moderates nothing chance * slightly reduces crew requirements for disasters and also reduces crew weight for disasters * fixes meteor event not removing the alert, and makes it announce a bit later * Adds an event debugging window for real time midround event data * Revert "Adds an event debugging window for real time midround event data" This reverts commit ecd99a6c9e. * Adds a resource view button to the event manager window and fixes a null in the total resource list * various bug fixes * slightly lowers chance of meteor and similar events * Slightly lowers requirement weights on disaster level events * resolves faragus conflict * changes the default power input of engineering SMES to 200kw and 80kW respectively * connects power monitoring computers to the grid that weren't * meta station elec maints improvements * adds missing power monitoring computers on box and delta * removes dirt from wall * corrects area boundry on meta * adds missing cable on box sci * removes dirt from wall on box * connects cyberiad bridge to the rest of the powernet * connects box brig to powernet * Adds catwalks to box maints * adds catwalks to meta * Adds catwalks to delta * Update deltastation.dmm * adds ability to insulate cables * Moves stations to using extra insulated cables for high power network * Removes catwalks from meta * Removes catwalks from box * Removes catwalks from delta * Delays moderates and majors more and increases disaster chance * resolves box conflicts * Update cable.dm * remove floating request console * corrects position of fire alarm and removes extra intercom on metastation * resolves faragus conflict * reduces meteor variant weights. meaty ores event now has the correct nominal severity * meaty ore weight to 8 * fixes a stray light bulb and light switch in maints as well as a doubled power * Delays meteor type events to 40 minutes at the earliest. Moves the time check to be against round time instead of world time * wires kerberos security checkpoint to the grid * Update cerestation.dmm * Removes stray extinguisher cabinet from meta station * resolves area conflict on faragus * resolves more faragus issues * fixes faragus cabling issues * Update cerestation.dmm * removes another stray fire extinguisher cabinet * insulates the APC in delta PTL room * increases pop requirement and weight for demons and increases medbay and viro weights for diseases * connect delta fore starboard solars to the high power grid instead of the low power * Update deltastation.dmm * deconflict * solves some unconnected cables * connects delta customs to network and finishes resolving conflicts * Update deltastation.dmm * adds the new cables. needs coils and mapping * moves connection perms to the heavy duty cables. toggled with engineering permission ID. box gets new cables * sorts cables on stations * faragus cable connections * cable corrections. Adds heavy duty cables to the autolathe * CI fix * more fixes and makes the new cables show up on t ray scanners * box station mapping fixes * delta mapping fixes * meta fix * Update deltastation.dmm * delta and faragus fixes * Update emeraldstation.dmm * removes APC overloard(major) from event pool * adds diagonal sprites to heavy duty cables. allows sillicons to toggle them and * Makes borg versions of the heavy duty cable coil * palete consolidation * Improves visibility of high power cables * converts shuttle event to new system * makes disaster event last run calc use round time instead of world time * fixes wrong define being used in some event requirements. further increases requirements for demons and meteors. lowers weight of major diseases * Update slaughterevent.dm * reduces cargo requirements for shuttle load event * reduces base weight of major disease event and further increases medical requirements * fixes a wrong wire under the pet store maints door in delta station * resolve mapping conflicts * Revert "resolve mapping conflicts" This reverts commit 129db52501. * Revert "Merge branch 'HighPowerMaints' into event_timing" This reverts commit 2594ac8928, reversing changes made to a738b5f2f2. * fixes some wonky stuff with xeno code * Adds a crew cost to diseases * makes player contribution towards events variable * changes major event weights and slightly increases demon requirements * slightly increases major disease outbreak weight * comment changes * Adds safeties to protect against null events getting into container or the active list * blob fix * Adds a confirmation to random event toggle * Adjust particulate event weight to fit the new moderate weights * Adds additional security costs to changeling and vamp * Update revenant_spawn_event.dm * uses correct path for rev event cost proc * changes some lists to alists * correctly accesses the event container list and actually uses the config for the event timing --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman3595@gmail.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2026-08-24 04:27:35 +01:00 · 2025-11-07 16:29:47 +00:00
parent bee4f00416
commit e609a7faf7
102 changed files with 1029 additions and 290 deletions
@@ -213,6 +213,7 @@

 /mob/living/basic/mouse/blobinfected/Initialize(mapload)
 	. = ..()
+	AddComponent(/datum/component/event_tracker, EVENT_BLOB)
 	apply_status_effect(STATUS_EFFECT_BLOB_BURST, 120 SECONDS, CALLBACK(src, PROC_REF(burst), FALSE))

 /mob/living/basic/mouse/blobinfected/Life()
@@ -252,6 +253,7 @@
 	if(core)
 		core.admin_spawned = admin_spawned

+	SEND_SIGNAL(src, COMSIG_BLOB_MOUSE_BURST, core)
 	SSticker.record_biohazard_start(BIOHAZARD_BLOB)

 /mob/living/basic/mouse/blobinfected/get_scooped(mob/living/carbon/grabber)
@@ -68,6 +68,12 @@
 	. = ..()
 	carp_randomify(rarechance)
 	AddComponent(/datum/component/aggro_emote, emote_list = list("gnashes"))
+	AddComponent(/datum/component/event_tracker, EVENT_CARP)
+
+/mob/living/basic/carp/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_CREW = 0.1)

 /mob/living/basic/carp/proc/carp_randomify(rarechance)
 	if(random_color)
@@ -45,6 +45,13 @@
 /mob/living/basic/hellhound/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/ai_retaliate)
+	AddComponent(/datum/component/event_tracker)
+
+/mob/living/basic/hellhound/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 0.5, ASSIGNMENT_CREW = 1, ASSIGNMENT_MEDICAL = 0.5)
+

 /mob/living/basic/hellhound/examine(mob/user)
 	. = ..()
@@ -156,6 +156,11 @@
 	remove_from_all_data_huds()
 	giveSpells()
 	RegisterSignal(src, COMSIG_BODY_TRANSFER_TO, PROC_REF(make_revenant_antagonist))
+	AddComponent(/datum/component/event_tracker, EVENT_REVENTANT)
+
+/mob/living/basic/revenant/event_cost()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_CHAPLAIN = 1, ASSIGNMENT_CREW = 10, ASSIGNMENT_MEDICAL = 2)

 /mob/living/basic/revenant/proc/make_revenant_antagonist(revenant)
 	SIGNAL_HANDLER // COMSIG_BODY_TRANSFER_TO
@@ -37,6 +37,13 @@
 /mob/living/basic/skeleton/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/ai_retaliate)
+	AddComponent(/datum/component/event_tracker)
+
+/mob/living/basic/skeleton/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 0.5, ASSIGNMENT_CREW = 1, ASSIGNMENT_MEDICAL = 0.5)
+

 /mob/living/basic/skeleton/arctic
 	name = "undead arctic explorer"
@@ -36,3 +36,9 @@
 		update_appearance(UPDATE_NAME)
 		color = "#5494DA"
 	AddElement(/datum/element/ai_retaliate)
+	AddComponent(/datum/component/event_tracker, EVENT_DEMONIC)
+
+/mob/living/basic/netherworld/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 0.5, ASSIGNMENT_CREW = 1, ASSIGNMENT_MEDICAL = 0.5)
@@ -34,6 +34,7 @@
 	set_default_language(GLOB.all_languages["Galactic Common"])
 	AddElement(/datum/element/ai_retaliate)
 	update_icons()
+	AddComponent(/datum/component/event_tracker, EVENT_DRONE)

 /mob/living/basic/malf_drone/proc/create_trail(datum/source, atom/oldloc, _dir, forced)
 	var/turf/T = get_turf(oldloc)
@@ -33,6 +33,12 @@
 	for(var/organ_path in get_caste_organs())
 		var/obj/item/organ/internal/organ = new organ_path()
 		organ.insert(src)
+	AddComponent(/datum/component/event_tracker, EVENT_XENOS)
+
+/mob/living/carbon/alien/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z))
+		return list(ASSIGNMENT_SECURITY = 1, ASSIGNMENT_CREW = 3, ASSIGNMENT_MEDICAL = 1)

 /// returns the list of type paths of the organs that we need to insert into
 /// this particular xeno upon its creation
@@ -15,6 +15,11 @@
 	name = "alien hunter ([rand(1, 1000)])"
 	real_name = name

+/mob/living/carbon/alien/humanoid/hunter/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z))
+		return list(ASSIGNMENT_SECURITY = 0.8, ASSIGNMENT_CREW = 4, ASSIGNMENT_MEDICAL = 0.4)
+
 /mob/living/carbon/alien/humanoid/hunter/get_caste_organs()
 	. = ..()
 	. += /obj/item/organ/internal/alien/plasmavessel/hunter
@@ -31,6 +31,11 @@
 	name = "alien sentinel ([rand(1, 1000)])"
 	real_name = name

+/mob/living/carbon/alien/humenoid/sentinel/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z))
+		return list(ASSIGNMENT_SECURITY = 0.5, ASSIGNMENT_CREW = 3, ASSIGNMENT_MEDICAL = 0.2)
+
 /mob/living/carbon/alien/humanoid/sentinel/get_caste_organs()
 	. = ..()
 	. += list(
@@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
 	AddSpell(new /datum/spell/alien_spell/regurgitate)
 	. = ..()
 	AddComponent(/datum/component/footstep, FOOTSTEP_MOB_CLAW, 0.5, -11)
+	AddComponent(/datum/component/event_tracker, EVENT_XENOS)

 /mob/living/carbon/alien/humanoid/get_strippable_items(datum/source, list/items)
 	items |= GLOB.strippable_alien_humanoid_items
@@ -19,6 +19,11 @@
 	ADD_TRAIT(src, TRAIT_FORCE_DOORS, UNIQUE_TRAIT_SOURCE(src))
 	AddSpell(new /datum/spell/alien_spell/tail_lash)

+/mob/living/carbon/alien/humenoid/queen/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z))
+		return list(ASSIGNMENT_SECURITY = 2, ASSIGNMENT_CREW = 12, ASSIGNMENT_MEDICAL = 1)
+
 /mob/living/carbon/alien/humanoid/queen/get_caste_organs()
 	. = ..()
 	. += list(
@@ -31,6 +31,11 @@
 	var/datum/action/innate/hide/alien_larva_hide/hide = new()
 	hide.Grant(src)

+/mob/living/carbon/alien/larva/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z))
+		return list(ASSIGNMENT_SECURITY = 0.2, ASSIGNMENT_CREW = 1)
+
 /mob/living/carbon/alien/larva/Destroy()
 	for(var/datum/action/innate/hide/alien_larva_hide/hide in actions)
 		hide.Remove(src)
@@ -235,8 +235,15 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca
 	orig_vendor.forceMove(src)
 	orig_vendor.aggressive = FALSE // just to be safe, in case this was converted

+	AddComponent(/datum/component/event_tracker, EVENT_BRAND_INTELLIGENCE)
+
 	return ..(mapload, base, creator, destroy_original = FALSE)

+/mob/living/simple_animal/hostile/mimic/copy/vendor/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 0.5, ASSIGNMENT_CREW = 1)
+
 /mob/living/simple_animal/hostile/mimic/copy/vendor/AttackingTarget()
 	. = ..()
 	if(. && target && Adjacent(target))
@@ -97,6 +97,10 @@
 	else
 		visible_message("<span class='danger'>[src] bites [target], but cannot inject venom into [target.p_their()] [inject_target]!</span>")

+/mob/living/simple_animal/hostile/poison/terror_spider/green/event_cost()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 0.5, ASSIGNMENT_CREW = 2, ASSIGNMENT_MEDICAL = 0.2)
+
 /obj/structure/spider/terrorweb/green
 	name = "slimy web"
 	desc = "This web is partly composed of strands of green slime."
@@ -109,3 +109,7 @@
 	if(hit_something)
 		visible_message("<span class='danger'>[src] slams into [hit_atom]!</span>", "<span class='userdanger'>You slam into [hit_atom]!</span>")
 		playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100, TRUE)
+
+/mob/living/simple_animal/hostile/poison/terror_spider/prince/event_cost()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 2, ASSIGNMENT_CREW = 20, ASSIGNMENT_MEDICAL = 3)
@@ -123,3 +123,6 @@
 		return TRUE
 	return FALSE

+/mob/living/simple_animal/hostile/poison/terror_spider/queen/princess/event_cost()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 2, ASSIGNMENT_CREW = 15, ASSIGNMENT_MEDICAL = 2)
@@ -348,6 +348,9 @@
 	. += "<span class='notice'>[p_they(TRUE)] has laid [eggslaid] egg[eggslaid != 1 ? "s" : ""].</span>"
 	. += "<span class='notice'>[p_they(TRUE)] has lived for [MinutesAlive()] minutes.</span>"

+/mob/living/simple_animal/hostile/poison/terror_spider/queen/event_cost()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 3, ASSIGNMENT_CREW = 30, ASSIGNMENT_MEDICAL = 2)

 /obj/item/projectile/terrorqueenspit
 	name = "acid spit"
@@ -22,6 +22,7 @@
 	GLOB.ts_spiderling_list += src
 	if(is_away_level(z))
 		spider_awaymission = TRUE
+	AddComponent(/datum/component/event_tracker, EVENT_TERROR_SPIDERS)

 /obj/structure/spider/spiderling/terror_spiderling/Destroy()
 	GLOB.ts_spiderling_list -= src
@@ -216,6 +217,7 @@
 			name = "prince of terror eggs"
 		if(/mob/living/simple_animal/hostile/poison/terror_spider/queen)
 			name = "queen of terror eggs"
+	AddComponent(/datum/component/event_tracker, EVENT_TERROR_SPIDERS)

 /obj/structure/spider/eggcluster/terror_eggcluster/Destroy()
 	GLOB.ts_egg_list -= src
@@ -238,6 +238,10 @@ GLOBAL_LIST_EMPTY(ts_infected_list)
 	fed++
 	qdel(J)

+/mob/living/simple_animal/hostile/poison/terror_spider/event_cost()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 0.2, ASSIGNMENT_CREW = 1.5, ASSIGNMENT_MEDICAL = 0.2)
+
 // --------------------------------------------------------------------------------
 // --------------------- TERROR SPIDERS: PROC OVERRIDES ---------------------------
 // --------------------------------------------------------------------------------
@@ -287,6 +291,7 @@ GLOBAL_LIST_EMPTY(ts_infected_list)
 	var/datum/atom_hud/U = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
 	U.add_hud_to(src)
 	spider_creation_time = world.time
+	AddComponent(/datum/component/event_tracker, EVENT_TERROR_SPIDERS)

 /mob/living/simple_animal/hostile/poison/terror_spider/proc/announcetoghosts()
 	if(stat == DEAD)
@@ -51,6 +51,10 @@
 				LoseTarget()
 				GLOB.move_manager.move_away(src,L,2,1)

+/mob/living/simple_animal/hostile/poison/terror_spider/white/event_cost()
+	if(is_station_level((get_turf(src)).z) && stat != DEAD)
+		return list(ASSIGNMENT_SECURITY = 1, ASSIGNMENT_CREW = 5, ASSIGNMENT_MEDICAL = 2)
+
 /proc/IsTSInfected(mob/living/carbon/C) // Terror AI requires this
 	if(C.get_int_organ(/obj/item/organ/internal/body_egg))
 		return 1
@@ -59,6 +63,12 @@
 /obj/item/organ/internal/body_egg/terror_eggs/Initialize(mapload)
 	. = ..()
 	GLOB.ts_infected_list += src
+	AddComponent(/datum/component/event_tracker, EVENT_TERROR_SPIDERS)
+
+/obj/item/organ/internal/body_egg/terror_eggs/event_cost()
+	. = list()
+	if(is_station_level((get_turf(src)).z) && owner)
+		return list(ASSIGNMENT_MEDICAL = 1)

 /obj/item/organ/internal/body_egg/terror_eggs/insert(mob/living/carbon/M, special)
 	. = ..()
@@ -1642,3 +1642,17 @@ GLOBAL_LIST_INIT(holy_areas, typecacheof(list(
 		client.mouse_pointer_icon = null
 		return
 	client.mouse_pointer_icon = mousepointers["[lowest_prio]"]
+
+/mob/proc/get_event_capacity()
+	. = 1
+	var/max_symptom_severity = 0
+	for(var/datum/disease/advance/virus in viruses)
+		for(var/datum/symptom/curr_symptom in virus.symptoms)
+			if(curr_symptom.severity > max_symptom_severity)
+				max_symptom_severity = curr_symptom.severity
+	switch(max_symptom_severity)
+		if(4)
+			. *= 0.5
+		if(5 to 6)
+			return 0
+