Start with weapons loaded

OCCMCTeam · Nov 17, 2018 · 774c826 · 774c826
1 parent c35b4dc
commit 774c826
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 0 deletions.
diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/AntiTankWeapon.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/AntiTankWeapon.ocd/Script.c
@@ -19,6 +19,8 @@ public func Initialize()
 	ClearFiremodes();
 	AddFiremode(FiremodeMissiles_TechniqueOptical());
 	AddFiremode(FiremodeMissiles_TechniqueUnguided());
+
+	StartLoaded();
 }
 
 func Definition(id weapon)

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/AssaultRifle.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/AssaultRifle.ocd/Script.c
@@ -27,6 +27,7 @@ public func Initialize()
 	AddFiremode(FiremodeGrenades_Cluster());
 	AddFiremode(FiremodeGrenades_Smoke());
 
+	StartLoaded();
 }
 
 func Definition(id weapon)
@@ -203,6 +204,19 @@ local ReloadStateMap =
 	Magazine_LoadAmmoChamber = { Delay = 15, EndCall = "PlaySoundChamberBullet", },
 };
 
+
+public func AmmoChamberCapacity(id ammo)
+{
+	if (ammo == CMC_Ammo_Bullets)
+	{
+		return 1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
 /* --- Effects --- */
 
 func OnFireProjectile(object user, object projectile, proplist firemode)

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c
@@ -22,6 +22,8 @@ public func Initialize()
 	AddFiremode(FiremodeGrenades_Explosive());
 	AddFiremode(FiremodeGrenades_Cluster());
 	AddFiremode(FiremodeGrenades_Smoke());
+
+	StartLoaded();
 }
 
 func Definition(id weapon)

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/MachineGun.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/MachineGun.ocd/Script.c
@@ -21,6 +21,8 @@ public func Initialize()
 	ClearFiremodes();
 	AddFiremode(FiremodeBullets_TechniqueAuto());
 	AddFiremode(FiremodeBullets_TechniqueBurst());
+
+	StartLoaded();
 }
 
 func Definition(id weapon)

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/Pistol.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/Pistol.ocd/Script.c
@@ -22,6 +22,8 @@ public func Initialize()
 	ClearFiremodes();
 	AddFiremode(FiremodeBullets_TechniqueSingle());
 	AddFiremode(FiremodeBullets_TechniqueTracerDart());
+
+	StartLoaded();
 }
 
 func Definition(id def)

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/Revolver.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/Revolver.ocd/Script.c
@@ -22,6 +22,8 @@ public func Initialize()
 	// Fire mode list
 	ClearFiremodes();
 	AddFiremode(FiremodeBullets_TechniqueSingle());
+
+	StartLoaded();
 }
 
 

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/RocketLauncher.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/RocketLauncher.ocd/Script.c
@@ -24,6 +24,8 @@ public func Initialize()
 	ClearFiremodes();
 	AddFiremode(FiremodeMissiles_TechniqueOptical());
 	AddFiremode(FiremodeMissiles_TechniqueUnguided());
+
+	StartLoaded();
 }
 
 func Definition(id weapon)

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/Shotgun.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/Shotgun.ocd/Script.c
@@ -21,6 +21,8 @@ public func Initialize()
 	// Fire mode list
 	ClearFiremodes();
 	AddFiremode(FiremodeBullets_TechniqueSpreadshot());
+
+	StartLoaded();
 }
 
 func Definition(id weapon)

diff --git a/ModernCombat.ocd/Items.ocd/Weapons.ocd/SubmachineGun.ocd/Script.c b/ModernCombat.ocd/Items.ocd/Weapons.ocd/SubmachineGun.ocd/Script.c
@@ -23,6 +23,8 @@ public func Initialize()
 	AddFiremode(FiremodeBullets_TechniqueAuto());
 	AddFiremode(FiremodeBullets_TechniqueBurst());
 	AddFiremode(FiremodeBullets_TechniqueSingle());
+
+	StartLoaded();
 }
 
 func Definition(id weapon)

diff --git a/ModernCombat.ocd/Libraries.ocd/Firearm.ocd/Script.c b/ModernCombat.ocd/Libraries.ocd/Firearm.ocd/Script.c
@@ -913,3 +913,22 @@ func IsUserReadyToReload(object user)
 {
 	return user->HasActionProcedure(false);
 }
+
+func StartLoaded()
+{
+	var ammo_types = [];
+	for (var firemode in GetFiremodes())
+	{
+		// Do it only once per ammo type
+		var type = firemode->GetAmmoID();
+		var amount = firemode->GetAmmoAmount();
+		if (!IsValueInArray(ammo_types, type))
+		{
+			// Loaded
+			SetAmmo(type, amount);
+			// Bullet is chambered (library call already checks whether it is necessary, etc.)
+			this->~AmmoChamberInsert(type);
+			PushBack(ammo_types, type);
+		}
+	}
+}