AP base and PDM base tweaks (#5163)

* AP base and PDM base tweaks * Update _upgrades.dm * Update _upgrades.dm
sojourn-13 · Apr 12, 2024 · e504584 · e504584
1 parent b8474e8
commit e504584
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/code/game/objects/items/weapons/tools/mods/_defines.dm b/code/game/objects/items/weapons/tools/mods/_defines.dm
@@ -46,7 +46,11 @@
 
 //Int multiplier
 #define GUN_UPGRADE_DAMAGE_MULT "damage_mult"
+#define GUN_UPGRADE_DAMAGE_BASE "damage_base"
+
 #define GUN_UPGRADE_PEN_MULT "penetration_mult"
+#define GUN_UPGRADE_PEN_BASE "penetration_base"
+
 #define GUN_UPGRADE_PIERC_MULT "pierce_mult"
 #define GUN_UPGRADE_FIRE_DELAY_MULT "fire_delay_mult"
 #define GUN_UPGRADE_MOVE_DELAY_MULT "move_delay_mult"

diff --git a/code/game/objects/items/weapons/tools/mods/_upgrades.dm b/code/game/objects/items/weapons/tools/mods/_upgrades.dm
@@ -398,10 +398,14 @@
 		G.allow_greyson_mods = weapon_upgrades[GUN_UPGRADE_ALLOW_GREYON_MODS]
 	if(weapon_upgrades[GUN_UPGRADE_DAMAGE_MULT])
 		G.damage_multiplier *= weapon_upgrades[GUN_UPGRADE_DAMAGE_MULT]
+	if(weapon_upgrades[GUN_UPGRADE_DAMAGE_BASE])
+		G.damage_multiplier += weapon_upgrades[GUN_UPGRADE_DAMAGE_BASE]
 	if(weapon_upgrades[GUN_UPGRADE_PAIN_MULT])
 		G.proj_agony_multiplier += weapon_upgrades[GUN_UPGRADE_PAIN_MULT]
 	if(weapon_upgrades[GUN_UPGRADE_PEN_MULT])
 		G.penetration_multiplier *= weapon_upgrades[GUN_UPGRADE_PEN_MULT]
+	if(weapon_upgrades[GUN_UPGRADE_PEN_BASE])
+		G.penetration_multiplier += weapon_upgrades[GUN_UPGRADE_PEN_BASE]
 	if(weapon_upgrades[GUN_UPGRADE_PIERC_MULT])
 		G.pierce_multiplier += weapon_upgrades[GUN_UPGRADE_PIERC_MULT]
 	if(weapon_upgrades[GUN_UPGRADE_STEPDELAY_MULT])
@@ -588,6 +592,10 @@
 			else
 				to_chat(user, SPAN_WARNING("Decreases projectile damage by [abs(amount*100)]%"))
 
+		if(weapon_upgrades[GUN_UPGRADE_DAMAGE_BASE])
+			to_chat(user, SPAN_NOTICE("Increases projectile damage multiplier by [weapon_upgrades[GUN_UPGRADE_DAMAGE_BASE]]"))
+
+
 		if(weapon_upgrades[GUN_UPGRADE_PAIN_MULT])
 			var/amount = weapon_upgrades[GUN_UPGRADE_PAIN_MULT]-1
 			if(amount > 0)
@@ -602,6 +610,10 @@
 			else
 				to_chat(user, SPAN_WARNING("Decreases projectile penetration by [abs(amount*100)]%"))
 
+		if(weapon_upgrades[GUN_UPGRADE_PEN_BASE])
+			to_chat(user, SPAN_NOTICE("Increases projectile penetration multiplier by [weapon_upgrades[GUN_UPGRADE_PEN_BASE]]"))
+
+
 		if(weapon_upgrades[GUN_UPGRADE_PIERC_MULT])
 			var/amount = weapon_upgrades[GUN_UPGRADE_PIERC_MULT]
 			if(amount > 1)

diff --git a/code/game/objects/items/weapons/tools/mods/mod_types.dm b/code/game/objects/items/weapons/tools/mods/mod_types.dm
@@ -290,7 +290,7 @@
 	)
 	I.weapon_upgrades = list(
 		GUN_UPGRADE_RECOIL = 1.5,
-		GUN_UPGRADE_PEN_MULT = 1.2,
+		GUN_UPGRADE_PEN_BASE = 0.2,
 		GUN_UPGRADE_FIRE_DELAY_MULT = 0.8,
 		GUN_UPGRADE_MOVE_DELAY_MULT = 0.8,
 		GUN_UPGRADE_MUZZLEFLASH = 1.5,
@@ -341,8 +341,8 @@
 	UPGRADE_FUELCOST_MULT = 1.25
 	)
 	I.weapon_upgrades = list(
-	GUN_UPGRADE_PEN_MULT = 1.25,
-	GUN_UPGRADE_CHARGECOST = 1.35
+	GUN_UPGRADE_PEN_BASE = 0.3,
+	GUN_UPGRADE_CHARGECOST = 1.2
 	)
 	I.prefix = "boosted"
 	I.req_fuel_cell = REQ_FUEL_OR_CELL
@@ -506,7 +506,7 @@
 		UPGRADE_DEGRADATION_MULT = 1.15,
 		UPGRADE_BULK = 1)
 	I.weapon_upgrades = list(
-		GUN_UPGRADE_DAMAGE_MULT = 1.1, // Think of the guild's heavy barrel as a direct upgrade of this, as it's part of its recipe.
+		GUN_UPGRADE_DAMAGE_BASE = 0.2, // Think of the guild's heavy barrel as a direct upgrade of this, as it's part of its recipe.
 		GUN_UPGRADE_FIRE_DELAY_MULT = 1.2,
 		GUN_UPGRADE_STEPDELAY_MULT = 1.1,
 		GUN_UPGRADE_RECOIL = 1.2,
@@ -564,7 +564,7 @@
 	I.weapon_upgrades = list(
 		GUN_UPGRADE_RECOIL = 0.5,
 		UPGRADE_BULK = 0.5,
-		GUN_UPGRADE_PEN_MULT = 0.7
+		GUN_UPGRADE_PEN_BASE = -0.1
 	)
 	I.gun_loc_tag = GUN_GRIP
 	I.required_qualities = list(QUALITY_CUTTING, QUALITY_WIRE_CUTTING, QUALITY_SCREW_DRIVING, QUALITY_WELDING ,QUALITY_PULSING, QUALITY_CLAMPING, QUALITY_CAUTERIZING, QUALITY_BONE_SETTING, QUALITY_LASER_CUTTING, QUALITY_BONE_GRAFTING)
@@ -878,8 +878,8 @@
 	I.weapon_upgrades = list(
 	GUN_UPGRADE_ALLOW_GREYON_MODS = TRUE,
 	GUN_UPGRADE_RECOIL = 0.8,
-	GUN_UPGRADE_DAMAGE_MULT = 1.1,
-	GUN_UPGRADE_PEN_MULT = 1.2,
+	GUN_UPGRADE_DAMAGE_BASE = 0.2,
+	GUN_UPGRADE_PEN_MULT = 1.1,
 	GUN_UPGRADE_FIRE_DELAY_MULT = 0.8,
 	GUN_UPGRADE_MOVE_DELAY_MULT = 0.8,
 	GUN_UPGRADE_MUZZLEFLASH = 0.8,

diff --git a/code/modules/projectiles/guns/mods/mods.dm b/code/modules/projectiles/guns/mods/mods.dm
@@ -474,7 +474,7 @@
 	I.weapon_upgrades = list(
 	GUN_UPGRADE_RECOIL = 2,
 	GUN_UPGRADE_FIRE_DELAY_MULT = 1.5,
-	GUN_UPGRADE_DAMAGE_MULT = 2,
+	GUN_UPGRADE_DAMAGE_BASE = 1,
 	GUN_UPGRADE_CHARGECOST = 2)
 	I.req_fuel_cell = REQ_CELL
 	I.gun_loc_tag = GUN_MECHANISM
@@ -492,7 +492,7 @@
 	..()
 	var/datum/component/item_upgrade/I = AddComponent(/datum/component/item_upgrade)
 	I.weapon_upgrades = list(
-	GUN_UPGRADE_DAMAGE_MULT = 0.90,
+	GUN_UPGRADE_DAMAGE_MULT = 0.9,
 	GUN_UPGRADE_FIRE_DELAY_MULT = 0.25)
 	I.req_fuel_cell = REQ_CELL
 	I.gun_loc_tag = GUN_MECHANISM
@@ -646,7 +646,7 @@
 	var/datum/component/item_upgrade/I = AddComponent(/datum/component/item_upgrade)
 	I.weapon_upgrades = list(
 		GUN_UPGRADE_DAMAGE_BRUTE = 5,
-		GUN_UPGRADE_PEN_MULT = 1.2,
+		GUN_UPGRADE_PEN_BASE = 0.2,
 		GUN_UPGRADE_PIERC_MULT = 1,
 		GUN_UPGRADE_FIRE_DELAY_MULT = 1.2,
 		GUN_UPGRADE_RECOIL = 1.2,