Merge pull request #7324 from reaperrr/limitedammo2

Refactored LimitedAmmo to AmmoPool

mods/cnc/rules/aircraft.yaml

@@ -76,12 +76,12 @@ HELI:
 		MuzzleSequence: muzzle
 	AttackHeli:
 		FacingTolerance: 20
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 10
 		PipCount: 5
-	Reloads:
-		Count: 10
-		Period: 200
+		SelfReloads: true
+		ReloadCount: 10
+		SelfReloadTicks: 200
 	RenderUnit:
 	WithRotor:
 		Offset: 0,0,85
@@ -124,12 +124,12 @@ ORCA:
 		LocalOffset: 427,-171,-213, 427,171,-213
 	AttackHeli:
 		FacingTolerance: 20
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 6
 		PipCount: 6
-	Reloads:
-		Count: 2
-		Period: 100
+		SelfReloads: true
+		ReloadCount: 2
+		SelfReloadTicks: 100
 	RenderUnit:
 	LeavesHusk:
 		HuskActor: ORCA.Husk

mods/d2k/rules/aircraft.yaml

@@ -159,7 +159,7 @@ orni.bomber:
 		RepairBuildings: repair
 		RearmBuildings:
 		Repulsable: False
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 5
 	RenderUnit:
 		Image: orni

mods/ra/maps/fort-lonestar/map.yaml

@@ -681,7 +681,7 @@ Rules:
 		Plane:
 			ROT: 5
 			Speed: 280
-		LimitedAmmo:
+		AmmoPool:
 			Ammo: 30
 		RenderUnit:
 			Image: mig

mods/ra/maps/intervention/map.yaml

@@ -2273,7 +2273,7 @@ Rules:
 	MIG:
 		Buildable:
 			Prerequisites: ~afld
-		LimitedAmmo:
+		AmmoPool:
 			Ammo: 2
 	HELI:
 		Buildable:

mods/ra/rules/aircraft.yaml

@@ -51,7 +51,7 @@ BADR.Bomber:
 		Speed: 149
 		Repulsable: False
 		MaximumPitch: 56
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 7
 	RenderUnit:
 		Image: badr
@@ -113,7 +113,7 @@ MIG:
 		EnableStances: false
 	RenderUnit:
 		CameraPitch: 99
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 8
 	ReturnOnIdle:
 	Selectable:
@@ -171,7 +171,7 @@ YAK:
 		EnableStances: false
 	RenderUnit:
 		CameraPitch: 99
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 18
 		PipCount: 6
 		ReloadTicks: 11
@@ -264,7 +264,7 @@ HELI:
 	RenderUnit:
 	WithRotor:
 		Offset: 0,0,85
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 8
 	Selectable:
 		Bounds: 36,28,0,0
@@ -312,7 +312,7 @@ HIND:
 		InitialStance: HoldFire
 	RenderUnit:
 	WithRotor:
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 24
 		PipCount: 6
 		ReloadTicks: 8

mods/ra/rules/vehicles.yaml

@@ -419,8 +419,9 @@ MNLY.AP:
 	Minelayer:
 		Mine: MINP
 	MineImmune:
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 5
+		RearmSound: minelay1.aud
 	DetectCloaked:
 		Range: 5
 		CloakTypes: Mine
@@ -453,8 +454,9 @@ MNLY.AT:
 	Minelayer:
 		Mine: MINV
 	MineImmune:
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 5
+		RearmSound: minelay1.aud
 	DetectCloaked:
 		Range: 5
 		CloakTypes: Mine

mods/ts/rules/aircraft.yaml

@@ -27,7 +27,7 @@ DPOD:
 	Armament:
 		Weapon: Vulcan2
 	AttackHeli:
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 5
 		PipCount: 5
 		PipType: Ammo
@@ -95,7 +95,7 @@ ORCA:
 		Weapon: Hellfire
 	AttackHeli:
 		FacingTolerance: 20
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 5
 		PipCount: 5
 		PipType: Ammo
@@ -132,7 +132,7 @@ ORCAB:
 		Weapon: Bomb
 	AttackHeli:
 		FacingTolerance: 20
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 2
 		PipCount: 2
 		PipType: Ammo
@@ -228,7 +228,7 @@ SCRIN:
 		Weapon: Proton
 	AttackHeli:
 		FacingTolerance: 20
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 3
 		PipCount: 3
 		PipType: Ammo
@@ -264,7 +264,7 @@ APACHE:
 		Weapon: HarpyClaw
 	AttackHeli:
 		FacingTolerance: 20
-	LimitedAmmo:
+	AmmoPool:
 		Ammo: 12
 		PipCount: 4
 		PipType: Ammo