Skip to content

Commit

Permalink
Update 15: BaS Variants + UI QoL Fixes
Browse files Browse the repository at this point in the history
[NEW ADDITIONS]
o Momopate's 20x70 Slugs mod will now be included by default to avoid any conflicts with the created variants
- This will also include my own trader mod that adds the base slugs to traders where appropriate
o 20x70 now has its variants
- 20x70 #3BK Buckshot: 17 pellets, slightly less damage per pellet than regular 20x70 Buckshot due to pellet count, less AP, 25% chance to stagger
- 20x70 Shattershot (Devastator slug variant): single glass slug with low base power but massive expansion bonus + fragmentation, near-to-none AP
- 20x70 Lightning (Star/AP slug variant): slightly more damage, one tier higher AP, deals shock hit + shock AoE to nearby targets that scales with armor tier (headshot guarantees Tier 3 AoE)
o 23x75 now has its variants
- 23x75mm "Pure Chaos" Buckshot: slightly less damage and AP, utilizes the "Chaos" special that modifies damage and AP by 0.6x-1.6x + has a chance to utilize many of the special effects in this mod
- 23x75mm "Mini Napalm" ("Barrikada" variant): a "fire bomb projectile" that ignites the hit target (does same damage as Dragon's Breath's ignite) and reduces their armor + ignites any targets within a 5m radius (this ignite does less damage)
o .338 Federal (BaS) now has a variant
- .338 Federal "Cloudkill": slightly more damage, slightly less accuracy and AP, utilizes the "Cloudkill" special that weakens nearby targets

[OTHER CHANGES]
o Any chance-based effects now have their chance shown in the ammo's tooltip to help players see their chances
- Due to this, minor re-writes were done to most chance-based effects to allow for this functionality
o "Fragmentation" special effect has been re-worked:
- Now is a chance-based 30% damage bonus on both non-armor-penetrating and full-armor-penetrating hits and flesh hits
- Each ammo has its own chance to fragment
o "Cloudkill" has been buffed:
- Weakening effect on an NPC (takes more damage + deals less damage to the player) now stacks if affected by "Cloudkill" again
o Removed a leftover text file that is not needed anymore
  • Loading branch information
ilrathCXV committed Jun 9, 2023
1 parent db08328 commit aee5d9f
Show file tree
Hide file tree
Showing 73 changed files with 801 additions and 134 deletions.
46 changes: 46 additions & 0 deletions gamedata/configs/ammo/ammo_20x70_variants.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
;; 20x70 #3BK Buckshot ;;
;;;;;;;;;;;;;;;;;;;;;;;;;
[ammo_20x70_buck_bad]:ammo_base
handler = arti_handlers.buckshot_damage
name = ammo_new_20x70_buck
k_hit = 0.195
k_ap = 0.02
cost = 1850
special = flinch
flinch = 25

dg_ammo = ammo_20x70_buck
dg_chance = 0.35

;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 20x70 Shattershot Slug ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_20x70_devastator_bad]:ammo_base
handler = arti_handlers.slug
name = ammo_20x70_devastator_glass
k_hit = 1.15
k_ap = 0.03
k_hp = 3.00
cost = 2750
special = frag
frag = 85

dg_ammo = ammo_20x70_buck
dg_chance = 0.6

;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 20x70 Lightning Slug ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_20x70_star_bad]:ammo_base
handler = arti_handlers.shock_damage
name = ammo_20x70_star_lightning
k_hit = 2.15
k_ap = 0.6
special = shock
cost = 8000

dg_ammo = ammo_20x70_buck
dg_chance = 0.75
29 changes: 29 additions & 0 deletions gamedata/configs/ammo/ammo_23x75_variants.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 23x75 Pure Chaos Buckshot ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[ammo_23x75_shrapnel_bad]:ammo_base
;handler = arti_handlers.buckshot_damage
handler = arti_handlers.chaos_damage
name = ammo_23x75_chaos
k_hit = 1.15
k_ap = 0.04
cost = 9500
special = chaos

dg_ammo = ammo_23x75_shrapnel
dg_chance = 0.85

;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 23x75 Fire Bomb "Slug" ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_23x75_barrikada_bad]:ammo_base
handler = arti_handlers.napalm_damage
name = ammo_23x75_mini_napalm
k_hit = 1.15
k_ap = 0.03
cost = 16500
special = napalm

dg_ammo = ammo_23x75_barrikada
dg_chance = 0.95
13 changes: 13 additions & 0 deletions gamedata/configs/ammo/ammo_338_federal_variant.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; .338 Federal "Cloudkill" ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[ammo_338_federal_bad]:ammo_base
handler = bas_handler.corrosive_cloud
name = ammo_338_fed_cloudkill
k_hit = 1.05
k_ap = 0.65
cost = 9000
special = toxic

dg_ammo = ammo_338_federal
dg_chance = 0.7
4 changes: 2 additions & 2 deletions gamedata/configs/ammo/ammo_bas.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = ammo_new_23x75_shrapnel
k_hit = 1 ;1.50 - Grok
k_ap = 0.06 ;0.05 - Arti
special = flinch
flinch = 0.75
flinch = 75
cost = 2000

[ammo_23x75_barrikada]:ammo_base
Expand All @@ -13,7 +13,7 @@ name = ammo_new_23x75_barrikada
k_hit = 2.33 ;4.20 - Grok
k_ap = 0.54 ;0.195 - Arti
special = frag
frag = 1.2
frag = 20
cost = 7000

[ammo_20x70_buck]:ammo_base
Expand Down
2 changes: 1 addition & 1 deletion gamedata/configs/ammo/ammo_cxv_357mono.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
name = ammo_357_fmj_mono
k_hit = 1.2
k_ap = 0.40
frag = 1.5
frag = 50
cost = 4150
special = frag
6 changes: 3 additions & 3 deletions gamedata/configs/ammo/ammo_cxv_9x21_variants.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = ammo_9x21_sp10_bad
k_hit = 1.25
k_ap = 0.50
special = fire
ignite = 0.5
ignite = 50
cost = 4150

dg_ammo = ammo_9x21_sp11
Expand All @@ -22,7 +22,7 @@ name = ammo_9x21_sp11_bad
k_hit = 1.65
k_ap = 0.33
special = flinch
flinch = 0.35
flinch = 35
cost = 3050

dg_ammo = ammo_9x21_sp11
Expand All @@ -38,7 +38,7 @@ k_hit = 2.25
k_ap = 0.1
k_hp = 1.5
special = frag
frag = 1.3
frag = 30
cost = 3250

dg_ammo = ammo_9x21_sp12
Expand Down
2 changes: 1 addition & 1 deletion gamedata/configs/ammo/ammo_momo_20x70slugs.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ k_hit = 2.33
k_ap = 0.29
cost = 1000
special = flinch
flinch = 0.6
flinch = 60

;;;;;;;;;;;;;;;;;;;;;
;; 20x70 Star Slug ;;
Expand Down
2 changes: 1 addition & 1 deletion gamedata/configs/ammo/ammo_momo_45behemoth.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ k_hit = 2.50 ;1.25 - ilrathCXV
k_ap = 0.35
cost = 12500
special = frag
frag = 2.00
frag = 100
dg_ammo = ammo_11.43x23_ap
dg_chance = 0.85
3 changes: 2 additions & 1 deletion gamedata/configs/ammo/ammo_other.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name = ammo_new_4.6x30_fmj
k_hit = 1
k_ap = 0.25 ;0.135
cost = 3000

[ammo_4.6x30_ap]:ammo_base ; dm111
name = ammo_new_4.6x30_ap
k_hit = 1
Expand All @@ -14,13 +15,13 @@ name = ammo_new_50_bmg
k_hit = 1.6
k_ap = 1.9 ;0.335
cost = 27200

[ammo_50_bmg_bad]:ammo_base ; m2 ap
name = ammo_new_50_ap
k_hit = 1.4
k_ap = 2.2 ;0.399
cost = 32200


[ammo_12x76_bull]:ammo_base ; bull
handler = arti_handlers.slug
name = ammo_new_12x76_bull
Expand Down
9 changes: 2 additions & 7 deletions gamedata/configs/ammo/ammo_pistol.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ k_ap = 0.152 ;0.0625 - Arti
cost = 900
recoil = 1.2
special = flinch
flinch = 0.5
flinch = 50
dg_ammo = ammo_9x18_fmj
dg_chance = 0.3

Expand All @@ -47,8 +47,6 @@ name = ammo_new_9x18_ap
k_hit = 0.95 ;0.60 - Grok
k_ap = 0.3 ;0.135 - Arti
cost = 1200
;dg_ammo = ammo_9x18_fmj
;dg_chance = 0.5

[ammo_9x18_ap_bad]:ammo_9x18_ap; 7N16 PMM, modern AP
name = ammo_new_9x18_7n25
Expand All @@ -75,7 +73,7 @@ k_ap = 0.198 ;0.11 - Arti
cost = 1125
recoil = 1.3
special = flinch
flinch = 0.5
flinch = 50
dg_ammo = ammo_9x19_fmj
dg_chance = 0.3

Expand All @@ -102,8 +100,6 @@ name = ammo_new_9x19_ap
k_hit = 0.9 ;0.70 - Grok
k_ap = 0.38 ;0.195 - Arti
cost = 2350
;dg_ammo = ammo_9x19_fmj
;dg_chance = 0.6

[ammo_9x19_ap_bad]:ammo_9x19_ap ; 7N31 overpressure AP
name = ammo_new_9x19_7n31
Expand Down Expand Up @@ -137,7 +133,6 @@ k_hit = 3.21 ;2.25 - Grok* (3.21 = 2.25/0.7)
k_ap = 0.10 ;0.069 - Arti
k_hp = 1.5
cost = 1750
;special = varma

[ammo_11.43x23_hydro_bad]:ammo_11.43x23_hydro; RIP
handler = arti_handlers.rip
Expand Down
8 changes: 4 additions & 4 deletions gamedata/configs/ammo/ammo_rifle.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ k_hit = 1 ;1.1 - Grok
k_ap = 0.335 ;0.205 - Arti
cost = 2050
special = frag
frag = 1.3
frag = 30
dg_ammo = ammo_5.45x39_fmj
dg_chance = 0.4

Expand All @@ -36,7 +36,7 @@ name = ammo_new_5.45x39_sp
k_hit = 1.05 ;1.65 - Grok+ | 1.15 - Grok++
k_ap = 0.21 ;0.15 - Arti
k_hp = 1.1
flinch = 0.5
flinch = 50
special = flinch
cost = 2200
dg_ammo = ammo_5.45x39_ep
Expand All @@ -55,7 +55,7 @@ k_hit = 0.8 ;1.00 - Grok+ | 0.9 - Grok++
k_ap = 0.576 ;0.305 - Arti
cost = 5840
special = frag
frag = 1.3
frag = 30
recoil = 1.2
dg_ammo = ammo_5.45x39_ap
dg_chance = 0.50
Expand Down Expand Up @@ -141,7 +141,7 @@ handler = arti_handlers.fire_damage
name = ammo_new_7.62x39_api
k_hit = 1.2 ;1.15 - Grok+ | 1.1 - Grok++
k_ap = 0.586 ;0.275 - Arti
ignite = 0.6
ignite = 60
cost = 7250
recoil = 1.05
special = fire
Expand Down
4 changes: 2 additions & 2 deletions gamedata/configs/ammo/ammo_shon_western.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = ammo_30-30_handload
k_hit = 1.0
k_ap = 0.25
cost = 3375
flinch = 0.25
flinch = 25
special = flinch

;;;;;;;;;;;;;;;;;;;;;;;;;;;
Expand All @@ -31,7 +31,7 @@ name = ammo_30-06_Springfield
k_hit = 1.0
k_ap = 0.75
cost = 4000
flinch = 0.75
flinch = 75
special = flinch

;;;;;;;;;;;;;;;;;;;;;;;
Expand Down
2 changes: 1 addition & 1 deletion gamedata/configs/ammo/ammo_shotgun.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ k_ap = 0.23 ;0.1 - Arti
cost = 1450
recoil = 1.1
special = flinch
flinch = 0.50
flinch = 50

[ammo_12x76_zhekan_bad]:ammo_12x76_zhekan ; flechette
handler = arti_handlers.buckshot_damage
Expand Down
8 changes: 3 additions & 5 deletions gamedata/configs/ammo/ammo_sniper.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ handler = arti_handlers.fire_damage
name = ammo_new_7.62x54_api
k_hit = 1.2 ;1.267 - Grok+
k_ap = 0.95 ;0.335 - Arti
ignite = 0.9
ignite = 90
special = fire
cost = 11000
recoil = 1.05
Expand Down Expand Up @@ -91,7 +91,7 @@ cost = 3000

[ammo_7.62x51_fmj_bad]:ammo_7.62x51_fmj; mk316?
handler = arti_handlers.fragment_sound
frag = 1.5
frag = 50
special = frag
;ilrathCXV - Additonal effects to separate it from regular FMJ

Expand Down Expand Up @@ -161,7 +161,7 @@ k_ap = 0.38 ;0.225 - Arti
cost = 3000

[ammo_12.7x55_fmj_bad]:ammo_12.7x55_fmj; pt2
flinch = 0.95
flinch = 95
special = flinch
;ilrathCXV - Giving an additonal effect (basically same as normal FMJ ammo the way Arti had it)

Expand All @@ -178,8 +178,6 @@ k_hit = 1.5 ;1.35 - Grok
k_ap = 0.75 ;0.305 - Arti
recoil = 1.05
cost = 6900
;dg_ammo = ammo_12.7x55_fmj
;dg_chance = 0.4

[ammo_12.7x55_ap_bad]:ammo_12.7x55_ap; explosive
name = ammo_new_12.7x55_exp
Expand Down
4 changes: 4 additions & 0 deletions gamedata/configs/items/ammo/ammo_20x70_variants.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
![ammo_vanilla]
ammo_20x70_buck_bad = 5, recipe_ammo_shotgun, casing_s,1,powder_1,4,bullet_shotgun,3
ammo_20x70_devastator_bad = 5, recipe_ammo_shotgun, casing_s,3,powder_1,4,bullet_shotgun_ap,1,bullet_shotgun,3
ammo_20x70_star_bad = 5, recipe_ammo_arty2, casing_s,3,powder_1,4,bullet_shotgun_ap,4,powder_battery,1
3 changes: 3 additions & 0 deletions gamedata/configs/items/ammo/ammo_23x75_variants.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
![ammo_vanilla]
ammo_23x75_shrapnel_bad = 5, recipe_ammo_arty2, casing_s,2,powder_3,1,powder_gravi,4,powder_blood,2
ammo_23x75_barrikada_bad = 5, recipe_ammo_fire, casing_s,2,powder_3,4,powder_fire,2,powder_fireball,5
2 changes: 2 additions & 0 deletions gamedata/configs/items/ammo/ammo_338_federal_variant.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
![ammo_vanilla]
ammo_338_federal_bad = 5, recipe_ammo_nato, casing_r7,2,powder_3,4,bullet_r7_ap,2,powder_blood,3
3 changes: 3 additions & 0 deletions gamedata/configs/items/ammo/ammo_mp_20x70_slugs.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
![ammo_bas]
ammo_20x70_devastator = 5, recipe_ammo_0, casing_s,2,powder_1,4,bullet_shotgun,3
ammo_20x70_star = 5, recipe_ammo_0, casing_s,2,powder_1,8,bullet_shotgun_ap,3
2 changes: 2 additions & 0 deletions gamedata/configs/items/trade/mod_trade_bandit_20x70slugs.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
![supplies_2]
ammo_20x70_devastator = 7, 1 ;zhekan
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
![supplies_2]
ammo_20x70_devastator = 7, 1 ;zhekan
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
![supplies_2]
ammo_20x70_devastator = 8, 1 ;zhekan

![supplies_4]
ammo_20x70_star = 5, 1 ;dart
2 changes: 2 additions & 0 deletions gamedata/configs/items/trade/mod_trade_duty_20x70slugs.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
![supplies_2]
ammo_20x70_devastator = 7, 1 ;zhekan
5 changes: 5 additions & 0 deletions gamedata/configs/items/trade/mod_trade_freedom_20x70slugs.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
![supplies_2]
ammo_20x70_devastator = 8, 1 ;zhekan

![supplies_4]
ammo_20x70_star = 5, 1 ;dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
![supplies_2]
ammo_20x70_devastator = 8, 1 ;zhekan

![supplies_4]
ammo_20x70_star = 5, 1 ;dart
2 changes: 2 additions & 0 deletions gamedata/configs/items/trade/mod_trade_greh_20x70slugs.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
![supplies_2]
ammo_20x70_devastator = 7, 1 ;zhekan
5 changes: 5 additions & 0 deletions gamedata/configs/items/trade/mod_trade_isg_20x70slugs.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
![supplies_2]
ammo_20x70_devastator = 8, 1 ;zhekan

![supplies_4]
ammo_20x70_star = 5, 1 ;dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
![supplies_2]
ammo_20x70_devastator = 8, 1 ;zhekan

![supplies_4]
ammo_20x70_star = 5, 1 ;dart
Loading

0 comments on commit aee5d9f

Please sign in to comment.