Xeno walance (#99)

* walance_1 * Sunder multiplier (#15144) Co-authored-by: TiviPlus <[email protected]> * sunder_multiplier * idiot --------- Co-authored-by: Barnet <[email protected]> Co-authored-by: TiviPlus <[email protected]>
PMC-Unga-Marines · Aug 22, 2024 · 2a61268 · 2a61268
1 parent 7979b15
commit 2a61268
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 18 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm b/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm
@@ -21,6 +21,9 @@
 	// *** Health *** //
 	max_health = 325
 
+	// *** Sunder *** //
+	sunder_multiplier = 0.8
+
 	// *** Evolution *** //
 	evolution_threshold = 225
 

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/crusher/castedatum_crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/crusher/castedatum_crusher.dm
@@ -16,9 +16,6 @@
 	// *** Speed *** //
 	speed = -0.1
 
-	// *** Sunder *** //
-	sunder_recover = 2
-
 	// *** Plasma *** //
 	plasma_max = 400
 	plasma_gain = 30
@@ -34,7 +31,10 @@
 	caste_traits = list(TRAIT_STOPS_TANK_COLLISION)
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 90, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 130, BIO = 100, FIRE = 40, ACID = 100)
+	soft_armor = list(MELEE = 90, BULLET = 80, LASER = 80, ENERGY = 75, BOMB = 130, BIO = 100, FIRE = 40, ACID = 100)
+
+	// *** Sunder *** //
+	sunder_multiplier = 0.5
 
 	// *** Minimap Icon *** //
 	minimap_icon = "crusher"

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm
@@ -38,7 +38,7 @@
 	caste_traits = null
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 20, BIO = 30, FIRE = 40, ACID = 30)
+	soft_armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 20, BIO = 30, FIRE = 40, ACID = 30)
 
 	// *** Minimap Icon *** //
 	minimap_icon = "defender"

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm
@@ -23,6 +23,9 @@
 	// *** Health *** //
 	max_health = 400
 
+	// *** Sunder *** //
+	sunder_multiplier = 0.8
+
 	// *** Evolution *** //
 	deevolves_to = /mob/living/carbon/xenomorph/carrier
 
@@ -33,7 +36,7 @@
 	caste_traits = list(TRAIT_CAN_VENTCRAWL)
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 55, BULLET = 55, LASER = 55, ENERGY = 55, BOMB = 30, BIO = 40, FIRE = 50, ACID = 40)
+	soft_armor = list(MELEE = 55, BULLET = 60, LASER = 60, ENERGY = 55, BOMB = 30, BIO = 40, FIRE = 50, ACID = 40)
 	// *** Minimap Icon *** //
 	minimap_icon = "defiler"
 

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm
@@ -45,7 +45,7 @@
 	caste_traits = list(TRAIT_CAN_VENTCRAWL)
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, BIO = 15, FIRE = 30, ACID = 15)
+	soft_armor = list(MELEE = 30, BULLET = 25, LASER = 25, ENERGY = 30, BOMB = 0, BIO = 15, FIRE = 30, ACID = 15)
 
 	// *** Pheromones *** //
 	aura_strength = 2 //Drone's aura is the weakest.

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/castedatum_king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/castedatum_king.dm
@@ -21,7 +21,9 @@
 
 	// *** Health *** //
 	max_health = 650
-	sunder_recover = 2
+
+	// *** Sunder *** //
+	sunder_multiplier = 0.7
 
 	// *** Evolution *** //
 	maximum_active_caste = 1
@@ -34,7 +36,7 @@
 	caste_traits = null
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 65, BULLET = 65, LASER = 65, ENERGY = 65, BOMB = 100, BIO = 60, FIRE = 100, ACID = 60)
+	soft_armor = list(MELEE = 65, BULLET = 70, LASER = 70, ENERGY = 65, BOMB = 100, BIO = 60, FIRE = 100, ACID = 60)
 
 	// *** Pheromones *** //
 	aura_strength = 6

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/panther/castedatum_panther.dm b/code/modules/mob/living/carbon/xenomorph/castes/panther/castedatum_panther.dm
@@ -39,7 +39,7 @@
 	caste_traits = list(TRAIT_CAN_VENTCRAWL)
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 20, BULLET = 19, LASER = 19, ENERGY = 19, BOMB = 0, BIO = 7, FIRE = 19, ACID = 7)
+	soft_armor = list(MELEE = 20, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 0, BIO = 7, FIRE = 15, ACID = 5)
 
 	// *** Minimap Icon *** //
 	minimap_icon = "panther"

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/queen/castedatum_queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/queen/castedatum_queen.dm
@@ -23,7 +23,8 @@
 	// *** Health *** //
 	max_health = 600
 
-	sunder_recover = 1.5
+	// *** Sunder *** //
+	sunder_multiplier = 0.7
 
 	// *** Evolution *** //
 	evolve_min_xenos = 8
@@ -37,7 +38,7 @@
 	caste_traits = null
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 65, BULLET = 65, LASER = 65, ENERGY = 65, BOMB = 80, BIO = 60, FIRE = 60, ACID = 60)
+	soft_armor = list(MELEE = 65, BULLET = 70, LASER = 70, ENERGY = 65, BOMB = 80, BIO = 60, FIRE = 60, ACID = 60)
 
 	// *** Ranged Attack *** //
 	spit_delay = 1.1 SECONDS

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm
@@ -41,7 +41,7 @@
 	caste_traits = list(TRAIT_CAN_VENTCRAWL)
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 5, FIRE = 19, ACID = 5)
+	soft_armor = list(MELEE = 20, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 0, BIO = 5, FIRE = 15, ACID = 5)
 
 	// *** Minimap Icon *** //
 	minimap_icon = "runner"

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/sentinel/castedatum_sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/sentinel/castedatum_sentinel.dm
@@ -36,7 +36,7 @@
 	caste_traits = list(TRAIT_CAN_VENTCRAWL)
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 0, BIO = 25, FIRE = 26, ACID = 25)
+	soft_armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 25, BOMB = 0, BIO = 25, FIRE = 25, ACID = 25)
 
 	// *** Ranged Attack *** //
 	spit_delay = 1.0 SECONDS

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm b/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm
@@ -36,7 +36,7 @@
 	caste_traits = null
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 45, BULLET = 45, LASER = 45, ENERGY = 45, BOMB = 20, BIO = 25, FIRE = 45, ACID = 20)
+	soft_armor = list(MELEE = 45, BULLET = 50, LASER = 50, ENERGY = 45, BOMB = 20, BIO = 25, FIRE = 45, ACID = 20)
 
 	// *** Pheromones *** //
 	aura_strength = 4.5 //The Shrike's aura is decent.

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm
@@ -21,6 +21,9 @@
 	// *** Health *** //
 	max_health = 350
 
+	// *** Sunder *** //
+	sunder_multiplier = 0.8
+
 	// *** Evolution *** //
 	evolution_threshold = 225
 
@@ -33,7 +36,7 @@
 	caste_traits = null
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 40, BULLET = 55, LASER = 55, ENERGY = 40, BOMB = 20, BIO = 50, FIRE = 55, ACID = 50)
+	soft_armor = list(MELEE = 40, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 20, BIO = 50, FIRE = 55, ACID = 50)
 
 	// *** Minimap Icon *** //
 	minimap_icon = "warrior"

diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm
@@ -1,5 +1,5 @@
 #define DEBUG_XENO_LIFE 0
-#define XENO_RESTING_HEAL 1.1
+#define XENO_RESTING_HEAL 1
 #define XENO_STANDING_HEAL 0.2
 #define XENO_CRIT_DAMAGE 5
 

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -89,6 +89,8 @@
 	var/sunder_recover = 0.5
 	///What is the max amount of sunder that can be applied to a xeno (100 = 100%)
 	var/sunder_max = 100
+	///Multiplier on the weapons sunder, e.g 10 sunder on a projectile is reduced to 5 with a 0.5 multiplier.
+	var/sunder_multiplier = 1
 
 	// *** Ranged Attack *** //
 	///Delay timer for spitting

diff --git a/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm b/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm
@@ -496,7 +496,8 @@
 	. = ..()
 	if(.)
 		return
-	sunder = clamp(sunder + adjustment, 0, xeno_caste.sunder_max)
+	sunder = clamp(sunder + (adjustment > 0 ? adjustment * xeno_caste.sunder_multiplier : adjustment), 0, xeno_caste.sunder_max)
+//Applying sunder is an adjustment value above 0, healing sunder is an adjustment value below 0. Use multiplier when taking sunder, not when healing.
 
 /mob/living/carbon/xenomorph/set_sunder(new_sunder)
 	. = ..()