Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected the Colt SMG mag size to 32 #603

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Corrected the Colt SMG mag size to 32 #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2303f4e
Increased colt 635 smg capacity from 30 to 32
GuiShing Jun 25, 2021
8c0148f
Accurate 32 rounds for colt smg
GuiShing Jun 25, 2021
9bb637d
Made the ColtSMG class usable
GuiShing Jun 25, 2021
a8ed63f
Corrected colt smg mag size to 32 rounds
GuiShing Jun 25, 2021
1259229
Mistake with unchanged ammo count for JSP
GuiShing Jun 25, 2021
940ad68
Fixed Colt SMG JSP mag count
GuiShing Jun 25, 2021
393f819
Fixed ammo types not showing up in campaign
GuiShing Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Content/Classes/SwatAmmo.u
View file
Open in desktop
Binary file not shown.
30 changes: 23 additions & 7 deletions System/SwatEquipment.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,13 +2149,13 @@ IronSightRotationOffset=(Pitch=-85,Yaw=0,Roll=100)
PlayerUsable=true

;; Ammo information
PlayerAmmoOption=SwatAmmo.MP5SMG_AP
PlayerAmmoOption=SwatAmmo.MP5SMG_FMJ
PlayerAmmoOption=SwatAmmo.MP5SMG_JSP
PlayerAmmoOption=SwatAmmo.MP5SMG_JHP
EnemyUsesAmmo=(AmmoClass="SwatAmmo.MP5SMG_FMJ",Chance=75)
EnemyUsesAmmo=(AmmoClass="SwatAmmo.MP5SMG_JHP",Chance=15)
EnemyUsesAmmo=(AmmoClass="SwatAmmo.MP5SMG_AP",Chance=10)
PlayerAmmoOption=SwatAmmo.ColtSMG_AP
PlayerAmmoOption=SwatAmmo.ColtSMG_FMJ
PlayerAmmoOption=SwatAmmo.ColtSMG_JSP
PlayerAmmoOption=SwatAmmo.ColtSMG_JHP
EnemyUsesAmmo=(AmmoClass="SwatAmmo.ColtSMG_FMJ",Chance=75)
EnemyUsesAmmo=(AmmoClass="SwatAmmo.ColtSMG_JHP",Chance=15)
EnemyUsesAmmo=(AmmoClass="SwatAmmo.ColtSMG_AP",Chance=10)

;; Weight and Bulk -- need jose fix
Weight=2.88
Expand Down Expand Up @@ -7648,6 +7648,22 @@ EquipmentClassName=SwatAmmo.AK47MG_AP
Validity=NETVALID_All
TeamValidity=TEAMVALID_All
bSelectable=1
EquipmentClassName=SwatAmmo.ColtSMG_FMJ
Validity=NETVALID_All
TeamValidity=TEAMVALID_All
bSelectable=1
EquipmentClassName=SwatAmmo.ColtSMG_JHP
Validity=NETVALID_All
TeamValidity=TEAMVALID_All
bSelectable=1
EquipmentClassName=SwatAmmo.ColtSMG_JSP
Validity=NETVALID_All
TeamValidity=TEAMVALID_All
bSelectable=1
EquipmentClassName=SwatAmmo.ColtSMG_AP
Validity=NETVALID_All
TeamValidity=TEAMVALID_All
bSelectable=1
EquipmentClassName=SwatAmmo.UZISMG_FMJ
Validity=NETVALID_All
TeamValidity=TEAMVALID_All
Expand Down
2 changes: 1 addition & 1 deletion System/SwatEquipment.int
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ Caliber=9x19mm
CountryOfOrigin=United States
ProductionStart=1982
FireModes=Semi-Automatic, Full-Auto
MagazineSizeString=30
MagazineSizeString=32
TotalAmmoString=10 magazines
RateOfFire=800 RPM

Expand Down