Rebalance ammo-related craft, 4.7mm cal, 14mm JHP, Fuel mk2, .223 Pistol

- Make sure craft economy still works for recipes with ammo - 4.7mm ammo: 50 pack size (should be even higher for realism, but...), remove dmg mult for simplicity, slight nerf to DR mod - G11: will have lower dmg now, but tight spray should compensate - G11E: same dmg as regular, but x2 burst size, close to MG's in dmg potential - Vindicator Minigun: remove Penetrate perk and burst size change (to vanilla), slight dmg buff to compensate for ammo change - .223 Pistol: slight dmg and range buff to make competitive against 14mm. - 14mm: nerf JHP DR and increase price to 12.5/round - Map ammo loot: nerf 4.7mm, buff 14mm
phobos2077 · Jul 7, 2024 · 2e459c1 · 2e459c1
1 parent 8098e1c
commit 2e459c1
Show file tree

Hide file tree

Showing 25 changed files with 63 additions and 58 deletions.
diff --git a/docs/ecco_readme.txt b/docs/ecco_readme.txt
@@ -207,6 +207,7 @@ DerivedStats=sfall\stats.ini
 SkillsFile=sfall\skills.ini
 PerksFile=sfall\perks.ini
 BooksFile=sfall\books.ini
+DrugsFile=sfall\drugs.ini
 MovieTimer_artimer1=90
 MovieTimer_artimer2=210
 MovieTimer_artimer3=330

diff --git a/docs/todo.txt b/docs/todo.txt
@@ -1,9 +1,9 @@
 for 1.0.0:
 - finish Big Guns run
+- review merchant loot reduction rules
 - add warning message if wrong sfall version is used (save version to ini, if it changed and still wrong, show message again)
 - add tie-ins to barter "demand" feature, have some trader explain it in dialog (and maybe also boost your barter skill)
 - review usages of WEAPON_ACCURATE perk
-- recheck economy of all craft involving ammo after pack size changes
 - try to make expanded awareness less verbose and distracting
 
 

diff --git a/proto_src/items/ammo/00000033.yml b/proto_src/items/ammo/00000033.yml
@@ -12,7 +12,7 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 125
+cost: 150
 inventoryFid: 117440544
 soundId: '0'
 ammoData:

diff --git a/proto_src/items/ammo/00000035.yml b/proto_src/items/ammo/00000035.yml
@@ -12,13 +12,13 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 100
+cost: 120
 inventoryFid: 117440551
 soundId: '0'
 ammoData:
   caliber: 6
   quantity: 40
   armorClassMod: 0
-  damageResistanceMod: 0
+  damageResistanceMod: 5
   damageMult: 4
   damageDiv: 3
diff --git a/proto_src/items/ammo/00000036.yml b/proto_src/items/ammo/00000036.yml
@@ -12,7 +12,7 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 125
+cost: 150
 inventoryFid: 117440550
 soundId: '0'
 ammoData:

diff --git a/proto_src/items/ammo/00000359.yml b/proto_src/items/ammo/00000359.yml
@@ -12,13 +12,13 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 450
+cost: 600
 inventoryFid: 117440749
 soundId: '0'
 ammoData:
   caliber: 16
-  quantity: 40
-  armorClassMod: -10
-  damageResistanceMod: -30
-  damageMult: 4
-  damageDiv: 3
+  quantity: 50
+  armorClassMod: 0
+  damageResistanceMod: -25
+  damageMult: 1
+  damageDiv: 1
diff --git a/proto_src/items/ammo/00000382.yml b/proto_src/items/ammo/00000382.yml
@@ -12,13 +12,13 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 2
 weight: 5
-cost: 150
+cost: 200
 inventoryFid: 117440772
 soundId: '0'
 ammoData:
   caliber: 2
   quantity: 10
   armorClassMod: -25
-  damageResistanceMod: -15
+  damageResistanceMod: -30
   damageMult: 1
   damageDiv: 1
diff --git a/proto_src/items/ammo/00000633.yml b/proto_src/items/ammo/00000633.yml
@@ -12,13 +12,13 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 100
+cost: 150
 inventoryFid: 117440939
 soundId: '0'
 ammoData:
   caliber: 10
   quantity: 12
   armorClassMod: 0
-  damageResistanceMod: -10
+  damageResistanceMod: 0
   damageMult: 3
   damageDiv: 2
diff --git a/proto_src/items/weapon/00000241.yml b/proto_src/items/weapon/00000241.yml
@@ -13,15 +13,15 @@ type: ITEM_TYPE_WEAPON
 material: 1
 size: 4
 weight: 5
-cost: 3500
+cost: 3000
 inventoryFid: 117440658
 soundId: '0'
 weaponData:
   animationCode: 6
-  minDamage: 20
-  maxDamage: 30
+  minDamage: 24
+  maxDamage: 32
   damageType: DAMAGE_TYPE_NORMAL
-  maxRange1: 20
+  maxRange1: 25
   maxRange2: 0
   projectilePid: -1
   minStrength: 5

diff --git a/proto_src/items/weapon/00000391.yml b/proto_src/items/weapon/00000391.yml
@@ -4,7 +4,8 @@ name: H&K G11E
 description: 'This gun revolutionized squad level support weapon design. The gun fires
   a caseless cartridge consisting of a block of propellant with a bullet buried inside.
   The resultant weight and space savings allow it to have a very high magazine capacity.
-  Min ST: 6.'
+  This variant comes with a Night Vision Scope and increased rate of fire. Min ST:
+  6.'
 fid: 44
 lightDistance: 0
 lightIntensity: 0
@@ -20,8 +21,8 @@ inventoryFid: 117440775
 soundId: '0'
 weaponData:
   animationCode: 6
-  minDamage: 16
-  maxDamage: 24
+  minDamage: 14
+  maxDamage: 20
   damageType: DAMAGE_TYPE_NORMAL
   maxRange1: 40
   maxRange2: 35
@@ -31,7 +32,7 @@ weaponData:
   actionPointCost2: 6
   criticalFailureType: 2
   perk: PERK_WEAPON_NIGHT_SIGHT
-  rounds: 7
+  rounds: 10
   caliber: 16
   ammoTypePid: 359
   ammoCapacity: 50

diff --git a/proto_src/items/weapon/00000395.yml b/proto_src/items/weapon/00000395.yml
@@ -20,8 +20,8 @@ inventoryFid: 117440791
 soundId: '0'
 weaponData:
   animationCode: 9
-  minDamage: 16
-  maxDamage: 22
+  minDamage: 18
+  maxDamage: 24
   damageType: DAMAGE_TYPE_NORMAL
   maxRange1: 30
   maxRange2: 0
@@ -30,8 +30,8 @@ weaponData:
   actionPointCost1: 6
   actionPointCost2: 0
   criticalFailureType: 2
-  perk: PERK_WEAPON_PENETRATE
-  rounds: 20
+  perk: NONE
+  rounds: 25
   caliber: 16
   ammoTypePid: 359
   ammoCapacity: 100

diff --git a/root/data/config/pbs_craft.ini b/root/data/config/pbs_craft.ini
@@ -205,7 +205,6 @@ skill1=11+5:100         ; TRAPS+THROWING
 skill2=13:60            ; REPAIR
 input1=98:1             ; Junk
 input2=51:1|85:1        ; Dynamite OR Plastic explosive
-input3=95:2             ; Shotgun shells
 
 
 [Recipe 40MM_HE]
@@ -253,7 +252,7 @@ input2=106:4            ; NUKA_COLA
 ; AMMO
 
 [Recipe SHOTGUN_SLUGS]
-output=614
+output=614:1            ; x10
 pic_w=74
 pic_h=60
 gvar=CRFT_AMM           ; ammo craft schematics
@@ -262,12 +261,12 @@ category=5              ; Ammo
 tool1=75|308            ; MULTI_TOOL | SUPER_TOOL_KIT
 skill1=0:60             ; SMALL_GUNS
 skill2=13:50            ; REPAIR
-input1=95:1             ; Shotgun shells
+input1=95:1             ; Shotgun shells x10
 input2=19:1             ; ROCK
 
 
 [Recipe DRAGON_BREATH]  ; 12GA Incendiary
-output=641:1
+output=641:1            ; x10
 pic_w=79
 pic_h=60
 gvar=CRFT_AMM           ; ammo craft schematics
@@ -276,64 +275,64 @@ category=5              ; Ammo
 tool1=75|308            ; MULTI_TOOL | SUPER_TOOL_KIT
 skill1=0:100            ; SMALL_GUNS
 skill2=13:80            ; REPAIR
-input1=95:1             ; Shotgun shells
-input2=32:1|382:1       ; Flamethrower fuel
+input1=95:1             ; Shotgun shells x10
+input2=32:1|382:1       ; Flamethrower fuel x10
 
 
 [Recipe 223_AP]
-output=615
+output=615:4            ; x120
 pic_w=81
 pic_h=59
 gvar=CRFT_AMM           ; ammo craft schematics
-time=240                ; 4 h
+time=360                ; 6 h
 category=5              ; Ammo
 tool1=308               ; SUPER_TOOL_KIT
 skill1=0:80             ; SMALL_GUNS
 skill2=13:70            ; REPAIR
-input1=34:1             ; 223 FMJ
-input2=36:1             ; 5mm AP
+input1=34:4             ; 223 FMJ x120
+input2=36:3             ; 5mm AP x120
 
 
 [Recipe 762_AP]
-output=642
+output=642:1            ; x20
 pic_w=57
 pic_h=54
 gvar=CRFT_AMM           ; ammo craft schematics
-time=240                ; 4 h
+time=120                ; 2 h
 category=5              ; Ammo
 tool1=308               ; SUPER_TOOL_KIT
 skill1=0:100            ; SMALL_GUNS
 skill2=13:80            ; REPAIR
-input1=363:1            ; 7.62 FMJ
-input2=33:1             ; 14mm AP
+input1=363:1            ; 7.62 FMJ x20
+input2=33:1             ; 14mm AP x12
 
 
 [Recipe 14MM_JHP]
-output=633
+output=633:1            ; x12
 pic_w=45
 pic_h=68
 gvar=CRFT_AMM           ; Ammo schematics
-time=120                ; 2h
+time=120                ; 2 h
 category=5              ; Ammo
 tool1=75|308            ; MULTI_TOOL | SUPER_TOOL_KIT
 skill1=0:80             ; SMALL_GUNS
 skill2=13:80            ; REPAIR
-input1=33:1             ; 14mm AP
+input1=33:1             ; 14mm AP x12
 
 
 [Recipe 50_BMG]
-output=610:4
+output=610:4            ; x20
 pic_w=62
 pic_h=62
 schema=1
-time=300                ; 5h
+time=300                ; 5 h
 category=5              ; Ammo
 tool1=308               ; SUPER_TOOL_KIT
 skill1=1:120            ; BIG_GUNS
 skill2=13:100           ; REPAIR
-input1=33:2             ; 14mm AP
-input2=614:2            ; 12GA slugs
-input3=357:1            ; .45
+input1=33:2             ; 14mm AP x24
+input2=614:2            ; 12GA slugs x20
+input3=29:3|357:2       ; 10mm JHP x72 OR .45 x40
 
 
 [Recipe FLAMETHROWER_FUEL_MK2]

diff --git a/root/data/proto/items/00000033.pro b/root/data/proto/items/00000033.pro
diff --git a/root/data/proto/items/00000035.pro b/root/data/proto/items/00000035.pro
diff --git a/root/data/proto/items/00000036.pro b/root/data/proto/items/00000036.pro
diff --git a/root/data/proto/items/00000241.pro b/root/data/proto/items/00000241.pro
diff --git a/root/data/proto/items/00000359.pro b/root/data/proto/items/00000359.pro
diff --git a/root/data/proto/items/00000382.pro b/root/data/proto/items/00000382.pro
diff --git a/root/data/proto/items/00000391.pro b/root/data/proto/items/00000391.pro
diff --git a/root/data/proto/items/00000395.pro b/root/data/proto/items/00000395.pro
diff --git a/root/data/proto/items/00000633.pro b/root/data/proto/items/00000633.pro
diff --git a/root/data/text/english/game/pro_item.msg b/root/data/text/english/game/pro_item.msg
@@ -759,7 +759,7 @@
 {39000}{}{Solar Scorcher}
 {39001}{}{Without the sun's rays to charge this weapon's capacitors this gun can't light a match. However, in full daylight, the experimental photo-electric cells that power the Scorcher allow it to turn almost anything into a crispy critter. Min ST: 3.}
 {39100}{}{H&K G11E}
-{39101}{}{This gun revolutionized squad level support weapon design. The gun fires a caseless cartridge consisting of a block of propellant with a bullet buried inside. The resultant weight and space savings allow it to have a very high magazine capacity. Min ST: 6.}
+{39101}{}{This gun revolutionized squad level support weapon design. The gun fires a caseless cartridge consisting of a block of propellant with a bullet buried inside. The resultant weight and space savings allow it to have a very high magazine capacity. This variant comes with a Night Vision Scope and increased rate of fire. Min ST: 6.}
 {39200}{}{M72 Gauss Rifle}
 {39201}{}{The M72 rifle is of German design. It uses an electromagnetic field to propel rounds at tremendous speed... and pierce almost any obstacle. Its range, accuracy and stopping power is almost unparalleled. Min ST: 6.}
 {39300}{}{Phazer}

diff --git a/root/data/text/russian/game/pro_item.msg b/root/data/text/russian/game/pro_item.msg
@@ -759,7 +759,7 @@
 {39000}{}{��������� �������}
 {39001}{}{��� ��������� �����, ������� �������� ������������, ���� ��������� � ������ �� �������. ������ ��� ������� ��������� ����������������� ����������������� ��������, �������� �������, ��������� �� ���� ������ ������� ��������� ������. ���. ����: 3.}
 {39100}{}{H&K G11E}
-{39101}{}{��� ������ - �������� � ����������� ����������. ��� ���������� ������������ ������� �� ������������ ��, ������ �������� ��������� ����. ��� ���������� ��� � ������������, ��� �������� ����� ��������. ���. ����: 6.}
+{39101}{}{��� ������ - �������� � ����������� ����������. ��� ���������� ������������ ������� �� ������������ ��, ������ �������� ��������� ����. ��� ���������� ��� � ������������, ��� �������� ����� ��������. ������ ������ ����� ������ ������ � ���������� ����������������. ���. ����: 6.}
 {39200}{}{�����-�������� M72}
 {39201}{}{M72 ����������� � ��������. ������ ����������� ���������������� ����� � ��������� ����������� ����� �����������. ��������������, �������� � �������� ����� ������ �� �������� �� � ���. ���. ����: 6.}
 {39300}{}{�����}

diff --git a/root/mods/ecco/misc.ini b/root/mods/ecco/misc.ini
@@ -141,9 +141,9 @@ unload_weapons=1
 ; Flamer: 10->6
 32=6
 382=6
-; 14mm: 12->6
-33=6
-633=6
+; 14mm: 12->12
+;33=12
+;633=12
 ; .223: 30->20
 34=20
 615=20
@@ -161,6 +161,10 @@ unload_weapons=1
 ; 9mm: 30->20
 121=20
 360=20
+; .45: 20->20
+;357=20
+; 4.7mm: 50->25
+359=25
 ; Needler: 10->10
 ;361=10
 ;362=10

diff --git a/root/mods/ecco/spray_settings.ini b/root/mods/ecco/spray_settings.ini
@@ -49,8 +49,8 @@
 ; HK G11, 5 rnds: 5 ct, 3 tg, 0 sd (van 5)
 352=5,5,3,5
 
-; HK G11E, 7 rnds: 7 ct, 4 tg, 0 sd (van 7: 2 ct, 1 tg, 2 lf, 3 rt)
-391=7,7,4,7
+; HK G11E, 10 rnds: 6 ct, 4 tg, 2 sd (van 7: 2 ct, 1 tg, 2 lf, 3 rt)
+391=6,10,4,6
 
 ; XL70E3, 8 rnds: same as P90c (van 8)
 353=6,8,3,6
@@ -64,8 +64,8 @@
 ; M60, 10 rnds: same as LSW (van 10)
 387=4,10,2,4
 
-; Vindicator Minigun, 20 rnds: 8 ct, 4 tg, 6 lt, 6 rt (van 25: 8 ct, 4 tg, 8 lt, 9 rt)
-395=8,20,4,8
+; Vindicator Minigun, 25 rnds: 9 ct, 5 tg, 8 lt, 8 rt (van 25: 8 ct, 4 tg, 8 lt, 9 rt)
+395=9,25,5,9
 
 ; 14mm SMG, 6 rds: same as Grease Gun
 644=4,6,3,4