cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[READY] Walks back combat refactor, plus ammo balance changes (#8728)

Browse Source
This commit is contained in:
tacoguy7765093
2024-08-13 17:11:04 -05:00
committed by GitHub
parent 48ecf49f55
commit 99830636d9
53 changed files with 311 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modular_chomp/code/modules/projectiles/ammo_refactor/ammo_magazine_override.dm
View File

@@ -113,8 +113,8 @@ var/global/list/magazine_overrides = list(
/obj/item/ammo_magazine/ammo_box/b10mm = /obj/item/ammo_magazine/ammo_box/small,
/obj/item/ammo_magazine/ammo_box/b44 = /obj/item/ammo_magazine/ammo_box/small,
/obj/item/ammo_magazine/ammo_box/b45 = /obj/item/ammo_magazine/ammo_box/small,
/obj/item/ammo_magazine/ammo_box/b145 = /obj/item/ammo_magazine/ammo_box/large,
/obj/item/ammo_magazine/ammo_box/b145/highvel = /obj/item/ammo_magazine/ammo_box/large/ap,
///obj/item/ammo_magazine/ammo_box/b145 = /obj/item/ammo_magazine/ammo_box/large, Seperation of 14.5
///obj/item/ammo_magazine/ammo_box/b145/highvel = /obj/item/ammo_magazine/ammo_box/large/ap,
/obj/item/ammo_magazine/ammo_box/b762 = /obj/item/ammo_magazine/ammo_box/medium,
/obj/item/ammo_magazine/ammo_box/b545 = /obj/item/ammo_magazine/ammo_box/medium,
/obj/item/ammo_magazine/ammo_box/b545/large = /obj/item/ammo_magazine/ammo_box/medium/large,

18
modular_chomp/code/modules/projectiles/ammo_refactor/ammo_magazines.dm
View File

@@ -82,7 +82,7 @@
max_ammo = 30
mag_type = MAGAZINE
caliber = "small"
matter = list(DEFAULT_WALL_MATERIAL = 800)
matter = list(MAT_STEEL = 800)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/simple/small
@@ -122,7 +122,7 @@
max_ammo = 50
mag_type = MAGAZINE
multiple_sprites = 1
matter = list(DEFAULT_WALL_MATERIAL = 1500)
matter = list(MAT_STEEL = 1500)
ammo_type = /obj/item/ammo_casing/simple/small
/obj/item/ammo_magazine/smg_drum/empty
@@ -156,7 +156,7 @@
max_ammo = 30
mag_type = MAGAZINE
caliber = "medium"
matter = list(DEFAULT_WALL_MATERIAL = 1400)
matter = list(MAT_STEEL = 1400)
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/simple/medium
@@ -192,7 +192,7 @@
max_ammo = 20
mag_type = MAGAZINE
multiple_sprites = 1
matter = list(DEFAULT_WALL_MATERIAL = 1800)
matter = list(MAT_STEEL = 1800)
ammo_type = /obj/item/ammo_casing/simple/medium
/obj/item/ammo_magazine/medium_small/empty
@@ -227,7 +227,7 @@
max_ammo = 50
mag_type = MAGAZINE
multiple_sprites = 1
matter = list(DEFAULT_WALL_MATERIAL = 2500)
matter = list(MAT_STEEL = 2500)
ammo_type = /obj/item/ammo_casing/simple/medium
/obj/item/ammo_magazine/medium_drum/empty
@@ -258,7 +258,7 @@
caliber = "medium"
mag_type = MAGAZINE | SPEEDLOADER //Act as both, because the garand will use you like a magazine bb
multiple_sprites = 1
matter = list(DEFAULT_WALL_MATERIAL = 400)
matter = list(MAT_STEEL = 400)
ammo_type = /obj/item/ammo_casing/simple/medium
/obj/item/ammo_magazine/clip/medium/empty
@@ -294,7 +294,7 @@
max_ammo = 100
mag_type = MAGAZINE
multiple_sprites = 1
matter = list(DEFAULT_WALL_MATERIAL = 8000)
matter = list(MAT_STEEL = 8000)
ammo_type = /obj/item/ammo_casing/simple/medium
/obj/item/ammo_magazine/medium_box/empty
@@ -326,7 +326,7 @@
max_ammo = 7
mag_type = MAGAZINE
multiple_sprites = 1
matter = list(DEFAULT_WALL_MATERIAL = 2400)
matter = list(MAT_STEEL = 2400)
ammo_type = /obj/item/ammo_casing/simple/large
/obj/item/ammo_magazine/large/empty
@@ -354,7 +354,7 @@
max_ammo = 100
mag_type = MAGAZINE
multiple_sprites = 1
matter = list(DEFAULT_WALL_MATERIAL = 20000)
matter = list(MAT_STEEL = 20000)
ammo_type = /obj/item/ammo_casing/simple/large
/obj/item/ammo_magazine/large_box/empty

2
modular_chomp/code/modules/projectiles/ammo_refactor/ammo_override_generator.dm
View File

@@ -82,7 +82,7 @@ Leave this unticked by default. This was used to generate ammo_overrides.dm
var/list/small_calibers = list(".380", "7.62x25mm", "9x18mm", ".45 LC", "9mm", ".45", "10mm", ".357", ".38", ".44")
var/list/medium_calibers = list("5mm caseless", "7.62x54mmR", "7.92x33mm", "9.5x40mm", "7.62x39mm", "5.56x45mm", "7.62mm", "5.45mm", "9x39mm", "mauser", ".48")
var/list/large_calibers = list(".338", ".50 BMG", "12.7x108mm", "14.5mm")
var/list/large_calibers = list(".338", ".50 BMG", "12.7x108mm") //14.5 doesnt get overridden, its their own superheavy ammo
var/list/override_calibers = small_calibers + medium_calibers + large_calibers
var/output_small = ""
var/output_medium = ""

34
modular_chomp/code/modules/projectiles/ammo_refactor/ammo_overrides.dm
View File

@@ -24,7 +24,7 @@ Small Weapons
/obj/item/weapon/gun/projectile/revolver
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/lemat
caliber = "small"
@@ -34,7 +34,7 @@ Small Weapons
/obj/item/weapon/gun/projectile/revolver/stainless
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/detective
caliber = "small"
@@ -49,17 +49,17 @@ Small Weapons
/obj/item/weapon/gun/projectile/revolver/lombardi
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/lombardi/panther
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/lombardi/gold
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/cappeacekeeper
caliber = "small"
@@ -69,7 +69,7 @@ Small Weapons
/obj/item/weapon/gun/projectile/revolver/mateba
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/deckard
caliber = "small"
@@ -94,22 +94,22 @@ Small Weapons
/obj/item/weapon/gun/projectile/revolver/nova
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/cerberus
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/nagant
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/nagant/skinned
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/revolver/saa
caliber = "small"
@@ -261,12 +261,12 @@ Small Weapons
/obj/item/weapon/gun/projectile/contender
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/contender/tacticool
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/colt
caliber = "small"
@@ -325,7 +325,7 @@ Small Weapons
/obj/item/weapon/gun/projectile/derringer
caliber = "small"
ammo_type = /obj/item/ammo_casing/simple/small
projectile_type = /obj/item/projectile/bullet/a357
projectile_type = /obj/item/projectile/bullet/pistol/strong
/obj/item/weapon/gun/projectile/luger
caliber = "small"
@@ -804,9 +804,9 @@ Large Weapons
*/
/* These are superheavy weapons, and the overrides dont even work on them anyway, 14.5 ammo will be its own seperate 'superheavy' ammo
/obj/item/weapon/gun/projectile/heavysniper
caliber = "large"
caliber = "14.5"
ammo_type = /obj/item/ammo_casing/simple/large
projectile_type = /obj/item/projectile/bullet/rifle/a145
@@ -816,10 +816,10 @@ Large Weapons
projectile_type = /obj/item/projectile/bullet/rifle/a145
/obj/item/weapon/gun/projectile/revolver/slab
caliber = "large"
caliber = "14.5" ////Editing these back to 14.5 bullets, these are extremely damaging and shouldnt be as free as 'large bullets'
ammo_type = /obj/item/ammo_casing/simple/large
projectile_type = /obj/item/projectile/bullet/rifle/a145
*/
/obj/item/weapon/gun/projectile/automatic/serdy/awp
caliber = "large"
projectile_type = /obj/item/projectile/bullet/rifle/a338

3
modular_chomp/code/modules/projectiles/ammo_refactor/ammo_types.dm
View File

@@ -38,6 +38,7 @@
var/obj/item/projectile/P = new projectile_type_real(src.loc)
P.agony = round(P.damage * AMMO_RUBBER_AGONY_MULT) //In exchange for agony proportional to damage
P.damage = round(P.damage * AMMO_RUBBER_DAMAGE_MULT) //Severely reduced damage
P.sharp = FALSE //Rubber shot shouldnt bleed you
qdel(src)
return P.launch_from_gun(target, target_zone, user, params, angle_override, forced_spread, launcher)
if(ammo_flags & AMMO_FLAG_HUNTER)
@@ -76,7 +77,6 @@
desc = "A medium bullet casing, probably fit for a rifle"
caliber = "medium"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a545
matter = list(MAT_STEEL = 180)
ammo_flags = AMMO_FLAG_MEDIUM
@@ -84,7 +84,6 @@
desc = "A large bullet casing, probably fit for a sniper."
icon_state = "lcasing"
caliber = "large"
projectile_type = /obj/item/projectile/bullet/rifle/a338
matter = list(MAT_STEEL = 800)
ammo_flags = AMMO_FLAG_LARGE