Now with Variable OM_ARMOR

BeeStation · Aug 5, 2023 · 61bccff · 61bccff
1 parent 2e5a7be
commit 61bccff
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 57 deletions.
diff --git a/nsv13/code/__DEFINES/overmap.dm b/nsv13/code/__DEFINES/overmap.dm
@@ -13,7 +13,9 @@
 #define FIRE_MODE_BROADSIDE 9
 #define FIRE_MODE_PHORON 10
 
+//Base Armor Values
 
+#define OM_ARMOR "melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 80, "bio" = 100, "rad" = 100, "acid" = 100, "stamina" = 100
 
 //Deprecated / legacy weapons.
 

diff --git a/nsv13/code/modules/overmap/types/miningships.dm b/nsv13/code/modules/overmap/types/miningships.dm
@@ -13,7 +13,6 @@
 	integrity_failure = 800
 	bound_height = 96
 	bound_width = 96
-	armor = list("overmap_light" = 90, "overmap_medium" = 40, "overmap_heavy" = 15)
 
 //Player varieties
 
@@ -38,7 +37,7 @@
 	name = "NSV FOB"
 	mass = MASS_SMALL //providing a real difference between nostromo and fob - this probably isn't a thing anymore
 	area_type = /area/nsv/shuttle
-	armor = list("overmap_light" = 90, "overmap_medium" = 20, "overmap_heavy" = 0)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 20, "overmap_heavy" = 0)
 	max_integrity = 400 //Max health
 	integrity_failure = 400
 	use_armour_quadrants = FALSE //They can weld plates for now, mining ship will not have a reasonable way to power the pumps -K

diff --git a/nsv13/code/modules/overmap/types/nanotrasen.dm b/nsv13/code/modules/overmap/types/nanotrasen.dm
@@ -30,7 +30,7 @@
 	obj_integrity = 300
 	max_integrity = 300
 	integrity_failure = 300
-	armor = list("overmap_light" = 30, "overmap_medium" = 20, "overmap_heavy" = 30)
+	armor = list(OM_ARMOR, "overmap_light" = 30, "overmap_medium" = 20, "overmap_heavy" = 30)
 
 
 /obj/structure/overmap/nanotrasen/patrol_cruiser
@@ -44,7 +44,7 @@
 	integrity_failure = 450
 	bound_height = 96
 	bound_width = 96
-	armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
 
 /obj/structure/overmap/nanotrasen/frigate //This has nothing to do with missiles
 	name = "caracal class frigate"
@@ -59,7 +59,7 @@
 	max_integrity = 500
 	integrity_failure = 500
 	//collision_positions = list(new /datum/vector2d(-13,71), new /datum/vector2d(-25,52), new /datum/vector2d(-24,-25), new /datum/vector2d(-11,-66), new /datum/vector2d(4,-69), new /datum/vector2d(15,-28), new /datum/vector2d(15,38), new /datum/vector2d(6,61))
-	armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
 
 /obj/structure/overmap/nanotrasen/heavy_cruiser
 	name = "corvid class tactical cruiser"
@@ -75,7 +75,7 @@
 	integrity_failure = 800
 	bound_height = 96
 	bound_width = 96
-	armor = list("overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 30)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 30)
 
 /obj/structure/overmap/nanotrasen/battleship
 	name = "jupiter class battlestar"
@@ -90,7 +90,7 @@
 	obj_integrity = 1000
 	max_integrity = 1000
 	integrity_failure = 1000
-	armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
 
 /obj/structure/overmap/nanotrasen/carrier
 	name = "enterprise class carrier"
@@ -105,7 +105,7 @@
 	obj_integrity = 700
 	max_integrity = 700
 	integrity_failure = 700
-	armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 10)
 
 /obj/structure/overmap/nanotrasen/battlecruiser
 	name = "corvid class tactical cruiser"
@@ -121,7 +121,7 @@
 	integrity_failure = 1000
 	bound_height = 96
 	bound_width = 96
-	armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
 
 //Instanced Versions
 
@@ -136,7 +136,7 @@
 	obj_integrity = 1200
 	max_integrity = 1200 //Max health
 	integrity_failure = 1200
-	armor = list("overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 10)
 	bound_height = 320
 	bound_width = 320
 	role = INSTANCED_MIDROUND_SHIP
@@ -162,7 +162,7 @@
 	obj_integrity = 1250
 	max_integrity = 1250
 	integrity_failure = 1250
-	armor = list("overmap_light" = 30, "overmap_medium" = 20, "overmap_heavy" = 30)
+	armor = list(OM_ARMOR, "overmap_light" = 30, "overmap_medium" = 20, "overmap_heavy" = 30)
 	plasma_caster = TRUE
 
 //Player Versions
@@ -174,7 +174,7 @@
 	max_integrity = 1400 //Max health
 	integrity_failure = 1400
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 
 /obj/structure/overmap/nanotrasen/frigate/starter/shrike //TEMP UNTIL WE DIVERSIFY TYPES MORE
@@ -191,7 +191,7 @@
 	max_integrity = 1000
 	integrity_failure = 1000
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 
 /obj/structure/overmap/nanotrasen/patrol_cruiser/starter //Currently assigned to the Snake
@@ -201,7 +201,7 @@
 	bound_width = 64
 	bound_height = 64
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 	broadside = TRUE
 
@@ -213,7 +213,7 @@
 	max_integrity = 1400
 	integrity_failure = 1400
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 20)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 	broadside = TRUE
 
@@ -229,7 +229,7 @@
 	max_integrity = 2000
 	integrity_failure = 2000
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 65, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 65, "overmap_heavy" = 20)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 
 /obj/structure/overmap/nanotrasen/battlecruiser/starter //Currently assigned to Tycoon and Gladius
@@ -238,7 +238,7 @@
 	max_integrity = 1400
 	integrity_failure = 1400
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 20)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 
 /obj/structure/overmap/nanotrasen/battleship/starter //Galactica
@@ -247,7 +247,7 @@
 	max_integrity = 2150
 	integrity_failure = 2150
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 25)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 25)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 
 /obj/structure/overmap/nanotrasen/serendipity/starter
@@ -256,7 +256,7 @@
 	max_integrity = 1200
 	integrity_failure = 1200
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
 	overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
 
 /obj/structure/overmap/nanotrasen/serendipity/starter/apply_weapons()
@@ -287,7 +287,7 @@
 	obj_integrity = 450
 	max_integrity = 450 //Max health
 	integrity_failure = 450
-	armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
 	ai_flags  = AI_FLAG_BATTLESHIP | AI_FLAG_DESTROYER
 	combat_dice_type = /datum/combat_dice/destroyer
 
@@ -297,15 +297,15 @@
 	obj_integrity = 800
 	max_integrity = 800 //Max health
 	integrity_failure = 800
-	armor = list("overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 30)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 30)
 	ai_flags = AI_FLAG_BATTLESHIP
 	combat_dice_type = /datum/combat_dice/cruiser
 
 /obj/structure/overmap/nanotrasen/battleship/ai
 	obj_integrity = 1000
 	max_integrity = 1000
 	integrity_failure = 1000
-	armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
 	ai_controlled = TRUE
 	ai_flags = AI_FLAG_BATTLESHIP
 	combat_dice_type = /datum/combat_dice/battleship
@@ -318,7 +318,7 @@
 	obj_integrity = 500
 	max_integrity = 500
 	integrity_failure = 500
-	armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
 	combat_dice_type = /datum/combat_dice/cruiser
 
 /obj/structure/overmap/nanotrasen/battlecruiser/ai
@@ -327,7 +327,7 @@
 	obj_integrity = 450
 	max_integrity = 450
 	integrity_failure = 450
-	armor = list("overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 30)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 30)
 	combat_dice_type = /datum/combat_dice/cruiser
 
 /obj/structure/overmap/nanotrasen/carrier/ai
@@ -340,7 +340,7 @@
 	obj_integrity = 700
 	max_integrity = 700
 	integrity_failure = 700
-	armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 10)
 	combat_dice_type = /datum/combat_dice/carrier
 
 /obj/structure/overmap/nanotrasen/carrier/ai/apply_weapons()
@@ -364,7 +364,7 @@
 	ai_behaviour = AI_AGGRESSIVE
 	weapon_safety = FALSE
 	faction = "nanotrasen"
-	armor = list("overmap_light" = 5, "overmap_medium" = 0, "overmap_heavy" = 90)
+	armor = list(OM_ARMOR, "overmap_light" = 5, "overmap_medium" = 0, "overmap_heavy" = 90)
 	obj_integrity = 75
 	max_integrity = 75 //Super squishy!
 	integrity_failure = 75

diff --git a/nsv13/code/modules/overmap/types/solgov.dm b/nsv13/code/modules/overmap/types/solgov.dm
@@ -15,7 +15,7 @@
 	obj_integrity = 500
 	max_integrity = 500
 	integrity_failure = 500
-	armor = list("overmap_light" = 90, "overmap_medium" = 50, "overmap_heavy" = 25)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 50, "overmap_heavy" = 25)
 
 /obj/structure/overmap/nanotrasen/solgov/carrier
 	name = "rio-grande class support cruiser"
@@ -29,7 +29,7 @@
 	obj_integrity = 1000
 	max_integrity = 1000
 	integrity_failure = 1000
-	armor = list("overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 20)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 20)
 
 /obj/structure/overmap/nanotrasen/solgov/aetherwhisp
 	name = "Aetherwhisp class light cruiser"
@@ -44,7 +44,7 @@
 	obj_integrity = 750
 	max_integrity = 750
 	integrity_failure = 750
-	armor = list("overmap_light" = 90, "overmap_medium" = 50, "overmap_heavy" = 25)
+	armor = list(OM_ARMOR, "overmap_light" = 90, "overmap_medium" = 50, "overmap_heavy" = 25)
 
 //Player Versions
 
@@ -54,7 +54,7 @@
 	max_integrity = 750 //She's fragile and relies heavily on shields.
 	integrity_failure = 750
 	starting_system = "Staging" //Required for all player ships
-	armor = list("overmap_light" = 99, "overmap_medium" = 50, "overmap_heavy" = 25)
+	armor = list(OM_ARMOR, "overmap_light" = 99, "overmap_medium" = 50, "overmap_heavy" = 25)
 
 //AI Versions
 
@@ -113,7 +113,7 @@
 	bound_height = 32
 	missiles = 0
 	torpedoes = 0
-	armor = list("overmap_light" = 5, "overmap_medium" = 5,  "overmap_heavy" = 90)
+	armor = list(OM_ARMOR, "overmap_light" = 5, "overmap_medium" = 5,  "overmap_heavy" = 90)
 	ai_flags = AI_FLAG_SWARMER | AI_FLAG_ELITE
 	combat_dice_type = /datum/combat_dice/fighter
 

diff --git a/nsv13/code/modules/overmap/types/spacepirates.dm b/nsv13/code/modules/overmap/types/spacepirates.dm
@@ -13,7 +13,7 @@
 	max_integrity = 1200
 	integrity_failure = 1200
 	starting_system = "Staging"
-	armor = list("overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
 	bound_height = 32
 	bound_width = 32
 	role = INSTANCED_MIDROUND_SHIP
@@ -110,7 +110,7 @@
 	obj_integrity = 525
 	max_integrity = 525
 	integrity_failure = 525
-	armor = list("overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
 	ai_flags = AI_FLAG_DESTROYER
 	torpedoes = 30
 	missiles = 30
@@ -132,7 +132,7 @@
 	max_integrity = 350
 	integrity_failure = 350
 	shots_left = 20
-	armor = list("overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
+	armor = list(OM_ARMOR, "overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
 	ai_flags = AI_FLAG_BATTLESHIP | AI_FLAG_ELITE //Needs to be shooting all its guns
 	combat_dice_type = /datum/combat_dice/destroyer
 
@@ -162,7 +162,7 @@
 	integrity_failure = 5000
 	shots_left = 35
 	torpedoes = 35
-	armor = list("overmap_light" = 95, "overmap_medium" = 80, "overmap_heavy" = 45)
+	armor = list(OM_ARMOR, "overmap_light" = 95, "overmap_medium" = 80, "overmap_heavy" = 45)
 	can_resupply = TRUE
 	ai_flags = AI_FLAG_SUPPLY | AI_FLAG_ELITE
 	combat_dice_type = /datum/combat_dice/flagship