From 217c7a655f61c00080fa4ebe4cc8aedc19488638 Mon Sep 17 00:00:00 2001
From: Screemonster <michael.s.edwards@gmail.com>
Date: Sat, 24 Mar 2018 15:03:48 +0000
Subject: [PATCH] Balance pass on custom species traits

---
 .../species/station/traits_vr/negative.dm     | 12 +++---
 .../species/station/traits_vr/positive.dm     | 42 ++++---------------
 2 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
index f8fdcc79cb..4f5b839f5d 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
@@ -1,13 +1,13 @@
 /datum/trait/speed_slow
 	name = "Slowdown"
 	desc = "Allows you to move slower on average than baseline."
-	cost = -3
+	cost = -2
 	var_changes = list("slowdown" = 0.5)
 
 /datum/trait/speed_slow_plus
 	name = "Major Slowdown"
 	desc = "Allows you to move MUCH slower on average than baseline."
-	cost = -5
+	cost = -3
 	var_changes = list("slowdown" = 1.0)
 
 /datum/trait/weakling
@@ -81,13 +81,13 @@
 /datum/trait/conductive
 	name = "Conductive"
 	desc = "Increases your susceptibility to electric shocks by 50%"
-	cost = -2
+	cost = -1
 	var_changes = list("siemens_coefficient" = 1.5) //This makes you a lot weaker to tasers.
 
 /datum/trait/conductive_plus
 	name = "Major Conductive"
 	desc = "Increases your susceptibility to electric shocks by 100%"
-	cost = -3
+	cost = -2
 	var_changes = list("siemens_coefficient" = 2.0) //This makes you extremely weak to tasers.
 
 /datum/trait/photosensitive
@@ -116,7 +116,7 @@
 /datum/trait/colorblind
 	name = "Colorblindness (Monochromancy)"
 	desc = "You simply can't see colors at all, period. You are 100% colorblind."
-	cost = -3
+	cost = -1
 
 /datum/trait/colorblind/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..(S,H)
@@ -127,7 +127,7 @@
 /datum/trait/colorblind/para_vulp
 	name = "Colorblindness (Para Vulp)"
 	desc = "You have a severe issue with green colors and have difficulty recognizing them from red colors."
-	cost = -2
+	cost = -1
 
 /datum/trait/colorblind/para_vulp/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..(S,H)
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index 3d29aad827..900ca7b867 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -1,15 +1,9 @@
 /datum/trait/speed_fast
 	name = "Haste"
 	desc = "Allows you to move faster on average than baseline."
-	cost = 3
+	cost = 4
 	var_changes = list("slowdown" = -0.5)
 
-/datum/trait/speed_fast_plus
-	name = "Major Haste"
-	desc = "Allows you to move MUCH faster on average than baseline."
-	cost = 5
-	var_changes = list("slowdown" = -1.0)
-
 /datum/trait/hardy
 	name = "Hardy"
 	desc = "Allows you to carry heavy equipment with less slowdown."
@@ -25,23 +19,13 @@
 /datum/trait/endurance_high
 	name = "High Endurance"
 	desc = "Increases your maximum total hitpoints to 125"
-	cost = 2
+	cost = 4
 	var_changes = list("total_health" = 125)
 
 	apply(var/datum/species/S,var/mob/living/carbon/human/H)
 		..(S,H)
 		H.setMaxHealth(S.total_health)
 
-/datum/trait/endurance_very_high
-	name = "Very High Endurance"
-	desc = "Increases your maximum total hitpoints to 150"
-	cost = 3
-	var_changes = list("total_health" = 150)
-
-	apply(var/datum/species/S,var/mob/living/carbon/human/H)
-		..(S,H)
-		H.setMaxHealth(S.total_health)
-
 /datum/trait/nonconductive
 	name = "Non-Conductive"
 	desc = "Decreases your susceptibility to electric shocks by a 25% amount."
@@ -81,38 +65,28 @@
 /datum/trait/minor_brute_resist
 	name = "Minor Brute Resist"
 	desc = "Adds 15% resistance to brute damage sources."
-	cost = 1
+	cost = 2
 	var_changes = list("brute_mod" = 0.85)
 
 /datum/trait/brute_resist
 	name = "Brute Resist"
 	desc = "Adds 25% resistance to brute damage sources."
-	cost = 2
-	var_changes = list("brute_mod" = 0.75)
-
-/datum/trait/brute_resist_plus
-	name = "Major Brute Resist"
-	desc = "Adds 50% resistance to brute damage sources."
 	cost = 3
-	var_changes = list("brute_mod" = 0.5)
+	var_changes = list("brute_mod" = 0.75)
+	excludes = list(/datum/trait/minor_burn_resist,/datum/trait/burn_resist)
 
 /datum/trait/minor_burn_resist
 	name = "Minor Burn Resist"
 	desc = "Adds 15% resistance to burn damage sources."
-	cost = 1
+	cost = 2
 	var_changes = list("burn_mod" = 0.85)
 
 /datum/trait/burn_resist
 	name = "Burn Resist"
 	desc = "Adds 25% resistance to burn damage sources."
-	cost = 2
-	var_changes = list("burn_mod" = 0.75)
-
-/datum/trait/burn_resist_plus
-	name = "Major Burn Resist"
-	desc = "Adds 50% resistance to burn damage sources."
 	cost = 3
-	var_changes = list("burn_mod" = 0.5)
+	var_changes = list("burn_mod" = 0.75)
+	excludes = list(/datum/trait/minor_brute_resist,/datum/trait/brute_resist)
 
 /datum/trait/photoresistant
 	name = "Photoresistant"