Review usages of weapon range/accurate perks

- Long Range generally applies only to accurate long range weapons (with exception of FN FAL - to compensate for high dmg, similar to LSW vs M60) - Accurate applies to special cases only when you need to make weapon more accurate at any range compared to others of the same caliber - Don't use Accurate for Gauss pistol since ammo already has high AC mod - Nerf 2mm EC AC mod - The above changes intended to reduce accuracy bonuses that demotivate skill investment
phobos2077 · Jul 7, 2024 · 6c488ff · 6c488ff
1 parent 2e459c1
commit 6c488ff
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 11 deletions.
diff --git a/docs/todo.txt b/docs/todo.txt
@@ -3,7 +3,6 @@ for 1.0.0:
 - 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
 - try to make expanded awareness less verbose and distracting
 
 

diff --git a/proto_src/items/ammo/00000358.yml b/proto_src/items/ammo/00000358.yml
@@ -18,7 +18,7 @@ soundId: '0'
 ammoData:
   caliber: 15
   quantity: 10
-  armorClassMod: -30
+  armorClassMod: -20
   damageResistanceMod: -50
   damageMult: 1
   damageDiv: 1
diff --git a/proto_src/items/weapon/00000011.yml b/proto_src/items/weapon/00000011.yml
@@ -28,7 +28,7 @@ weaponData:
   actionPointCost1: 5
   actionPointCost2: 0
   criticalFailureType: 2
-  perk: PERK_WEAPON_ACCURATE
+  perk: PERK_WEAPON_LONG_RANGE
   rounds: 0
   caliber: 5
   ammoTypePid: 34

diff --git a/proto_src/items/weapon/00000023.yml b/proto_src/items/weapon/00000023.yml
@@ -29,7 +29,7 @@ weaponData:
   actionPointCost1: 5
   actionPointCost2: 6
   criticalFailureType: 2
-  perk: PERK_WEAPON_ACCURATE
+  perk: PERK_WEAPON_LONG_RANGE
   rounds: 8
   caliber: 6
   ammoTypePid: 35

diff --git a/proto_src/items/weapon/00000351.yml b/proto_src/items/weapon/00000351.yml
@@ -29,7 +29,7 @@ weaponData:
   actionPointCost1: 5
   actionPointCost2: 6
   criticalFailureType: 2
-  perk: PERK_WEAPON_ACCURATE
+  perk: NONE
   rounds: 5
   caliber: 18
   ammoTypePid: 363

diff --git a/proto_src/items/weapon/00000355.yml b/proto_src/items/weapon/00000355.yml
@@ -30,7 +30,7 @@ weaponData:
   actionPointCost1: 5
   actionPointCost2: 6
   criticalFailureType: 2
-  perk: PERK_WEAPON_ACCURATE
+  perk: PERK_WEAPON_LONG_RANGE
   rounds: 10
   caliber: 5
   ammoTypePid: 34

diff --git a/proto_src/items/weapon/00000394.yml b/proto_src/items/weapon/00000394.yml
@@ -29,7 +29,7 @@ weaponData:
   actionPointCost1: 4
   actionPointCost2: 0
   criticalFailureType: 2
-  perk: PERK_WEAPON_ACCURATE
+  perk: NONE
   rounds: 0
   caliber: 15
   ammoTypePid: 358

diff --git a/proto_src/items/weapon/00000405.yml b/proto_src/items/weapon/00000405.yml
@@ -29,7 +29,7 @@ weaponData:
   actionPointCost1: 5
   actionPointCost2: 6
   criticalFailureType: 2
-  perk: PERK_WEAPON_ACCURATE
+  perk: PERK_WEAPON_LONG_RANGE
   rounds: 8
   caliber: 6
   ammoTypePid: 35

diff --git a/proto_src/items/weapon/00000421.yml b/proto_src/items/weapon/00000421.yml
@@ -4,7 +4,7 @@ name: Holy Hand Grenade
 description: A Holy relic of godly might.
 fid: 122
 lightDistance: 2
-lightIntensity: 65536
+lightIntensity: 65535
 flags: '0xa0000008'
 extendedFlags: '0xa005'
 sid: -1
@@ -27,7 +27,7 @@ weaponData:
   actionPointCost1: 4
   actionPointCost2: 0
   criticalFailureType: 4
-  perk: PERK_WEAPON_LONG_RANGE
+  perk: PERK_WEAPON_PENETRATE
   rounds: 0
   caliber: 0
   ammoTypePid: -1

diff --git a/proto_src/items/weapon/00000500.yml b/proto_src/items/weapon/00000500.yml
@@ -29,7 +29,7 @@ weaponData:
   actionPointCost1: 5
   actionPointCost2: 6
   criticalFailureType: 2
-  perk: PERK_WEAPON_ACCURATE
+  perk: NONE
   rounds: 8
   caliber: 18
   ammoTypePid: 363

diff --git a/root/data/proto/items/00000011.pro b/root/data/proto/items/00000011.pro
diff --git a/root/data/proto/items/00000023.pro b/root/data/proto/items/00000023.pro
diff --git a/root/data/proto/items/00000351.pro b/root/data/proto/items/00000351.pro
diff --git a/root/data/proto/items/00000355.pro b/root/data/proto/items/00000355.pro
diff --git a/root/data/proto/items/00000358.pro b/root/data/proto/items/00000358.pro
diff --git a/root/data/proto/items/00000394.pro b/root/data/proto/items/00000394.pro
diff --git a/root/data/proto/items/00000405.pro b/root/data/proto/items/00000405.pro
diff --git a/root/data/proto/items/00000421.pro b/root/data/proto/items/00000421.pro
diff --git a/root/data/proto/items/00000500.pro b/root/data/proto/items/00000500.pro