Ammo pack sizes & weapon mag size overhaul

- More realistic per-round weight - Adjusted mag sizes of some weapons accordingly
phobos2077 · Jul 5, 2024 · 4f7eeeb · 4f7eeeb
1 parent ac7550d
commit 4f7eeeb
Show file tree

Hide file tree

Showing 42 changed files with 36 additions and 36 deletions.
diff --git a/proto_src/items/ammo/00000029.yml b/proto_src/items/ammo/00000029.yml
@@ -12,12 +12,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 60
+cost: 75
 inventoryFid: 117440543
 soundId: '0'
 ammoData:
   caliber: 8
-  quantity: 20
+  quantity: 24
   armorClassMod: 0
   damageResistanceMod: 10
   damageMult: 3

diff --git a/proto_src/items/ammo/00000030.yml b/proto_src/items/ammo/00000030.yml
@@ -12,12 +12,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 120
+cost: 150
 inventoryFid: 117440542
 soundId: '0'
 ammoData:
   caliber: 8
-  quantity: 20
+  quantity: 24
   armorClassMod: 0
   damageResistanceMod: -30
   damageMult: 4

diff --git a/proto_src/items/ammo/00000031.yml b/proto_src/items/ammo/00000031.yml
@@ -12,12 +12,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 50
+cost: 45
 inventoryFid: 117440546
 soundId: '0'
 ammoData:
   caliber: 9
-  quantity: 12
+  quantity: 18
   armorClassMod: 0
   damageResistanceMod: 20
   damageMult: 9

diff --git a/proto_src/items/ammo/00000039.yml b/proto_src/items/ammo/00000039.yml
@@ -12,12 +12,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 3
-cost: 480
+cost: 600
 inventoryFid: 117440549
 soundId: '0'
 ammoData:
   caliber: 4
-  quantity: 24
+  quantity: 30
   armorClassMod: 0
   damageResistanceMod: -20
   damageMult: 1

diff --git a/proto_src/items/ammo/00000095.yml b/proto_src/items/ammo/00000095.yml
@@ -13,13 +13,13 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 135
+cost: 115
 inventoryFid: 117440603
 soundId: '0'
 ammoData:
   caliber: 11
-  quantity: 12
-  armorClassMod: -15
+  quantity: 10
+  armorClassMod: -20
   damageResistanceMod: 20
   damageMult: 8
   damageDiv: 5
diff --git a/proto_src/items/ammo/00000111.yml b/proto_src/items/ammo/00000111.yml
@@ -12,12 +12,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 75
+cost: 65
 inventoryFid: 117440545
 soundId: '0'
 ammoData:
   caliber: 9
-  quantity: 12
+  quantity: 18
   armorClassMod: 0
   damageResistanceMod: -20
   damageMult: 1

diff --git a/proto_src/items/ammo/00000121.yml b/proto_src/items/ammo/00000121.yml
@@ -13,12 +13,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 50
+cost: 75
 inventoryFid: 117440750
 soundId: '0'
 ammoData:
   caliber: 12
-  quantity: 20
+  quantity: 30
   armorClassMod: 0
   damageResistanceMod: 0
   damageMult: 1

diff --git a/proto_src/items/ammo/00000357.yml b/proto_src/items/ammo/00000357.yml
@@ -11,13 +11,13 @@ sid: -1
 type: ITEM_TYPE_AMMO
 material: 1
 size: 1
-weight: 2
-cost: 225
+weight: 1
+cost: 150
 inventoryFid: 117440748
 soundId: '0'
 ammoData:
   caliber: 14
-  quantity: 30
+  quantity: 20
   armorClassMod: 0
   damageResistanceMod: 0
   damageMult: 1

diff --git a/proto_src/items/ammo/00000360.yml b/proto_src/items/ammo/00000360.yml
@@ -13,12 +13,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 100
+cost: 150
 inventoryFid: 117440618
 soundId: '0'
 ammoData:
   caliber: 12
-  quantity: 20
+  quantity: 30
   armorClassMod: 0
   damageResistanceMod: -30
   damageMult: 1

diff --git a/proto_src/items/ammo/00000363.yml b/proto_src/items/ammo/00000363.yml
@@ -11,7 +11,7 @@ sid: -1
 type: ITEM_TYPE_AMMO
 material: 1
 size: 1
-weight: 2
+weight: 1
 cost: 200
 inventoryFid: 117440753
 soundId: '0'

diff --git a/proto_src/items/ammo/00000614.yml b/proto_src/items/ammo/00000614.yml
@@ -12,12 +12,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 160
+cost: 135
 inventoryFid: 117440920
 soundId: '0'
 ammoData:
   caliber: 11
-  quantity: 12
+  quantity: 10
   armorClassMod: 0
   damageResistanceMod: -20
   damageMult: 1

diff --git a/proto_src/items/ammo/00000641.yml b/proto_src/items/ammo/00000641.yml
@@ -13,12 +13,12 @@ type: ITEM_TYPE_AMMO
 material: 1
 size: 1
 weight: 1
-cost: 300
+cost: 250
 inventoryFid: 117440947
 soundId: '0'
 ammoData:
   caliber: 11
-  quantity: 12
+  quantity: 10
   armorClassMod: -15
   damageResistanceMod: -10
   damageMult: 5

diff --git a/proto_src/items/ammo/00000642.yml b/proto_src/items/ammo/00000642.yml
@@ -11,7 +11,7 @@ sid: -1
 type: ITEM_TYPE_AMMO
 material: 1
 size: 1
-weight: 2
+weight: 1
 cost: 400
 inventoryFid: 117440948
 soundId: '0'

diff --git a/proto_src/items/weapon/00000015.yml b/proto_src/items/weapon/00000015.yml
@@ -33,5 +33,5 @@ weaponData:
   rounds: 0
   caliber: 4
   ammoTypePid: 39
-  ammoCapacity: 24
+  ammoCapacity: 30
   soundCode: K
diff --git a/proto_src/items/weapon/00000016.yml b/proto_src/items/weapon/00000016.yml
@@ -32,5 +32,5 @@ weaponData:
   rounds: 0
   caliber: 3
   ammoTypePid: 38
-  ammoCapacity: 12
+  ammoCapacity: 10
   soundCode: C
diff --git a/proto_src/items/weapon/00000024.yml b/proto_src/items/weapon/00000024.yml
@@ -32,5 +32,5 @@ weaponData:
   rounds: 0
   caliber: 3
   ammoTypePid: 38
-  ammoCapacity: 16
+  ammoCapacity: 10
   soundCode: F
diff --git a/proto_src/items/weapon/00000233.yml b/proto_src/items/weapon/00000233.yml
@@ -32,5 +32,5 @@ weaponData:
   rounds: 0
   caliber: 4
   ammoTypePid: 39
-  ammoCapacity: 24
+  ammoCapacity: 30
   soundCode: K
diff --git a/proto_src/items/weapon/00000296.yml b/proto_src/items/weapon/00000296.yml
@@ -20,7 +20,7 @@ inventoryFid: 117440702
 soundId: '0'
 weaponData:
   animationCode: 6
-  minDamage: 9
+  minDamage: 8
   maxDamage: 14
   damageType: DAMAGE_TYPE_NORMAL
   maxRange1: 30
@@ -34,5 +34,5 @@ weaponData:
   rounds: 8
   caliber: 8
   ammoTypePid: 30
-  ammoCapacity: 24
-  soundCode: H
+  ammoCapacity: 32
+  soundCode: D
diff --git a/proto_src/items/weapon/00000401.yml b/proto_src/items/weapon/00000401.yml
@@ -33,5 +33,5 @@ weaponData:
   rounds: 2
   caliber: 4
   ammoTypePid: 39
-  ammoCapacity: 24
+  ammoCapacity: 30
   soundCode: J
diff --git a/proto_src/items/weapon/00000402.yml b/proto_src/items/weapon/00000402.yml
@@ -33,5 +33,5 @@ weaponData:
   rounds: 0
   caliber: 3
   ammoTypePid: 38
-  ammoCapacity: 12
+  ammoCapacity: 10
   soundCode: C
diff --git a/proto_src/items/weapon/00000406.yml b/proto_src/items/weapon/00000406.yml
@@ -33,5 +33,5 @@ weaponData:
   rounds: 0
   caliber: 3
   ammoTypePid: 38
-  ammoCapacity: 32
+  ammoCapacity: 20
   soundCode: F
diff --git a/root/data/proto/items/00000015.pro b/root/data/proto/items/00000015.pro
diff --git a/root/data/proto/items/00000016.pro b/root/data/proto/items/00000016.pro
diff --git a/root/data/proto/items/00000024.pro b/root/data/proto/items/00000024.pro
diff --git a/root/data/proto/items/00000029.pro b/root/data/proto/items/00000029.pro
diff --git a/root/data/proto/items/00000030.pro b/root/data/proto/items/00000030.pro
diff --git a/root/data/proto/items/00000031.pro b/root/data/proto/items/00000031.pro
diff --git a/root/data/proto/items/00000039.pro b/root/data/proto/items/00000039.pro
diff --git a/root/data/proto/items/00000095.pro b/root/data/proto/items/00000095.pro
diff --git a/root/data/proto/items/00000111.pro b/root/data/proto/items/00000111.pro
diff --git a/root/data/proto/items/00000121.pro b/root/data/proto/items/00000121.pro
diff --git a/root/data/proto/items/00000233.pro b/root/data/proto/items/00000233.pro
diff --git a/root/data/proto/items/00000296.pro b/root/data/proto/items/00000296.pro
diff --git a/root/data/proto/items/00000357.pro b/root/data/proto/items/00000357.pro
diff --git a/root/data/proto/items/00000360.pro b/root/data/proto/items/00000360.pro
diff --git a/root/data/proto/items/00000363.pro b/root/data/proto/items/00000363.pro
diff --git a/root/data/proto/items/00000401.pro b/root/data/proto/items/00000401.pro
diff --git a/root/data/proto/items/00000402.pro b/root/data/proto/items/00000402.pro
diff --git a/root/data/proto/items/00000406.pro b/root/data/proto/items/00000406.pro
diff --git a/root/data/proto/items/00000614.pro b/root/data/proto/items/00000614.pro
diff --git a/root/data/proto/items/00000641.pro b/root/data/proto/items/00000641.pro
diff --git a/root/data/proto/items/00000642.pro b/root/data/proto/items/00000642.pro