diff --git a/mods/ra/bits/ammobox.shp b/mods/ra/bits/ammobox.shp deleted file mode 100644 index 5a0e0c5c64..0000000000 Binary files a/mods/ra/bits/ammobox.shp and /dev/null differ diff --git a/mods/ra/bits/ammobox1.shp b/mods/ra/bits/ammobox1.shp new file mode 100644 index 0000000000..72470607b2 Binary files /dev/null and b/mods/ra/bits/ammobox1.shp differ diff --git a/mods/ra/bits/ammobox2.shp b/mods/ra/bits/ammobox2.shp new file mode 100644 index 0000000000..c61eb2063e Binary files /dev/null and b/mods/ra/bits/ammobox2.shp differ diff --git a/mods/ra/bits/ammobox3.shp b/mods/ra/bits/ammobox3.shp new file mode 100644 index 0000000000..9a4b82679a Binary files /dev/null and b/mods/ra/bits/ammobox3.shp differ diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 569738261d..e5230a16d3 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -273,21 +273,14 @@ BRL3: TargetableBuilding: TargetTypes: Ground, DemoTruck -AMMOBOX: - Inherits: ^TechBuilding - Selectable: - Priority: 0 - Health: - HP: 10 - Explodes: - Weapon: UnitExplode - Tooltip: - Name: Ammo Box - AutoTargetIgnore: - Armor: - Type: Light - TargetableBuilding: - TargetTypes: Ground, DemoTruck +AMMOBOX1: + Inherits: ^AmmoBox + +AMMOBOX2: + Inherits: ^AmmoBox + +AMMOBOX3: + Inherits: ^AmmoBox MISS: Inherits: ^TechBuilding diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 0a63ac8370..b9abf0f52b 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -291,6 +291,22 @@ -Capturable: -CapturableBar: +^AmmoBox: + Inherits: ^TechBuilding + Selectable: + Priority: 0 + Health: + HP: 10 + Explodes: + Weapon: UnitExplode + Tooltip: + Name: Ammo Box + AutoTargetIgnore: + Armor: + Type: Light + TargetableBuilding: + TargetTypes: Ground, DemoTruck + ^CivInfantry: Inherits: ^Infantry Selectable: diff --git a/mods/ra/sequences/map.yaml b/mods/ra/sequences/map.yaml index e84142bbdd..12e722a647 100644 --- a/mods/ra/sequences/map.yaml +++ b/mods/ra/sequences/map.yaml @@ -635,11 +635,23 @@ utilpol2: dead: Start: 1 -ammobox: # TODO: there are 2 more variants, but the editor does not like the split up +ammobox1: idle: Start: 0 Length: 1 +ammobox2: + idle: + Start: 0 + Length: 1 + + +ammobox3: + idle: + Start: 0 + Length: 1 + + tanktrap1: idle: Start: 0