From dd579cd200ba6bf845e9f3c1a4e78fed4465a0e5 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 12 Jun 2024 20:59:47 +0800 Subject: [PATCH] merge --- Guns/HG/MP-443/{MP443_12 => mp443_18}/English.dat | 0 .../MP-443/{MP443_12/MP443_12.dat => mp443_18/mp443_18.dat} | 0 Guns/HG/P226/{P226_12 => p226_20}/English.dat | 0 Guns/HG/P226/{P226_12/P226_12.dat => p226_20/p226_20.dat} | 0 Guns/HG/P226/{P226R => p226r_tactical}/English.dat | 0 .../{P226R/P226R.dat => p226r_tactical/p226r_tactical.dat} | 0 Guns/HG/PRB92/PRB92/PRB92.dat | 2 +- Guns/MG/KORD/{KORD => KORD127}/English.dat | 0 Guns/MG/KORD/{KORD/KORD.dat => KORD127/KORD127.dat} | 4 ++-- Guns/MG/KORD/{KORD_200 => KORD_20}/English.dat | 0 Guns/MG/KORD/{KORD_200/KORD_200.dat => KORD_20/KORD_20.dat} | 2 +- Guns/MG/Negev/{Shredder => negev}/English.dat | 0 Guns/MG/Negev/{Shredder/Shredder.dat => negev/negev.dat} | 6 +++--- Guns/MG/Negev/{Shredder_200 => negev_150}/English.dat | 0 .../Shredder_200.dat => negev_150/negev_150.dat} | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename Guns/HG/MP-443/{MP443_12 => mp443_18}/English.dat (100%) rename Guns/HG/MP-443/{MP443_12/MP443_12.dat => mp443_18/mp443_18.dat} (100%) rename Guns/HG/P226/{P226_12 => p226_20}/English.dat (100%) rename Guns/HG/P226/{P226_12/P226_12.dat => p226_20/p226_20.dat} (100%) rename Guns/HG/P226/{P226R => p226r_tactical}/English.dat (100%) rename Guns/HG/P226/{P226R/P226R.dat => p226r_tactical/p226r_tactical.dat} (100%) rename Guns/MG/KORD/{KORD => KORD127}/English.dat (100%) rename Guns/MG/KORD/{KORD/KORD.dat => KORD127/KORD127.dat} (98%) rename Guns/MG/KORD/{KORD_200 => KORD_20}/English.dat (100%) rename Guns/MG/KORD/{KORD_200/KORD_200.dat => KORD_20/KORD_20.dat} (98%) rename Guns/MG/Negev/{Shredder => negev}/English.dat (100%) rename Guns/MG/Negev/{Shredder/Shredder.dat => negev/negev.dat} (97%) rename Guns/MG/Negev/{Shredder_200 => negev_150}/English.dat (100%) rename Guns/MG/Negev/{Shredder_200/Shredder_200.dat => negev_150/negev_150.dat} (100%) diff --git a/Guns/HG/MP-443/MP443_12/English.dat b/Guns/HG/MP-443/mp443_18/English.dat similarity index 100% rename from Guns/HG/MP-443/MP443_12/English.dat rename to Guns/HG/MP-443/mp443_18/English.dat diff --git a/Guns/HG/MP-443/MP443_12/MP443_12.dat b/Guns/HG/MP-443/mp443_18/mp443_18.dat similarity index 100% rename from Guns/HG/MP-443/MP443_12/MP443_12.dat rename to Guns/HG/MP-443/mp443_18/mp443_18.dat diff --git a/Guns/HG/P226/P226_12/English.dat b/Guns/HG/P226/p226_20/English.dat similarity index 100% rename from Guns/HG/P226/P226_12/English.dat rename to Guns/HG/P226/p226_20/English.dat diff --git a/Guns/HG/P226/P226_12/P226_12.dat b/Guns/HG/P226/p226_20/p226_20.dat similarity index 100% rename from Guns/HG/P226/P226_12/P226_12.dat rename to Guns/HG/P226/p226_20/p226_20.dat diff --git a/Guns/HG/P226/P226R/English.dat b/Guns/HG/P226/p226r_tactical/English.dat similarity index 100% rename from Guns/HG/P226/P226R/English.dat rename to Guns/HG/P226/p226r_tactical/English.dat diff --git a/Guns/HG/P226/P226R/P226R.dat b/Guns/HG/P226/p226r_tactical/p226r_tactical.dat similarity index 100% rename from Guns/HG/P226/P226R/P226R.dat rename to Guns/HG/P226/p226r_tactical/p226r_tactical.dat diff --git a/Guns/HG/PRB92/PRB92/PRB92.dat b/Guns/HG/PRB92/PRB92/PRB92.dat index 0d49c13..4bb9504 100644 --- a/Guns/HG/PRB92/PRB92/PRB92.dat +++ b/Guns/HG/PRB92/PRB92/PRB92.dat @@ -15,7 +15,7 @@ Size2_Z 0.35 Barrel 12144 -Magazine 1022 +Magazine 11074 Hook_Tactical Hook_Barrel diff --git a/Guns/MG/KORD/KORD/English.dat b/Guns/MG/KORD/KORD127/English.dat similarity index 100% rename from Guns/MG/KORD/KORD/English.dat rename to Guns/MG/KORD/KORD127/English.dat diff --git a/Guns/MG/KORD/KORD/KORD.dat b/Guns/MG/KORD/KORD127/KORD127.dat similarity index 98% rename from Guns/MG/KORD/KORD/KORD.dat rename to Guns/MG/KORD/KORD127/KORD127.dat index 49773da..9dc2aff 100644 --- a/Guns/MG/KORD/KORD/KORD.dat +++ b/Guns/MG/KORD/KORD127/KORD127.dat @@ -77,9 +77,9 @@ Ballistic_Steps 45 Ballistic_Travel 9 Recoil_Aim 3 -Recoil_Min_X -10 +Recoil_Min_X -5 Recoil_Min_Y 6 -Recoil_Max_X 4 +Recoil_Max_X 2 Recoil_Max_Y 10 Recover_X 0.6 diff --git a/Guns/MG/KORD/KORD_200/English.dat b/Guns/MG/KORD/KORD_20/English.dat similarity index 100% rename from Guns/MG/KORD/KORD_200/English.dat rename to Guns/MG/KORD/KORD_20/English.dat diff --git a/Guns/MG/KORD/KORD_200/KORD_200.dat b/Guns/MG/KORD/KORD_20/KORD_20.dat similarity index 98% rename from Guns/MG/KORD/KORD_200/KORD_200.dat rename to Guns/MG/KORD/KORD_20/KORD_20.dat index 64519f4..c98f617 100644 --- a/Guns/MG/KORD/KORD_200/KORD_200.dat +++ b/Guns/MG/KORD/KORD_20/KORD_20.dat @@ -8,7 +8,7 @@ Size_X 2 Size_Y 2 Size_Z 0.25 -Amount 200 +Amount 50 Count_Min 0 Count_Max 0 diff --git a/Guns/MG/Negev/Shredder/English.dat b/Guns/MG/Negev/negev/English.dat similarity index 100% rename from Guns/MG/Negev/Shredder/English.dat rename to Guns/MG/Negev/negev/English.dat diff --git a/Guns/MG/Negev/Shredder/Shredder.dat b/Guns/MG/Negev/negev/negev.dat similarity index 97% rename from Guns/MG/Negev/Shredder/Shredder.dat rename to Guns/MG/Negev/negev/negev.dat index f5c7273..678a897 100644 --- a/Guns/MG/Negev/Shredder/Shredder.dat +++ b/Guns/MG/Negev/negev/negev.dat @@ -77,9 +77,9 @@ Ballistic_Steps 21 Ballistic_Travel 15 Recoil_Min_X -3 -Recoil_Min_Y 8 -Recoil_Max_X 6 -Recoil_Max_Y 13 +Recoil_Min_Y 4 +Recoil_Max_X 3 +Recoil_Max_Y 6 Recover_X 0.6 Recover_Y 0.6 diff --git a/Guns/MG/Negev/Shredder_200/English.dat b/Guns/MG/Negev/negev_150/English.dat similarity index 100% rename from Guns/MG/Negev/Shredder_200/English.dat rename to Guns/MG/Negev/negev_150/English.dat diff --git a/Guns/MG/Negev/Shredder_200/Shredder_200.dat b/Guns/MG/Negev/negev_150/negev_150.dat similarity index 100% rename from Guns/MG/Negev/Shredder_200/Shredder_200.dat rename to Guns/MG/Negev/negev_150/negev_150.dat