From 735ccbac127ca3449cf630d38597d81716137ee5 Mon Sep 17 00:00:00 2001 From: lass9030 Date: Mon, 1 Oct 2018 18:23:31 +0200 Subject: [PATCH 1/6] unfold, add seperate checks --- .../diseases/advance/symptoms/sensory.dm | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 9234b54b088..31fd5404ecf 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -30,21 +30,27 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(2) - if(M.reagents.get_reagent_amount("oculine")<10) + if(M.reagents.get_reagent_amount("oculine") < 10) M.reagents.add_reagent("oculine", 10) to_chat(M, "Your hearing feels clearer and crisp.") if(3) - if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 ) - M.reagents.add_reagent_list(list("antihol"=10, "oculine"=10)) + if(M.reagents.get_reagent_amount("antihol") < 10) to_chat(M, "You feel sober.") + if(M.reagents.get_reagent_amount("oculine") < 10) + M.reagents.add_reagent("oculine", 10) if(4) - if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 && M.reagents.get_reagent_amount("synaphydramine") < 10) - M.reagents.add_reagent_list(list("antihol"=10, "oculine"=10, "synaphydramine"=5)) + if(M.reagents.get_reagent_amount("antihol") < 10) to_chat(M, "You feel focused.") + if(M.reagents.get_reagent_amount("antihol") < 10) + if(M.reagents.get_reagent_amount("oculine") < 10) + M.reagents.add_reagent("oculine", 10) if(5) - if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 && M.reagents.get_reagent_amount("synaphydramine") < 10 && M.reagents.get_reagent_amount("mannitol") < 10) - M.reagents.add_reagent_list(list("mannitol"=10, "antihol"=10, "oculine"=10, "synaphydramine"=10)) + if(M.reagents.get_reagent_amount("mannitol") < 10) to_chat(M, "Your mind feels relaxed.") + if(M.reagents.get_reagent_amount("antihol") < 10) + if(M.reagents.get_reagent_amount("antihol") < 10) + if(M.reagents.get_reagent_amount("oculine") < 10) + M.reagents.add_reagent("oculine", 10) return /* From 3b9c504192a3f482b6c529af7613e854cdfe18cb Mon Sep 17 00:00:00 2001 From: lass9030 Date: Mon, 1 Oct 2018 18:35:57 +0200 Subject: [PATCH 2/6] woops --- code/datums/diseases/advance/symptoms/sensory.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 31fd5404ecf..89056fdcf7f 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -35,20 +35,26 @@ Bonus to_chat(M, "Your hearing feels clearer and crisp.") if(3) if(M.reagents.get_reagent_amount("antihol") < 10) + M.reagents.add_reagent("antihol" = 10) to_chat(M, "You feel sober.") if(M.reagents.get_reagent_amount("oculine") < 10) M.reagents.add_reagent("oculine", 10) if(4) if(M.reagents.get_reagent_amount("antihol") < 10) + M.reagents.add_reagent("synaphydramine" = 5) to_chat(M, "You feel focused.") if(M.reagents.get_reagent_amount("antihol") < 10) + M.reagents.add_reagent("antihol" = 10) if(M.reagents.get_reagent_amount("oculine") < 10) M.reagents.add_reagent("oculine", 10) if(5) if(M.reagents.get_reagent_amount("mannitol") < 10) + M.reagents.add_reagent("mannitol" = 10) to_chat(M, "Your mind feels relaxed.") if(M.reagents.get_reagent_amount("antihol") < 10) + M.reagents.add_reagent("synaphydramine" = 5) if(M.reagents.get_reagent_amount("antihol") < 10) + M.reagents.add_reagent("antihol" = 10) if(M.reagents.get_reagent_amount("oculine") < 10) M.reagents.add_reagent("oculine", 10) return From cd7b38f21bf93032309900e5582f02ef66b7f82f Mon Sep 17 00:00:00 2001 From: lass9030 Date: Mon, 1 Oct 2018 18:48:02 +0200 Subject: [PATCH 3/6] Fixed some human errors --- code/datums/diseases/advance/symptoms/sensory.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 89056fdcf7f..243e2744563 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -40,7 +40,7 @@ Bonus if(M.reagents.get_reagent_amount("oculine") < 10) M.reagents.add_reagent("oculine", 10) if(4) - if(M.reagents.get_reagent_amount("antihol") < 10) + if(M.reagents.get_reagent_amount("synaphydramine") < 10) M.reagents.add_reagent("synaphydramine" = 5) to_chat(M, "You feel focused.") if(M.reagents.get_reagent_amount("antihol") < 10) @@ -51,7 +51,7 @@ Bonus if(M.reagents.get_reagent_amount("mannitol") < 10) M.reagents.add_reagent("mannitol" = 10) to_chat(M, "Your mind feels relaxed.") - if(M.reagents.get_reagent_amount("antihol") < 10) + if(M.reagents.get_reagent_amount("synaphydramine") < 10) M.reagents.add_reagent("synaphydramine" = 5) if(M.reagents.get_reagent_amount("antihol") < 10) M.reagents.add_reagent("antihol" = 10) From 38e405ce768f84c2129cbc04fb5a7ec97597512f Mon Sep 17 00:00:00 2001 From: lass9030 Date: Mon, 1 Oct 2018 22:35:39 +0200 Subject: [PATCH 4/6] Remade, now uses a proc, much help from Zix --- .../diseases/advance/symptoms/sensory.dm | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 243e2744563..0d1dd15b15c 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -24,39 +24,36 @@ Bonus level = 5 severity = 0 +/datum/symptom/sensory_restoration/proc/check_and_add(var/reagent, var/check, var/add, var/mob/living/M) + if(M.reagents.get_reagent_amount(reagent) < check) + M.reagents.add_reagent(reagent, check) + return 1 + /datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 3)) var/mob/living/M = A.affected_mob + switch(A.stage) if(2) - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + if(check_and_add("oculine", 10, 10, M)) to_chat(M, "Your hearing feels clearer and crisp.") if(3) - if(M.reagents.get_reagent_amount("antihol") < 10) - M.reagents.add_reagent("antihol" = 10) + if(check_and_add("antihol", 10, 10, M)) to_chat(M, "You feel sober.") - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + check_and_add("oculine", 10, 10, M) if(4) - if(M.reagents.get_reagent_amount("synaphydramine") < 10) - M.reagents.add_reagent("synaphydramine" = 5) + if(check_and_add("synaphydramine", 10, 5, M)) to_chat(M, "You feel focused.") - if(M.reagents.get_reagent_amount("antihol") < 10) - M.reagents.add_reagent("antihol" = 10) - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + check_and_add("antihol", 10, 10, M) + check_and_add("oculine", 10, 10, M) if(5) - if(M.reagents.get_reagent_amount("mannitol") < 10) - M.reagents.add_reagent("mannitol" = 10) + if(check_and_add("mannitol", 10, 10, M)) to_chat(M, "Your mind feels relaxed.") - if(M.reagents.get_reagent_amount("synaphydramine") < 10) - M.reagents.add_reagent("synaphydramine" = 5) - if(M.reagents.get_reagent_amount("antihol") < 10) - M.reagents.add_reagent("antihol" = 10) - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + check_and_add("synaphydramine", 10, 5, M) + check_and_add("antihol", 10, 10, M) + check_and_add("oculine", 10, 10, M) + return /* From ef89d913d261edda7a02fd242b340f76892b068f Mon Sep 17 00:00:00 2001 From: lass9030 Date: Tue, 2 Oct 2018 11:48:07 +0200 Subject: [PATCH 5/6] TDSSS's and variableundefined's comments adressed. --- code/datums/diseases/advance/symptoms/sensory.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 0d1dd15b15c..66dafbd5793 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -24,9 +24,9 @@ Bonus level = 5 severity = 0 -/datum/symptom/sensory_restoration/proc/check_and_add(var/reagent, var/check, var/add, var/mob/living/M) +/datum/symptom/sensory_restoration/proc/check_and_add(reagent, check, add, /mob/living/M) if(M.reagents.get_reagent_amount(reagent) < check) - M.reagents.add_reagent(reagent, check) + M.reagents.add_reagent(reagent, add) return 1 /datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A) From 1196685036713e62f099c8cb876d1f01ea921419 Mon Sep 17 00:00:00 2001 From: lass9030 Date: Tue, 2 Oct 2018 11:57:53 +0200 Subject: [PATCH 6/6] Removed a derp (/mob/living/M -> mob/living/M) --- code/datums/diseases/advance/symptoms/sensory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 66dafbd5793..e3e50ba468f 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -24,7 +24,7 @@ Bonus level = 5 severity = 0 -/datum/symptom/sensory_restoration/proc/check_and_add(reagent, check, add, /mob/living/M) +/datum/symptom/sensory_restoration/proc/check_and_add(reagent, check, add, mob/living/M) if(M.reagents.get_reagent_amount(reagent) < check) M.reagents.add_reagent(reagent, add) return 1