Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't store state on material trigger procs #15205

Merged
merged 2 commits into from
Aug 8, 2023
Merged

Don't store state on material trigger procs #15205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8b3cd5
material props are not where those go
amylizzle Aug 1, 2023
5913b44
that works better now
amylizzle Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 24 additions & 22 deletions code/modules/materials/Mat_MaterialProcs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,33 +340,36 @@ triggerOnEntered(var/atom/owner, var/atom/entering)
return

/datum/materialProc/plasmastone
var/total_plasma = 200

execute(var/atom/location) //exp and temp both have the location as first argument so i can use this for both.
var/turf/T = get_turf(location)
if(!T || T.density || !istype(location))
return
if(!location.material.isMutable()) //this is a little hacky, but basically ensure it's mutable and then do the trigger
location.material = location.material.getMutable()
return location.material.triggerTemp(location, 0)
var/total_plasma = location.material.getProperty("plasma_offgas")
if(total_plasma <= 0)
if(prob(2) && location)
location.visible_message("<span class='alert>[location] dissipates.</span>")
qdel(location)
return
if(ON_COOLDOWN(location, "plasmastone_plasma_generate", 5 SECONDS)) return
var/list/turf/simulated/floor/valid_turfs = list()
for (var/turf/simulated/floor/target in range(1,location))
if(ON_COOLDOWN(target, "plasmastone_plasma_generate", 10 SECONDS)) continue
if(!target.gas_impermeable && target.air)
if(target.parent?.group_processing)
target.parent.suspend_group_processing()
if(target.gas_cross(target) && target.air)
valid_turfs += target
if(length(valid_turfs))
var/turf/simulated/floor/target = pick(valid_turfs)
if(target.parent?.group_processing)
target.parent.suspend_group_processing()

var/datum/gas_mixture/payload = new /datum/gas_mixture
payload.toxins = 25 * location.material_amt
total_plasma -= payload.toxins / location.material_amt
payload.temperature = T20C
payload.volume = R_IDEAL_GAS_EQUATION * T20C / 1000
target.air.merge(payload)
return
var/datum/gas_mixture/payload = new /datum/gas_mixture
payload.toxins = 25 * location.material_amt
total_plasma -= 1
payload.temperature = T20C
payload.volume = R_IDEAL_GAS_EQUATION * T20C / 1000
target.air.merge(payload)
location.material.setProperty("plasma_offgas", total_plasma)

/datum/materialProc/plasmastone_on_hit
execute(var/atom/owner)
Expand All @@ -388,8 +391,8 @@ triggerOnEntered(var/atom/owner, var/atom/entering)
var/datum/material/crystal/molitz/molitz = src.find_molitz(owner.material)
if (!istype(molitz))
CRASH("Molitz_temp material proc applied to non-molitz thing") //somehow applied to non-molitz

if(molitz.iterations <= 0) return
var/iterations = owner.material.getProperty("molitz_bubbles")
if(iterations <= 0) return

var/datum/gas_mixture/air
if(hasvar(owner, "air_contents"))
Expand Down Expand Up @@ -430,7 +433,7 @@ triggerOnEntered(var/atom/owner, var/atom/entering)
playsound(owner, 'sound/effects/leakoxygen.ogg', 50, 1, 5)


molitz.iterations -= 1
molitz.setProperty("molitz_bubbles", iterations-1)


/datum/materialProc/molitz_temp/agent_b
Expand All @@ -445,23 +448,22 @@ triggerOnEntered(var/atom/owner, var/atom/entering)
if(!istype(owner.material, /datum/material/crystal/molitz))
return
var/datum/material/crystal/molitz/molitz = owner.material
if(molitz.unexploded <= 0)
return
var/iterations = molitz.getProperty("molitz_bubbles")
if(iterations <= 0) return
if(!owner.material.isMutable()) //this is a little hacky, but basically ensure it's mutable and then do the trigger
owner.material = owner.material.getMutable()
return owner.material.triggerExp(owner, sev)
var/turf/target = get_turf(owner)
if(sev > 0 && sev < 4) // Use pipebombs not canbombs!
if(molitz.iterations >= 1)
if(iterations >= 1)
playsound(owner, 'sound/effects/leakoxygen.ogg', 50, 1, 5)
if(molitz.iterations == 0)
if(iterations == 0)
playsound(owner, 'sound/effects/molitzcrumble.ogg', 50, 1, 5)
var/datum/gas_mixture/payload = new /datum/gas_mixture
payload.oxygen = 50
payload.temperature = T20C
target.assume_air(payload)
molitz.iterations = 2
molitz.unexploded = 0
molitz.setProperty("molitz_bubbles", iterations-2)


/datum/materialProc/miracle_add
Expand Down
4 changes: 2 additions & 2 deletions code/modules/materials/Mat_Materials.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,13 +854,12 @@ ABSTRACT_TYPE(/datum/material/crystal)
desc = "Molitz is a common crystalline substance."
color = "#FFFFFF"
alpha = 180
var/unexploded = 1
var/iterations = 4

New()
..()
setProperty("density", 3)
setProperty("hard", 4)
setProperty("molitz_bubbles", 4)
addTrigger(TRIGGERS_ON_TEMP, new /datum/materialProc/molitz_temp())
addTrigger(TRIGGERS_ON_EXPLOSION, new /datum/materialProc/molitz_exp())

Expand Down Expand Up @@ -926,6 +925,7 @@ ABSTRACT_TYPE(/datum/material/crystal)
setProperty("electrical", 5)
setProperty("radioactive", 2)
setProperty("flammable", 8)
setProperty("plasma_offgas", 10)

addTrigger(TRIGGERS_ON_TEMP, new /datum/materialProc/plasmastone())
addTrigger(TRIGGERS_ON_EXPLOSION, new /datum/materialProc/plasmastone())
Expand Down
42 changes: 42 additions & 0 deletions code/modules/materials/Mat_Properties.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,45 @@ ABSTRACT_TYPE(/datum/material_property)
return "densely packed with plutonium"
if(8 to INFINITY)
return "mostly plutonium"

/datum/material_property/molitz_bubbles
name = "Gas Pockets"
id = "molitz_bubbles"

min_value = 0
prefix_high_min = 0.1
prefix_low_max = 9
default_value = 0

getAdjective(var/datum/material/M)
switch(M.getProperty(id))
if(3 to INFINITY)
return "Filled with bubbles"
if(1 to 3)
return "Lots of small bubbles"
else
return "Barely any bubbles"

/datum/material_property/plasma_offgas
name = "Active Plasma"
id = "plasma_offgas"

min_value = 0
prefix_high_min = 0.1
prefix_low_max = 9
default_value = 0

getAdjective(var/datum/material/M)
switch(M.getProperty(id))
if(0 to 1)
return "entirely depleted plasma"
if(1 to 2)
return "mostly depleted plasma"
if(2 to 4)
return "some active plasma"
if(4 to 6)
return "about half active plasma"
if(6 to 8)
return "lots of active plasma"
if(8 to INFINITY)
return "filled with active plasma"
34 changes: 0 additions & 34 deletions code/obj/item/material.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,23 +237,6 @@
default_material = "molitz"
crystal = 1

get_desc()
if(!istype(src.material, /datum/material/crystal/molitz))
return
var/datum/material/crystal/molitz/molitz = src.material
if(molitz.iterations == 2 && molitz.unexploded == 0)
. += " Fracture lines dash to the small bubbles of gas, getting close to them but not quite reaching them. You fail to spot any large bubbles of gas that havent imploded on themselves."
else if(molitz.iterations == 1 && molitz.unexploded == 0)
. += " All of the large bubbles of gas and a chunk of the small bubbles of gas are imploded, with fracture lines getting close to the small bubbles that remain."
else if(molitz.iterations == 0 && molitz.unexploded == 0)
. += " You fail to notice any non collapsed bubbles of gas in the structure."
else if(molitz.iterations >= 3)
. += " Both large and small bubbles of gas are highly prevalent throughout the crystal."
else if(molitz.iterations >= 1)
. += " Nearly all of the large bubbles of gas have collapsed, however small bubbles of gas remain embeded in the structure."
else if(molitz.iterations == 0)
. += " You fail to spot any large bubbles of gas that havent imploded on themselves, the crystal is lodged full with small bubbles of gas."

/obj/item/raw_material/molitz_beta
name = "molitz crystal"
desc = "An unusual crystal of Molitz."
Expand All @@ -266,23 +249,6 @@
. = ..()
src.pressure_resistance = INFINITY //has to be after material setup. REASONS

get_desc()
if(!istype(src.material, /datum/material/crystal/molitz))
return
var/datum/material/crystal/molitz/molitz = src.material
if(molitz.iterations == 2 && molitz.unexploded == 0)
. += " Fracture lines dash to the small bubbles of gas, getting close to them but not quite reaching them. You fail to spot any large bubbles of gas that havent imploded on themselves."
else if(molitz.iterations == 1 && molitz.unexploded == 0)
. += " All of the large bubbles of gas and a chunk of the small bubbles of gas are imploded, with fracture lines getting close to the small bubbles that remain."
else if(molitz.iterations == 0 && molitz.unexploded == 0)
. += " You fail to notice any non collapsed bubbles of gas in the structure."
else if(molitz.iterations >= 3)
. += " Both large and small bubbles of gas are highly prevalent throughout the crystal."
else if(molitz.iterations >= 1)
. += " Nearly all of the large bubbles of gas have collapsed, however small bubbles of gas remain embeded in the structure."
else if(molitz.iterations == 0)
. += " You fail to spot any large bubbles of gas that havent imploded on themselves, the crystal is lodged full with small bubbles of gas."

/obj/item/raw_material/pharosium
name = "pharosium ore"
desc = "A chunk of Pharosium, a conductive metal."
Expand Down