diff --git a/lua/weapontweakdata.lua b/lua/weapontweakdata.lua index e52c9d2..7167a24 100644 --- a/lua/weapontweakdata.lua +++ b/lua/weapontweakdata.lua @@ -715,7 +715,7 @@ self.hailstorm.fire_mode_data.volley.ammo_usage = 120 -- Izhma self.saiga.rays = 8 self.saiga.stats.damage = 30 -self.saiga.stats.spread = 12 +self.saiga.stats.spread = 14 self.saiga.AMMO_MAX = total_ammo_tables.shot_very_high self.saiga.AMMO_PICKUP = pickup_tables.shot_very_high self.saiga.kick = kick_tables.shot_auto @@ -726,7 +726,7 @@ self.saiga.recoil_recovery_timer = recovery_tables.high -- Steakout self.aa12.rays = 8 self.aa12.stats.damage = 30 -self.aa12.stats.spread = 12 +self.aa12.stats.spread = 14 self.aa12.AMMO_MAX = total_ammo_tables.shot_very_high self.aa12.AMMO_PICKUP = pickup_tables.shot_very_high self.aa12.fire_mode_data.fire_rate = 60 / 333 @@ -738,7 +738,7 @@ self.aa12.recoil_recovery_timer = recovery_tables.high -- VD-12 self.sko12.rays = 8 self.sko12.stats.damage = 40 -self.sko12.stats.spread = 12 +self.sko12.stats.spread = 14 self.sko12.stats.recoil = 8 self.sko12.stats.reload = 9 self.sko12.stats.concealment = 2 @@ -754,7 +754,7 @@ self.sko12.kick = kick_tables.shot_low -- M1014 self.benelli.rays = 8 self.benelli.stats.damage = 40 -self.benelli.stats.spread = 12 +self.benelli.stats.spread = 16 self.benelli.AMMO_MAX = total_ammo_tables.shot_high self.benelli.AMMO_PICKUP = pickup_tables.shot_high self.benelli.fire_mode_data.fire_rate = 60 / 383 @@ -764,7 +764,7 @@ self.benelli.kick = kick_tables.shot_low -- Predator self.spas12.rays = 8 self.spas12.stats.damage = 40 -self.spas12.stats.spread = 12 +self.spas12.stats.spread = 16 self.spas12.AMMO_MAX = total_ammo_tables.shot_high self.spas12.AMMO_PICKUP = pickup_tables.shot_high self.spas12.fire_mode_data.fire_rate = 60 / 383 @@ -776,6 +776,7 @@ self.ksg.rays = 8 self.ksg.stats.damage = 50 self.ksg.stats.concealment = 20 self.ksg.stats.reload = 12 +self.ksg.stats.spread = 16 self.ksg.CLIP_AMMO_MAX = 8 self.ksg.AMMO_MAX = total_ammo_tables.shot_mid self.ksg.AMMO_PICKUP = pickup_tables.shot_mid @@ -786,6 +787,7 @@ self.ksg.damage_falloff = FALLOFF_TEMPLATE.SHOTGUN_FALL_MODERATE -- Nova self.supernova.rays = 8 self.supernova.stats.damage = 50 +self.supernova.stats.spread = 16 self.supernova.AMMO_MAX = total_ammo_tables.shot_mid self.supernova.AMMO_PICKUP = pickup_tables.shot_mid self.supernova.fire_mode_data.fire_rate = 0.6 @@ -795,6 +797,7 @@ self.supernova.kick = kick_tables.shot_low -- Reinfeld 880 self.r870.rays = 8 self.r870.stats.damage = 50 +self.r870.stats.spread = 16 self.r870.CLIP_AMMO_MAX = 8 self.r870.AMMO_MAX = total_ammo_tables.shot_mid self.r870.AMMO_PICKUP = pickup_tables.shot_mid @@ -806,6 +809,7 @@ self.r870.kick = kick_tables.shot_low self.m590.rays = 8 self.m590.stats.reload = 11 self.m590.stats.damage = 50 +self.m590.stats.spread = 16 self.m590.stats.concealment = 8 self.m590.AMMO_MAX = total_ammo_tables.shot_mid self.m590.AMMO_PICKUP = pickup_tables.shot_mid @@ -816,6 +820,7 @@ self.m590.kick = kick_tables.shot_low -- Breaker self.boot.rays = 8 self.boot.stats.damage = 60 +self.boot.stats.spread = 17 self.boot.AMMO_MAX = total_ammo_tables.shot_low self.boot.AMMO_PICKUP = pickup_tables.shot_low self.boot.fire_mode_data.fire_rate = 0.8 @@ -825,6 +830,7 @@ self.boot.damage_falloff = FALLOFF_TEMPLATE.SHOTGUN_FALL_HIGH -- Reinfeld 88 (Trench Gun) self.m1897.rays = 8 self.m1897.stats.damage = 60 +self.m1897.stats.spread = 17 self.m1897.AMMO_MAX = total_ammo_tables.shot_low self.m1897.AMMO_PICKUP = pickup_tables.shot_low self.m1897.fire_mode_data.fire_rate = 0.8 @@ -835,6 +841,7 @@ self.m1897.kick = kick_tables.shot_high self.m37.use_data.selection_index = SELECTION.PRIMARY self.m37.rays = 8 self.m37.stats.damage = 60 +self.m37.stats.spread = 17 self.m37.AMMO_MAX = total_ammo_tables.shot_low self.m37.AMMO_PICKUP = pickup_tables.shot_low self.m37.fire_mode_data.fire_rate = 0.8 @@ -844,6 +851,7 @@ self.m37.damage_falloff = FALLOFF_TEMPLATE.SHOTGUN_FALL_HIGH -- Mosconi self.huntsman.rays = 8 self.huntsman.stats.damage = 80 +self.huntsman.stats.spread = 19 self.huntsman.AMMO_MAX = total_ammo_tables.shot_very_low self.huntsman.AMMO_PICKUP = pickup_tables.shot_very_low self.huntsman.kick = kick_tables.shot_high @@ -852,6 +860,7 @@ self.huntsman.kick = kick_tables.shot_high -- Joceline self.b682.rays = 8 self.b682.stats.damage = 80 +self.b682.stats.spread = 19 self.b682.AMMO_MAX = total_ammo_tables.shot_very_low self.b682.AMMO_PICKUP = pickup_tables.shot_very_low self.b682.kick = kick_tables.shot_high @@ -860,6 +869,7 @@ self.b682.kick = kick_tables.shot_high -- Claire self.coach.rays = 8 self.coach.stats.damage = 80 +self.coach.stats.spread = 19 self.coach.AMMO_MAX = total_ammo_tables.shot_very_low self.coach.AMMO_PICKUP = pickup_tables.shot_special self.coach.kick = kick_tables.shot_high @@ -868,8 +878,9 @@ self.coach.kick = kick_tables.shot_high -- Judge self.judge.rays = 8 self.judge.stats.damage = 50 +self.judge.stats.spread = 15 self.judge.AMMO_MAX = total_ammo_tables.shot_very_low -self.judge.AMMO_PICKUP = pickup_tables.shot_special +self.judge.AMMO_PICKUP = pickup_tables.shot_very_low self.judge.AMMO_MAX = 25 self.judge.kick = kick_tables.shot_low --self.judge.damage_falloff = FALLOFF_TEMPLATE.SHOTGUN_FALL_HIGH @@ -879,6 +890,7 @@ self.serbu.AMMO_MAX = 24 self.serbu.CLIP_AMMO_MAX = 4 self.serbu.rays = 8 self.serbu.stats.damage = 50 +self.serbu.stats.spread = 15 self.serbu.AMMO_MAX = total_ammo_tables.shot_low self.serbu.AMMO_PICKUP = pickup_tables.shot_low self.serbu.fire_mode_data.fire_rate = 0.6 @@ -889,6 +901,7 @@ self.serbu.kick = kick_tables.shot_low self.rota.rays = 8 self.rota.stats.damage = 40 self.rota.stats.concealment = 20 +self.rota.stats.spread = 14 self.rota.AMMO_MAX = total_ammo_tables.shot_high self.rota.AMMO_PICKUP = pickup_tables.shot_high self.rota.kick = kick_tables.shot_low @@ -898,6 +911,7 @@ self.rota.kick = kick_tables.shot_low self.striker.rays = 8 self.striker.stats.damage = 40 self.striker.stats.concealment = 24 +self.striker.stats.spread = 14 self.striker.AMMO_MAX = total_ammo_tables.shot_high self.striker.AMMO_PICKUP = pickup_tables.shot_high self.striker.kick = kick_tables.shot_low @@ -906,6 +920,7 @@ self.striker.kick = kick_tables.shot_low -- Grimm self.basset.rays = 8 self.basset.stats.damage = 30 +self.basset.stats.spread = 14 self.basset.AMMO_MAX = total_ammo_tables.shot_high self.basset.AMMO_PICKUP = pickup_tables.shot_very_high self.basset.kick = kick_tables.shot_auto @@ -918,6 +933,7 @@ self.ultima.rays = 8 self.ultima.stats.damage = 60 self.ultima.stats.reload = 10 self.ultima.stats.concealment = 17 +self.ultima.stats.spread = 16 self.ultima.AMMO_MAX = total_ammo_tables.shot_very_low self.ultima.AMMO_PICKUP = pickup_tables.shot_very_low self.ultima.kick = kick_tables.shot_low @@ -1523,6 +1539,7 @@ self.ray.categories = {"grenade_launcher", "heavy"} self.ray.stats.damage = 128 self.ray.stats_modifiers = {damage = 10} self.ray.stats.reload = 8 +self.ray.has_description = false self.ray.AMMO_PICKUP = {0.05, 0.05} -- RPG @@ -1709,11 +1726,10 @@ for weap_id, weap_data in pairs(self) do -- Increase moving spread if weap_data.spread then weap_data.spread.standing = 3 - weap_data.spread.crouching = weap_data.spread.standing * 0.833 - weap_data.spread.steelsight = weap_data.spread.standing * 0.666 + weap_data.spread.crouching = 2.5 + weap_data.spread.steelsight = 1.2 weap_data.spread.moving_standing = weap_data.spread.standing * 1.33 weap_data.spread.moving_crouching = weap_data.spread.crouching * 1.33 - weap_data.spread.moving_steelsight = weap_data.spread.steelsight * 1.33 weap_data.spread.bipod = weap_data.spread.standing * 0.5 end end