diff --git a/mods/cnc/maps/Instant_Karma.oramap b/mods/cnc/maps/Instant_Karma.oramap index ad9f67f73c..1f5b9761f7 100644 Binary files a/mods/cnc/maps/Instant_Karma.oramap and b/mods/cnc/maps/Instant_Karma.oramap differ diff --git a/mods/cnc/maps/Nullpeter.oramap b/mods/cnc/maps/Nullpeter.oramap index 7397c487b3..dc025761fa 100644 Binary files a/mods/cnc/maps/Nullpeter.oramap and b/mods/cnc/maps/Nullpeter.oramap differ diff --git a/mods/cnc/maps/break_of_day.oramap b/mods/cnc/maps/break_of_day.oramap index 703c40be87..0a81ace2b6 100644 Binary files a/mods/cnc/maps/break_of_day.oramap and b/mods/cnc/maps/break_of_day.oramap differ diff --git a/mods/cnc/maps/chokepoint.oramap b/mods/cnc/maps/chokepoint.oramap index dcaeb663c1..a0900186b2 100644 Binary files a/mods/cnc/maps/chokepoint.oramap and b/mods/cnc/maps/chokepoint.oramap differ diff --git a/mods/cnc/maps/chord_simple.oramap b/mods/cnc/maps/chord_simple.oramap index a5a843faf4..a7c48f0bc8 100644 Binary files a/mods/cnc/maps/chord_simple.oramap and b/mods/cnc/maps/chord_simple.oramap differ diff --git a/mods/cnc/maps/dead_in_motion.oramap b/mods/cnc/maps/dead_in_motion.oramap index 0b6d416b66..b07e9db4bf 100644 Binary files a/mods/cnc/maps/dead_in_motion.oramap and b/mods/cnc/maps/dead_in_motion.oramap differ diff --git a/mods/cnc/maps/dead_in_motion_(redux).oramap b/mods/cnc/maps/dead_in_motion_(redux).oramap index 9551e49877..f1886c1d59 100644 Binary files a/mods/cnc/maps/dead_in_motion_(redux).oramap and b/mods/cnc/maps/dead_in_motion_(redux).oramap differ diff --git a/mods/cnc/maps/deterring_democracy.oramap b/mods/cnc/maps/deterring_democracy.oramap index bc0a17f9cf..2c0f8e9475 100644 Binary files a/mods/cnc/maps/deterring_democracy.oramap and b/mods/cnc/maps/deterring_democracy.oramap differ diff --git a/mods/cnc/maps/deterring_democracy_plus.oramap b/mods/cnc/maps/deterring_democracy_plus.oramap index a6af985a8e..67523d19e6 100644 Binary files a/mods/cnc/maps/deterring_democracy_plus.oramap and b/mods/cnc/maps/deterring_democracy_plus.oramap differ diff --git a/mods/cnc/maps/eastwest3.oramap b/mods/cnc/maps/eastwest3.oramap index 3a107abec5..8ecd410b88 100644 Binary files a/mods/cnc/maps/eastwest3.oramap and b/mods/cnc/maps/eastwest3.oramap differ diff --git a/mods/cnc/maps/garden2.oramap b/mods/cnc/maps/garden2.oramap index 0f14a22953..2e5ee0045d 100644 Binary files a/mods/cnc/maps/garden2.oramap and b/mods/cnc/maps/garden2.oramap differ diff --git a/mods/cnc/maps/haos_ridges_cnc.oramap b/mods/cnc/maps/haos_ridges_cnc.oramap index 136bff6ed7..28596e5f5d 100644 Binary files a/mods/cnc/maps/haos_ridges_cnc.oramap and b/mods/cnc/maps/haos_ridges_cnc.oramap differ diff --git a/mods/cnc/maps/into_the_river_below.oramap b/mods/cnc/maps/into_the_river_below.oramap index d3c83fbb07..965c430b56 100644 Binary files a/mods/cnc/maps/into_the_river_below.oramap and b/mods/cnc/maps/into_the_river_below.oramap differ diff --git a/mods/cnc/maps/lessons_from_kosovo.oramap b/mods/cnc/maps/lessons_from_kosovo.oramap index 993a1cd37a..ad06b331f9 100644 Binary files a/mods/cnc/maps/lessons_from_kosovo.oramap and b/mods/cnc/maps/lessons_from_kosovo.oramap differ diff --git a/mods/cnc/maps/llamas.oramap b/mods/cnc/maps/llamas.oramap index 90d9a81d32..1634dc8e89 100644 Binary files a/mods/cnc/maps/llamas.oramap and b/mods/cnc/maps/llamas.oramap differ diff --git a/mods/cnc/maps/llamas2.oramap b/mods/cnc/maps/llamas2.oramap index 2692582541..594eb4989c 100644 Binary files a/mods/cnc/maps/llamas2.oramap and b/mods/cnc/maps/llamas2.oramap differ diff --git a/mods/cnc/maps/manufacturing_consent.oramap b/mods/cnc/maps/manufacturing_consent.oramap index a2e8071bcb..950ef1eac6 100644 Binary files a/mods/cnc/maps/manufacturing_consent.oramap and b/mods/cnc/maps/manufacturing_consent.oramap differ diff --git a/mods/cnc/maps/minus_two.oramap b/mods/cnc/maps/minus_two.oramap index abc99655bd..fe997a1da8 100644 Binary files a/mods/cnc/maps/minus_two.oramap and b/mods/cnc/maps/minus_two.oramap differ diff --git a/mods/cnc/maps/no_escapism.oramap b/mods/cnc/maps/no_escapism.oramap index 3d09e6c037..0f202e505b 100644 Binary files a/mods/cnc/maps/no_escapism.oramap and b/mods/cnc/maps/no_escapism.oramap differ diff --git a/mods/cnc/maps/rubicon.oramap b/mods/cnc/maps/rubicon.oramap index a3860b7417..fc6a035a65 100644 Binary files a/mods/cnc/maps/rubicon.oramap and b/mods/cnc/maps/rubicon.oramap differ diff --git a/mods/cnc/maps/sea_and_cake.oramap b/mods/cnc/maps/sea_and_cake.oramap index 8bfa1aef48..d3d77aa18c 100644 Binary files a/mods/cnc/maps/sea_and_cake.oramap and b/mods/cnc/maps/sea_and_cake.oramap differ diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml index fe32796e0f..92291613fe 100644 --- a/mods/cnc/maps/shellmap/map.yaml +++ b/mods/cnc/maps/shellmap/map.yaml @@ -999,10 +999,10 @@ Rules: Widget: MENU_BACKGROUND LST: Mobile: - Speed: 3 + Speed: 42 BOAT: Mobile: - Speed: 3 + Speed: 42 Sequences: diff --git a/mods/cnc/maps/skull_valley.oramap b/mods/cnc/maps/skull_valley.oramap index c185b6dfdb..fbcde27660 100644 Binary files a/mods/cnc/maps/skull_valley.oramap and b/mods/cnc/maps/skull_valley.oramap differ diff --git a/mods/cnc/maps/slippery_slopes.oramap b/mods/cnc/maps/slippery_slopes.oramap index ca8615f2b2..b7f9fcf777 100644 Binary files a/mods/cnc/maps/slippery_slopes.oramap and b/mods/cnc/maps/slippery_slopes.oramap differ diff --git a/mods/cnc/maps/the_hourglass.oramap b/mods/cnc/maps/the_hourglass.oramap index aea63c521b..cfd96a7c01 100644 Binary files a/mods/cnc/maps/the_hourglass.oramap and b/mods/cnc/maps/the_hourglass.oramap differ diff --git a/mods/cnc/maps/thesentinel.oramap b/mods/cnc/maps/thesentinel.oramap index e4a215dd0f..0664267521 100644 Binary files a/mods/cnc/maps/thesentinel.oramap and b/mods/cnc/maps/thesentinel.oramap differ diff --git a/mods/cnc/maps/tiberium-oasis-cluster.oramap b/mods/cnc/maps/tiberium-oasis-cluster.oramap index 49545ee2e5..d2a6d275ba 100644 Binary files a/mods/cnc/maps/tiberium-oasis-cluster.oramap and b/mods/cnc/maps/tiberium-oasis-cluster.oramap differ diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index e428ab2659..438c53f123 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -14,7 +14,7 @@ TRAN: Helicopter: LandWhenIdle: true ROT: 5 - Speed: 15 + Speed: 140 InitialFacing: 0 LandableTerrainTypes: Clear,Rough,Road,Ore,Beach Health: @@ -56,7 +56,7 @@ HELI: Helicopter: RearmBuildings: hpad ROT: 4 - Speed: 20 + Speed: 186 Health: HP: 125 Armor: @@ -108,7 +108,7 @@ ORCA: Helicopter: RearmBuildings: hpad ROT: 4 - Speed: 20 + Speed: 186 Health: HP: 90 Armor: @@ -149,7 +149,7 @@ C17: Cost: 2000 Plane: ROT: 5 - Speed: 35 + Speed: 326 Health: HP: 25 Armor: @@ -157,7 +157,6 @@ C17: RenderUnit: WithShadow: Cargo: -# Types: Infantry, Vehicle MaxWeight: 10 PipCount: 10 Invulnerable: @@ -188,7 +187,7 @@ A10: Cost: 2000 Plane: ROT: 4 - Speed: 40 + Speed: 373 Health: HP: 150 Armor: @@ -227,7 +226,7 @@ TRAN.Husk: Name: Chinook Transport Helicopter: ROT: 5 - Speed: 15 + Speed: 140 RevealsShroud: Range: 8 WithRotor@PRIMARY: @@ -245,7 +244,7 @@ HELI.Husk: Name: Apache Longbow Helicopter: ROT: 4 - Speed: 20 + Speed: 186 RevealsShroud: Range: 10 WithRotor: @@ -260,9 +259,10 @@ ORCA.Husk: Name: Orca Helicopter: ROT: 4 - Speed: 20 + Speed: 186 RevealsShroud: Range: 10 RenderUnit: Image: orca - WithShadow: \ No newline at end of file + WithShadow: + diff --git a/mods/cnc/rules/civilian-desert.yaml b/mods/cnc/rules/civilian-desert.yaml index 3855f29658..4d168e4c09 100644 --- a/mods/cnc/rules/civilian-desert.yaml +++ b/mods/cnc/rules/civilian-desert.yaml @@ -3,7 +3,7 @@ V20: Building: Footprint: xx xx Dimensions: 2,2 - LeavesHusk: + LeavesHusk: HuskActor: V20.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -21,7 +21,7 @@ V21: Building: Footprint: xx xx Dimensions: 2,2 - LeavesHusk: + LeavesHusk: HuskActor: V21.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -39,7 +39,7 @@ V22: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V22.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -54,7 +54,7 @@ V22.Husk: V23: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V23.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -69,7 +69,7 @@ V24: Building: Footprint: xx xx Dimensions: 2,2 - LeavesHusk: + LeavesHusk: HuskActor: V24.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -89,7 +89,7 @@ V25: Dimensions: 2,2 Tooltip: Name: Church - LeavesHusk: + LeavesHusk: HuskActor: V25.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -109,7 +109,7 @@ V26: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V26.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -124,7 +124,7 @@ V26.Husk: V27: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V27.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -136,7 +136,7 @@ V27.Husk: V28: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V28.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -148,7 +148,7 @@ V28.Husk: V29: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V29.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -163,7 +163,7 @@ V30: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V30.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -181,7 +181,7 @@ V31: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V31.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -199,7 +199,7 @@ V32: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V32.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -217,7 +217,7 @@ V33: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V33.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -232,7 +232,7 @@ V33.Husk: V34: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V34.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -244,7 +244,7 @@ V34.Husk: V35: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V35.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -256,7 +256,7 @@ V35.Husk: V36: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V36.Husk EditorTilesetFilter: RequireTilesets: DESERT @@ -268,7 +268,7 @@ V36.Husk: V37: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V37.Husk Building: Footprint: __xx_ ___xx @@ -282,4 +282,5 @@ V37.Husk: Footprint: __xx_ ___xx Dimensions: 5,2 EditorTilesetFilter: - RequireTilesets: DESERT \ No newline at end of file + RequireTilesets: DESERT + diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index af8da068c4..f5a58cea80 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -5,7 +5,7 @@ V01: Dimensions: 2,2 Tooltip: Name: Church - LeavesHusk: + LeavesHusk: HuskActor: V01.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -25,7 +25,7 @@ V02: Building: Footprint: xx xx Dimensions: 2,2 - LeavesHusk: + LeavesHusk: HuskActor: V02.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -43,7 +43,7 @@ V03: Building: Footprint: xx xx Dimensions: 2,2 - LeavesHusk: + LeavesHusk: HuskActor: V03.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -61,7 +61,7 @@ V04: Building: Footprint: xx xx Dimensions: 2,2 - LeavesHusk: + LeavesHusk: HuskActor: V04.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -79,7 +79,7 @@ V05: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V05.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -97,7 +97,7 @@ V06: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V06.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -115,7 +115,7 @@ V07: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: V07.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -130,7 +130,7 @@ V07.Husk: V08: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V08.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -142,7 +142,7 @@ V08.Husk: V09: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V09.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -154,7 +154,7 @@ V09.Husk: V10: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V10.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -166,7 +166,7 @@ V10.Husk: V11: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V11.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -178,7 +178,7 @@ V11.Husk: V12: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V12.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -190,7 +190,7 @@ V12.Husk: V13: Inherits: ^CivBuilding - LeavesHusk: + LeavesHusk: HuskActor: V13.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -202,7 +202,7 @@ V13.Husk: V14: Inherits: ^CivField - LeavesHusk: + LeavesHusk: HuskActor: V14.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -214,7 +214,7 @@ V14.Husk: V15: Inherits: ^CivField - LeavesHusk: + LeavesHusk: HuskActor: V15.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -226,7 +226,7 @@ V15.Husk: V16: Inherits: ^CivField - LeavesHusk: + LeavesHusk: HuskActor: V16.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -238,7 +238,7 @@ V16.Husk: V17: Inherits: ^CivField - LeavesHusk: + LeavesHusk: HuskActor: V17.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -250,7 +250,7 @@ V17.Husk: V18: Inherits: ^CivField - LeavesHusk: + LeavesHusk: HuskActor: V18.Husk EditorTilesetFilter: ExcludeTilesets: DESERT @@ -265,7 +265,7 @@ ARCO: Building: Footprint: xx Dimensions: 2,1 - LeavesHusk: + LeavesHusk: HuskActor: ARCO.Husk ARCO.Husk: @@ -410,14 +410,14 @@ C10: VICE: AppearsOnRadar: Health: - Radius: 3 + Radius: 128 HP: 400 Armor: Type: Wood RevealsShroud: Range: 6 Mobile: - Speed: 5 + Speed: 71 TerrainSpeeds: Clear: 70 Rough: 60 @@ -454,4 +454,5 @@ VICE: BodyOrientation: QuantizedFacings: 8 PoisonedByTiberium: - Weapon: Heal \ No newline at end of file + Weapon: Heal + diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 42c27ad7fb..bbd885aeed 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -11,17 +11,17 @@ Beach: 50 ROT: 5 SelectionDecorations: - Selectable: + Selectable: Voice: VehicleVoice TargetableUnit: TargetTypes: Ground Buildable: Queue: Vehicle - Repairable: - Chronoshiftable: - Passenger: + Repairable: + Chronoshiftable: + Passenger: CargoType: Vehicle - IronCurtainable: + IronCurtainable: HiddenUnderFog: GainsExperience: GivesExperience: @@ -56,17 +56,17 @@ Beach: 70 ROT: 5 SelectionDecorations: - Selectable: + Selectable: Voice: VehicleVoice TargetableUnit: TargetTypes: Ground Buildable: Queue: Vehicle - Repairable: - Chronoshiftable: - Passenger: + Repairable: + Chronoshiftable: + Passenger: CargoType: Vehicle - IronCurtainable: + IronCurtainable: HiddenUnderFog: GainsExperience: GivesExperience: @@ -123,7 +123,7 @@ ^Infantry: AppearsOnRadar: Health: - Radius: 3 + Radius: 128 Armor: Type: None RevealsShroud: @@ -195,7 +195,7 @@ Tooltip: Name: Civilian Mobile: - Speed: 4 + Speed: 56 Health: HP: 25 RevealsShroud: @@ -215,7 +215,7 @@ ^DINO: AppearsOnRadar: Health: - Radius: 3 + Radius: 128 HP: 1000 Armor: Type: Wood @@ -230,7 +230,7 @@ RevealsShroud: Range: 6 Mobile: - Speed: 8 + Speed: 113 TerrainSpeeds: Clear: 90 Rough: 80 @@ -362,7 +362,7 @@ -EngineerRepairable: Health: HP: 400 - Armor: + Armor: Type: Wood Building: RenderBuilding: @@ -502,7 +502,7 @@ ^Husk: Health: HP: 140 - Armor: + Armor: Type: Light Husk: AllowedTerrain: Clear, Rough, Road, Tiberium, BlueTiberium, Beach @@ -515,11 +515,6 @@ ForceHealthPercentage: 25 BelowUnits: BodyOrientation: -# Capturable: -# Type: husk -# AllowAllies: true -# AllowNeutral: true -# AllowEnemies: true LuaScriptEvents: ^HelicopterHusk: @@ -547,3 +542,4 @@ DestroyedSound: xplobig4.aud BodyOrientation: LuaScriptEvents: + diff --git a/mods/cnc/rules/husks.yaml b/mods/cnc/rules/husks.yaml index 735d2a3f57..ab93f23288 100644 --- a/mods/cnc/rules/husks.yaml +++ b/mods/cnc/rules/husks.yaml @@ -22,7 +22,6 @@ APC.Husk: RenderUnit: Image: apc - FTNK.Husk: Inherits: ^Husk Tooltip: @@ -31,7 +30,6 @@ FTNK.Husk: RenderUnit: Image: ftnk - ARTY.Husk: Inherits: ^Husk Tooltip: @@ -113,11 +111,12 @@ MLRS.Husk: Image: mlrs ThrowsParticle@turret: Anim: turret - + STNK.Husk: Inherits: ^Husk Tooltip: Name: Stealth Tank (Destroyed) Icon: stnkicnh RenderUnit: - Image: stnk \ No newline at end of file + Image: stnk + diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 78bfed67e0..fd7a6d4fce 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -11,7 +11,7 @@ E1: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 4 + Speed: 56 Health: HP: 50 Armament: @@ -37,7 +37,7 @@ E2: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 5 + Speed: 71 Health: HP: 50 Armament: @@ -54,7 +54,7 @@ E2: Chance: 50 DetectCloaked: Range: 2 - + E3: Inherits: ^Infantry Valued: @@ -68,7 +68,7 @@ E3: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 3 + Speed: 42 Health: HP: 45 Armament: @@ -96,7 +96,7 @@ E4: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 5 + Speed: 71 Health: HP: 90 Armament: @@ -126,7 +126,7 @@ E5: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 4 + Speed: 56 TerrainSpeeds: Tiberium: 80 PathingCost: 80 @@ -161,7 +161,7 @@ E6: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 4 + Speed: 56 Health: HP: 25 Passenger: @@ -193,7 +193,7 @@ RMBO: Bounds: 12,17,0,-6 Voice: CommandoVoice Mobile: - Speed: 5 + Speed: 71 Health: HP: 200 Passenger: @@ -261,3 +261,4 @@ RAPT: Description: Bipedal with enlarged sickle-shaped claw on each hindfoot Armament: Weapon: claw + diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index a4fc8c43c5..d3e9e5e5ba 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -9,9 +9,9 @@ BOAT: Armor: Type: Heavy Mobile: - InitialFacing:64 + InitialFacing: 64 ROT: 4 - Speed: 2 + Speed: 28 OnRails: true RevealsShroud: Range: 7 @@ -47,9 +47,9 @@ LST: BlueTiberium: 100 Beach: 100 River: 100 - InitialFacing:0 + InitialFacing: 0 ROT: 4 - Speed: 10 + Speed: 142 Health: HP: 400 Armor: @@ -69,3 +69,4 @@ LST: AttackMove: JustMove: true RejectsOrders: + diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index aab0d9fb29..9260045946 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -1,5 +1,3 @@ -# Arranged structures in order, from basic to advanced: Buildings, Defenses, Walls, Misc. - FACT: Inherits: ^Building Buildable: @@ -17,7 +15,7 @@ FACT: Dimensions: 3,2 Health: HP: 1400 - Armor: + Armor: Type: Wood RevealsShroud: Range: 10 @@ -26,7 +24,7 @@ FACT: Produces: Building,Defense Transforms: IntoActor: mcv - Offset:1,1 + Offset: 1,1 Facing: 108 ProductionQueue@Building: Type: Building @@ -187,12 +185,12 @@ PYLE: Bib: RallyPoint: Exit@1: - SpawnOffset: -10,2 + SpawnOffset: -426,85,0 ExitCell: 0,1 Exit@2: - SpawnOffset: 7,7 - ExitCell: 1,1 - Production: + SpawnOffset: 298,298,0 + ExitCell: 1,1 + Production: Produces: Infantry ProductionQueue: Type: Infantry @@ -200,7 +198,7 @@ PYLE: BuildSpeed: .4 LowPowerSlowdown: 3 ProductionBar: - + HAND: Inherits: ^Building Valued: @@ -225,7 +223,7 @@ HAND: Bib: RallyPoint: Exit@1: - SpawnOffset: 12,24 + SpawnOffset: 512,1024,0 ExitCell: 1,2 Production: Produces: Infantry @@ -261,7 +259,7 @@ AFLD: RallyPoint: RallyPoint: 4,2 Exit@1: - SpawnOffset: -24,0 + SpawnOffset: -1024,0,0 ExitCell: 3,1 ProductionAirdrop: Produces: Vehicle @@ -300,7 +298,7 @@ WEAP: RallyPoint: RallyPoint: 0,3 Exit@1: - SpawnOffset: -8,-8 + SpawnOffset: -341,-341,0 ExitCell: 0,2 Production: Produces: Vehicle @@ -331,7 +329,7 @@ HPAD: RevealsShroud: Range: 5 Exit@1: - SpawnOffset: 0,-6 + SpawnOffset: 0,-256,0 Production: Produces: Aircraft Reservable: @@ -407,7 +405,7 @@ FIX: Reservable: RepairsUnits: RallyPoint: - + EYE: RequiresPower: CanPowerDown: @@ -540,7 +538,7 @@ SAM: -GivesBuildableArea: Health: HP: 400 - Armor: + Armor: Type: Heavy RevealsShroud: Range: 5 @@ -576,7 +574,7 @@ OBLI: -GivesBuildableArea: Health: HP: 400 - Armor: + Armor: Type: Heavy RevealsShroud: Range: 8 @@ -588,7 +586,7 @@ OBLI: FireDelay: 8 AttackTurreted: Turreted: - ROT:255 + ROT: 255 AutoTarget: -RenderBuilding: RenderRangeCircle: @@ -629,7 +627,7 @@ GTWR: RenderRangeCircle: WithMuzzleFlash: Turreted: - ROT:255 + ROT: 255 ATWR: Inherits: ^Building @@ -651,12 +649,12 @@ ATWR: -GivesBuildableArea: Health: HP: 600 - Armor: + Armor: Type: Heavy RevealsShroud: Range: 9 Turreted: - ROT:255 + ROT: 255 Offset: 128,128,-85 Armament: Weapon: TowerMissle @@ -687,7 +685,7 @@ SBAG: Owner: gdi Health: HP: 100 - Armor: + Armor: Type: Light CYCL: @@ -706,7 +704,7 @@ CYCL: Owner: nod Health: HP: 100 - Armor: + Armor: Type: Light BRIK: @@ -725,7 +723,7 @@ BRIK: Owner: gdi,nod Health: HP: 250 - Armor: + Armor: Type: Heavy Wall: CrushClasses: heavywall @@ -733,7 +731,6 @@ BRIK: SoundOnDamageTransition: DestroyedSound: crumble.aud -# custom prerequisites: BARRACKS: Tooltip: Name: Infantry Production @@ -753,3 +750,4 @@ ANYHQ: Tooltip: Name: a communications center Description: a communications center + diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml index e385fb7e10..e009bd09fe 100644 --- a/mods/cnc/rules/system.yaml +++ b/mods/cnc/rules/system.yaml @@ -9,7 +9,7 @@ Player: ActorGroupProxy: DeveloperMode: HackyAI@Default: - Name:Easy AI + Name: Easy AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -71,7 +71,7 @@ Player: orca: 5% SquadSize: 15 HackyAI@Normal: - Name:Normal AI + Name: Normal AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -133,7 +133,7 @@ Player: mtnk: 50% SquadSize: 15 HackyAI@hard: - Name:Hard AI + Name: Hard AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -312,11 +312,11 @@ World: AllowedTerrainTypes: Clear,Road AllowUnderActors: false SmudgeLayer@SCORCH: - Type:Scorch + Type: Scorch Sequence: scorches - SmokePercentage:50 + SmokePercentage: 50 SmudgeLayer@CRATER: - Type:Crater + Type: Crater Sequence: craters PathfinderDebugOverlay: SpawnMapActors: @@ -421,3 +421,4 @@ waypoint: Waypoint: RenderEditorOnly: BodyOrientation: + diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml index 2bbc406fc2..d169d9d3b9 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -1,4 +1,3 @@ -# Oil Derrick V19: Inherits: ^TechBuilding CashTrickler: @@ -7,7 +6,7 @@ V19: Dimensions: 1,1 Tooltip: Name: Oil Derrick - LeavesHusk: + LeavesHusk: HuskActor: V19.Husk V19.Husk: @@ -19,7 +18,6 @@ V19.Husk: Tooltip: Name: Oil Derrick (Destroyed) -# Hospital HOSP: Inherits: ^TechBuilding Selectable: @@ -33,7 +31,7 @@ HOSP: Type: InfantryHealing Tooltip: Name: Hospital - LeavesHusk: + LeavesHusk: HuskActor: HOSP.Husk HOSP.Husk: @@ -44,7 +42,6 @@ HOSP.Husk: Tooltip: Name: Hospital (Destroyed) -# Bio Lab BIO: Inherits: ^TechBuilding Building: @@ -53,7 +50,7 @@ BIO: Tooltip: Name: Biological Lab Exit@1: - SpawnOffset: 0,-10 + SpawnOffset: 0,-426,0 ExitCell: 0,-1 Production: Produces: Biolab @@ -65,7 +62,7 @@ BIO: ProductionBar: RallyPoint: RallyPoint: -1,-1 - LeavesHusk: + LeavesHusk: HuskActor: BIO.Husk BIO.Husk: @@ -76,7 +73,6 @@ BIO.Husk: Tooltip: Name: Biological Lab (Destroyed) -# Prison / Tech Center MISS: Inherits: ^CivBuilding RenderBuilding: @@ -90,4 +86,5 @@ MISS: BuildPaletteOrder: 1000 Owner: None Valued: - Cost: 2000 \ No newline at end of file + Cost: 2000 + diff --git a/mods/cnc/rules/trees.yaml b/mods/cnc/rules/trees.yaml index 6bc4e07e63..086bc27746 100644 --- a/mods/cnc/rules/trees.yaml +++ b/mods/cnc/rules/trees.yaml @@ -3,7 +3,7 @@ SPLIT2: RenderBuilding: Palette: staticterrain SeedsResource: - ResourceType:Tiberium + ResourceType: Tiberium Interval: 55 Tooltip: Name: Blossom Tree @@ -18,7 +18,7 @@ SPLIT3: RenderBuilding: Palette: staticterrain SeedsResource: - ResourceType:Tiberium + ResourceType: Tiberium Interval: 55 Tooltip: Name: Blossom Tree @@ -33,7 +33,7 @@ SPLITBLUE: RenderBuilding: Palette: staticterrain SeedsResource: - ResourceType:BlueTiberium + ResourceType: BlueTiberium Interval: 110 Tooltip: Name: Blossom Tree (blue) @@ -45,16 +45,22 @@ SPLITBLUE: ROCK1: Inherits: ^Rock + ROCK2: Inherits: ^Rock + ROCK3: Inherits: ^Rock + ROCK4: Inherits: ^Rock + ROCK5: Inherits: ^Rock + ROCK6: Inherits: ^Rock + ROCK7: Inherits: ^Rock @@ -90,16 +96,17 @@ T09: Building: Footprint: x_ Dimensions: 2,1 - + T10: Inherits: ^Tree Building: Footprint: __ xx + T11: Inherits: ^Tree Building: Footprint: __ xx - + T12: Inherits: ^Tree @@ -126,9 +133,10 @@ T17: Building: Footprint: ___ xx_ Dimensions: 3,2 + T18: Inherits: ^Tree - + TC01: Inherits: ^Tree Building: @@ -158,3 +166,4 @@ TC05: Building: Footprint: __x_ xxx_ _xx_ Dimensions: 4,3 + diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 75ea6b0233..6f8c242486 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -12,23 +12,23 @@ MCV: Selectable: Priority: 3 Mobile: - Speed: 5 + Speed: 71 Health: HP: 750 - Armor: + Armor: Type: Light RevealsShroud: Range: 8 Transforms: IntoActor: fact - Offset:-1,-1 + Offset: -1,-1 Facing: 108 TransformSounds: constru2.aud, hvydoor1.aud NoTransformSounds: deploy1.aud RenderUnit: MustBeDestroyed: AttackMove: - JustMove:true + JustMove: true BaseBuilding: LeavesHusk: HuskActor: MCV.Husk @@ -61,15 +61,15 @@ HARV: SearchFromProcRadius: 24 SearchFromOrderRadius: 12 Mobile: - Speed: 6 + Speed: 85 Health: HP: 600 - Armor: + Armor: Type: Heavy RevealsShroud: Range: 4 AttackMove: - JustMove:true + JustMove: true LeavesHusk: HuskActor: HARV.Husk -GainsExperience: @@ -88,7 +88,7 @@ APC: Owner: gdi Mobile: ROT: 8 - Speed: 9 + Speed: 128 Health: HP: 200 Armor: @@ -136,7 +136,7 @@ ARTY: Owner: nod Mobile: ROT: 2 - Speed: 6 + Speed: 85 Health: HP: 75 Armor: @@ -170,7 +170,7 @@ FTNK: Owner: nod Mobile: ROT: 7 - Speed: 8 + Speed: 113 Health: HP: 350 Armor: @@ -204,7 +204,7 @@ BGGY: Owner: nod Mobile: ROT: 12 - Speed: 12 + Speed: 170 Health: HP: 120 Armor: @@ -238,7 +238,7 @@ BIKE: Owner: nod Mobile: ROT: 12 - Speed: 15 + Speed: 213 TerrainSpeeds: Clear: 70 Rough: 35 @@ -261,7 +261,7 @@ BIKE: AutoTarget: LeavesHusk: HuskActor: BIKE.Husk - + JEEP: Inherits: ^Vehicle Valued: @@ -275,7 +275,7 @@ JEEP: Owner: gdi Mobile: ROT: 11 - Speed: 11 + Speed: 156 Health: HP: 160 Armor: @@ -308,8 +308,8 @@ LTNK: Prerequisites: anyhq Owner: nod Mobile: - ROT: 7 - Speed: 8 + ROT: 7 + Speed: 113 Health: HP: 300 Armor: @@ -346,7 +346,7 @@ MTNK: Prerequisites: anyhq Owner: gdi Mobile: - Speed: 6 + Speed: 85 Health: HP: 400 Armor: @@ -386,7 +386,7 @@ HTNK: Owner: gdi Mobile: Crushes: wall, heavywall, crate, infantry - Speed: 4 + Speed: 56 ROT: 3 Health: HP: 900 @@ -436,7 +436,7 @@ MSAM: Prerequisites: anyhq Owner: gdi Mobile: - Speed: 6 + Speed: 85 ROT: 4 Health: HP: 120 @@ -473,7 +473,7 @@ MLRS: Prerequisites: anyhq Owner: nod Mobile: - Speed: 7 + Speed: 99 ROT: 7 Health: HP: 120 @@ -514,7 +514,7 @@ STNK: Owner: nod Mobile: ROT: 8 - Speed: 10 + Speed: 142 Crushes: crate, infantry Health: HP: 150 @@ -551,7 +551,7 @@ MHQ: Armor: Type: Light Mobile: - Speed: 6 + Speed: 85 RevealsShroud: Range: 6 RenderUnit: @@ -563,3 +563,4 @@ MHQ: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall + diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index 96c6ee43c7..73900210d7 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -1,7 +1,7 @@ FlametankExplode: Warhead: Damage: 100 - Spread: 24 + Spread: 1c0 Explosion: big_napalm InfDeath: 5 ImpactSound: xplobig6.aud @@ -9,7 +9,7 @@ FlametankExplode: HeliCrash: Warhead: Damage: 40 - Spread: 10 + Spread: 426 Explosion: poof InfDeath: 4 ImpactSound: xplos.aud @@ -23,7 +23,7 @@ HeliExplode: UnitExplode: Warhead: Damage: 500 - Spread: 10 + Spread: 426 Versus: None: 90% Wood: 75% @@ -36,7 +36,7 @@ UnitExplode: UnitExplodeSmall: Warhead: Damage: 40 - Spread: 10 + Spread: 426 Versus: None: 90% Wood: 75% @@ -49,7 +49,7 @@ UnitExplodeSmall: GrenadierExplode: Warhead: Damage: 10 - Spread: 9 + Spread: 384 Versus: None: 90% Wood: 75% @@ -64,7 +64,7 @@ Atomic: Report: nukemisl.aud Warhead@impact: Damage: 1000 - Spread:15 + Spread: 640 Versus: None: 90% Wood: 60% @@ -76,7 +76,7 @@ Atomic: Warhead@areanukea: Damage: 200 SmudgeType: Scorch - Spread: 60 + Spread: 2c512 Size: 3 Ore: true Versus: @@ -90,7 +90,7 @@ Atomic: Warhead@areanukeb: Damage: 200 SmudgeType: Scorch - Spread:90 + Spread: 3c768 Size: 4 Ore: true Versus: @@ -103,7 +103,7 @@ Atomic: Warhead@areanukec: Damage: 200 SmudgeType: Scorch - Spread: 120 + Spread: 5c0 Size: 5 Ore: true Versus: @@ -116,7 +116,7 @@ Atomic: Warhead@areanuke: Damage: 200 SmudgeType: Scorch - Spread: 150 + Spread: 6c256 Size: 6 Ore: true Versus: @@ -131,7 +131,7 @@ IonCannon: ValidTargets: Ground, Air Warhead@impact: Damage: 900 - Spread: 16 + Spread: 682 Ore: true Versus: None: 100% @@ -151,12 +151,12 @@ IonCannon: Sniper: Report: RAMGUN2.AUD ROF: 40 - Range: 6 + Range: 6c0 Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 100 - Spread: 1 + Spread: 42 Versus: None: 100% Wood: 5% @@ -166,13 +166,13 @@ Sniper: HighV: ROF: 30 - Range: 6 + Range: 6c0 Report: GUN8.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 50 - Spread: 3 + Spread: 128 Versus: None: 100% Wood: 50% @@ -185,14 +185,14 @@ HeliAGGun: ROF: 20 Burst: 2 BurstDelay: 0 - Range: 4 + Range: 4c0 ValidTargets: Ground Report: gun5.aud Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 20 - Spread: 6 + Spread: 256 Versus: None: 100% Wood: 50% @@ -205,14 +205,14 @@ HeliAAGun: ROF: 20 Burst: 2 BurstDelay: 0 - Range: 4 + Range: 4c0 ValidTargets: Air Report: gun5.aud Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 20 - Spread: 3 + Spread: 128 Versus: None: 100% Wood: 50% @@ -223,13 +223,13 @@ HeliAAGun: Pistol: ROF: 7 - Range: 3 + Range: 3c0 Report: GUN18.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 - Versus: + Spread: 128 + Versus: None: 100% Wood: 50% Light: 50% @@ -240,13 +240,13 @@ Pistol: M16: ROF: 20 - Range: 4 + Range: 4c0 Report: MGUN2.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 - Versus: + Spread: 128 + Versus: None: 100% Wood: 25% Light: 30% @@ -257,22 +257,22 @@ M16: Rockets: ROF: 50 - Range: 6 + Range: 6c0 Report: BAZOOK1.AUD ValidTargets: Ground, Air Projectile: Missile Arm: 0 High: yes Shadow: no - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 15 Trail: smokey ContrailLength: 8 - Speed: 35 + Speed: 298 RangeLimit: 30 Warhead: - Spread: 3 + Spread: 128 Versus: None: 50% Wood: 85% @@ -287,7 +287,7 @@ Rockets: BikeRockets: ROF: 50 - Range: 6 + Range: 6c0 Report: BAZOOK1.AUD ValidTargets: Ground, Air Burst: 2 @@ -296,16 +296,16 @@ BikeRockets: Arm: 0 High: yes Shadow: no - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 Trail: smokey ContrailLength: 8 - Speed: 35 + Speed: 298 RangeLimit: 40 Warhead: - Spread: 3 - Versus: + Spread: 128 + Versus: None: 65% Wood: 50% Light: 100% @@ -321,22 +321,22 @@ OrcaAGMissiles: ROF: 15 Burst: 2 BurstDelay: 15 - Range: 5 + Range: 5c0 Report: BAZOOK1.AUD ValidTargets: Ground Projectile: Missile Arm: 0 High: yes Shadow: no - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 Trail: smokey ContrailLength: 8 - Speed: 25 + Speed: 213 RangeLimit: 30 Warhead: - Spread: 3 + Spread: 128 Versus: None: 50% Wood: 100% @@ -352,22 +352,22 @@ OrcaAAMissiles: ROF: 15 Burst: 2 BurstDelay: 15 - Range: 5 + Range: 5c0 Report: BAZOOK1.AUD ValidTargets: Air Projectile: Missile Arm: 0 High: yes Shadow: no - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 Trail: smokey ContrailLength: 8 - Speed: 25 + Speed: 213 RangeLimit: 30 Warhead: - Spread: 3 + Spread: 128 Versus: None: 50% Wood: 100% @@ -381,12 +381,12 @@ OrcaAAMissiles: Flamethrower: ROF: 50 - Range: 2.5 + Range: 2c512 Report: FLAMER2.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 8 + Spread: 341 Versus: None: 90% Wood: 100% @@ -400,14 +400,14 @@ Flamethrower: BigFlamer: ROF: 50 - Range: 3.5 + Range: 3c512 Report: FLAMER2.AUD Projectile: Bullet - Speed: 20 - Burst:2 - BurstDelay:25 + Speed: 341 + Burst: 2 + BurstDelay: 25 Warhead: - Spread: 8 + Spread: 341 Versus: None: 100% Wood: 100% @@ -421,13 +421,13 @@ BigFlamer: Chemspray: ROF: 70 - Range: 3 + Range: 3c0 Report: FLAMER2.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 80 - Spread: 6 + Spread: 256 Versus: None: 100% Wood: 75% @@ -440,16 +440,16 @@ Chemspray: Grenade: ROF: 50 - Range: 5 + Range: 5c0 Report: toss1.aud Projectile: Bullet - Speed: 12 + Speed: 204 High: yes - Angle: .1 - Inaccuracy: 5 + Angle: 62 + Inaccuracy: 213 Image: BOMB Warhead: - Spread: 6 + Spread: 256 Versus: None: 90% Wood: 75% @@ -463,13 +463,13 @@ Grenade: 70mm: ROF: 38 - Range: 4 + Range: 4c0 Report: TNKFIRE3.AUD Projectile: Bullet Image: 120MM - Speed: 60 + Speed: 1c0 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -484,13 +484,13 @@ Grenade: 105mm: ROF: 50 - Range: 4.75 + Range: 4c768 Report: TNKFIRE4.AUD Projectile: Bullet Image: 120MM - Speed: 40 + Speed: 682 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -504,13 +504,13 @@ Grenade: 120mm: ROF: 50 - Range: 4.75 + Range: 4c768 Report: TNKFIRE6.AUD Projectile: Bullet Image: 120MM - Speed: 40 + Speed: 682 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -525,15 +525,15 @@ Grenade: 120mmDual: ROF: 60 - Range: 4.75 + Range: 4c768 Report: TNKFIRE6.AUD Burst: 2 BurstDelay: 5 Projectile: Bullet Image: 120MM - Speed: 40 + Speed: 682 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -548,13 +548,13 @@ Grenade: TurretGun: ROF: 25 - Range: 6 + Range: 6c0 Report: TNKFIRE6.AUD Projectile: Bullet Image: 120MM - Speed: 50 + Speed: 853 Warhead: - Spread: 3 + Spread: 128 Versus: None: 25% Wood: 25% @@ -568,7 +568,7 @@ TurretGun: MammothMissiles: ROF: 100 - Range: 5 + Range: 5c0 Report: ROCKET1.AUD ValidTargets: Ground, Air Burst: 2 @@ -576,15 +576,15 @@ MammothMissiles: Arm: 0 High: yes Shadow: no - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 Trail: smokey ContrailLength: 8 - Speed: 25 + Speed: 213 RangeLimit: 35 Warhead: - Spread: 6 + Spread: 256 Versus: None: 40% Wood: 75% @@ -596,10 +596,10 @@ MammothMissiles: SmudgeType: Crater Damage: 75 -227mm: +227mm: ROF: 140 - Range: 12 - MinRange: 3 + Range: 12c0 + MinRange: 3c0 Burst: 4 BurstDelay: 4 Report: ROCKET1.AUD @@ -608,15 +608,15 @@ MammothMissiles: Arm: 5 High: yes Shadow: yes - Inaccuracy: 20 - Angle: 0.1 + Inaccuracy: 853 + Angle: 62 Image: DRAGON ROT: 2 ContrailLength: 10 Trail: smokey - Speed: 20 + Speed: 341 Warhead: - Spread: 15 + Spread: 640 Versus: None: 25% Wood: 30% @@ -630,7 +630,7 @@ MammothMissiles: 227mm.stnk: ROF: 70 - Range: 7 + Range: 7c0 Report: ROCKET1.AUD Burst: 2 BurstDelay: 10 @@ -639,15 +639,15 @@ MammothMissiles: Arm: 0 High: yes Shadow: yes - Inaccuracy: 5 + Inaccuracy: 213 Image: DRAGON ROT: 10 Trail: smokey ContrailLength: 8 - Speed: 25 + Speed: 213 RangeLimit: 55 Warhead: - Spread: 3 + Spread: 128 Versus: None: 35% Wood: 50% @@ -661,19 +661,19 @@ MammothMissiles: ArtilleryShell: ROF: 65 - Range: 11 - MinRange: 2 + Range: 11c0 + MinRange: 2c0 Report: TNKFIRE2.AUD Projectile: Bullet - Speed: 12 + Speed: 204 High: yes - Angle: .09 - Inaccuracy: 30 + Angle: 56 + Inaccuracy: 1c256 ContrailLength: 30 Image: 120MM Warhead: Damage: 150 - Spread: 6 + Spread: 256 Versus: None: 90% Wood: 50% @@ -687,12 +687,12 @@ ArtilleryShell: MachineGun: ROF: 20 Burst: 4 - Range: 4 + Range: 4c0 Report: MGUN11.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: None: 100% Wood: 25% @@ -705,7 +705,7 @@ MachineGun: BoatMissile: ROF: 35 - Range: 8 + Range: 8c0 Burst: 2 BurstDelay: 7 Report: ROCKET2.AUD @@ -713,16 +713,16 @@ BoatMissile: Arm: 0 High: yes Shadow: no - Inaccuracy: 5 + Inaccuracy: 213 Image: DRAGON ROT: 10 Trail: smokey ContrailLength: 8 - Speed: 20 + Speed: 170 RangeLimit: 60 Warhead: - Spread: 6 - Versus: + Spread: 256 + Versus: None: 90% Wood: 75% Light: 60% @@ -735,7 +735,7 @@ BoatMissile: TowerMissle: ROF: 24 - Range: 8 + Range: 8c0 Report: ROCKET2.AUD ValidTargets: Ground, Air Burst: 2 @@ -744,16 +744,16 @@ TowerMissle: Arm: 0 High: yes Shadow: no - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 20 Trail: smokey ContrailLength: 8 - Speed: 35 + Speed: 298 RangeLimit: 40 Warhead: - Spread: 12 - Versus: + Spread: 512 + Versus: None: 25% Wood: 25% Light: 100% @@ -767,13 +767,13 @@ TowerMissle: Vulcan: ValidTargets: Ground, Water ROF: 2 - Range: 6 + Range: 6c0 Report: gun5.aud Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 75 - Spread: 10 + Spread: 426 Versus: None: 100% Wood: 50% @@ -785,13 +785,13 @@ Vulcan: Napalm: ValidTargets: Ground, Water ROF: 4 - Range: 2 + Range: 2c0 Burst: 2 BurstDelay: 2 Projectile: GravityBomb Image: BOMBLET Warhead: - Spread: 20 + Spread: 853 Versus: None: 90% Wood: 100% @@ -806,7 +806,7 @@ Napalm: Napalm.Crate: Warhead: - Spread: 4 + Spread: 170 Versus: None: 90% Wood: 100% @@ -820,14 +820,14 @@ Napalm.Crate: Laser: ROF: 90 - Range: 8.5 + Range: 8c512 Charges: true Report: OBELRAY1.AUD Projectile: LaserZap BeamWidth: 2 HitAnim: laserfire Warhead: - Spread: 1 + Spread: 42 Versus: Wood: 50% InfDeath: 5 @@ -836,7 +836,7 @@ Laser: SAMMissile: ROF: 15 - Range: 10 + Range: 10c0 Report: ROCKET2.AUD ValidTargets: Air Projectile: Missile @@ -845,12 +845,12 @@ SAMMissile: Shadow: no Image: MISSILE ROT: 20 - Speed: 50 + Speed: 426 RangeLimit: 35 Trail: smokey ContrailLength: 8 Warhead: AP - Spread: 16 + Spread: 682 Versus: None: 100% Wood: 100% @@ -864,20 +864,20 @@ SAMMissile: HonestJohn: ROF: 200 - Range: 10 + Range: 10c0 Report: ROCKET1.AUD Projectile: Bullet Arm: 10 High: yes Shadow: yes - Inaccuracy: 5 + Inaccuracy: 213 Image: patriot Trail: smokey - Speed: 11 + Speed: 187 RangeLimit: 35 - Angle: .15 + Angle: 88 Warhead: - Spread: 6 + Spread: 256 Versus: None: 90% Wood: 75% @@ -892,7 +892,7 @@ HonestJohn: Tiberium: ROF: 4 Warhead: - Spread: 1 + Spread: 42 InfDeath: 6 Damage: 1 PreventProne: yes @@ -900,19 +900,19 @@ Tiberium: Heal: ROF: 4 Warhead: - Spread: 1 + Spread: 42 Damage: -1 PreventProne: yes APCGun: ROF: 12 - Range: 5 + Range: 5c0 Report: gun20.aud ValidTargets: Ground Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: None: 35% Wood: 50% @@ -920,17 +920,17 @@ APCGun: Heavy: 20% Explosion: small_poof Damage: 15 - + APCGun.AA: ROF: 12 - Range: 7 + Range: 7c0 Report: gun20.aud ValidTargets: Air Projectile: Bullet - Speed: 100 + Speed: 1c682 High: true Warhead: - Spread: 3 + Spread: 128 Versus: Heavy: 50% Explosion: small_poof @@ -938,8 +938,8 @@ APCGun.AA: Patriot: ROF: 30 - Range: 10 - MinRange: 1 + Range: 10c0 + MinRange: 1c0 Burst: 2 BurstDelay: 15 Report: ROCKET2.AUD @@ -951,11 +951,11 @@ Patriot: Trail: smokey ContrailLength: 8 ROT: 20 - Speed: 50 + Speed: 426 RangeLimit: 30 - Angle: .15 + Angle: 88 Warhead: AP - Spread: 16 + Spread: 682 Versus: None: 100% Wood: 100% @@ -969,10 +969,10 @@ Patriot: Tail: ROF: 30 - Range: 1 + Range: 1c0 Projectile: Bullet Warhead: - Spread: 5 + Spread: 213 Versus: None: 90% Wood: 10% @@ -984,10 +984,10 @@ Tail: Horn: ROF: 20 - Range: 1 + Range: 1c0 Projectile: Bullet Warhead: - Spread: 5 + Spread: 213 Versus: None: 90% Wood: 10% @@ -999,10 +999,10 @@ Horn: Teeth: ROF: 30 - Range: 1 + Range: 1c0 Projectile: Bullet Warhead: - Spread: 5 + Spread: 213 Versus: None: 90% Wood: 10% @@ -1014,10 +1014,10 @@ Teeth: Claw: ROF: 10 - Range: 1 + Range: 1c0 Projectile: Bullet Warhead: - Spread: 5 + Spread: 213 Versus: None: 90% Wood: 10% @@ -1025,4 +1025,5 @@ Claw: Heavy: 10% Concrete: 10% InfDeath: 1 - Damage: 60 \ No newline at end of file + Damage: 60 + diff --git a/mods/d2k/maps/death-depths.oramap b/mods/d2k/maps/death-depths.oramap index 336ae7ed44..ee1f4d1d5d 100644 Binary files a/mods/d2k/maps/death-depths.oramap and b/mods/d2k/maps/death-depths.oramap differ diff --git a/mods/d2k/maps/imperial-basin.oramap b/mods/d2k/maps/imperial-basin.oramap index 5f6ed55ae5..49b0bd500e 100644 Binary files a/mods/d2k/maps/imperial-basin.oramap and b/mods/d2k/maps/imperial-basin.oramap differ diff --git a/mods/d2k/maps/the-duell.oramap b/mods/d2k/maps/the-duell.oramap index 8fd31c53a7..4c23f37035 100644 Binary files a/mods/d2k/maps/the-duell.oramap and b/mods/d2k/maps/the-duell.oramap differ diff --git a/mods/d2k/maps/tucks-sietch.oramap b/mods/d2k/maps/tucks-sietch.oramap index 9d0ea68dce..192cd5fd75 100644 Binary files a/mods/d2k/maps/tucks-sietch.oramap and b/mods/d2k/maps/tucks-sietch.oramap differ diff --git a/mods/d2k/maps/venac-ditch.oramap b/mods/d2k/maps/venac-ditch.oramap index a7ac9248c2..261a5968a1 100644 Binary files a/mods/d2k/maps/venac-ditch.oramap and b/mods/d2k/maps/venac-ditch.oramap differ diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 1072ee9a93..30c86e69e7 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -7,14 +7,14 @@ Description: Fast drop ship.\n Unarmed Health: HP: 250 - Armor: + Armor: Type: Light RevealsShroud: Range: 12 Helicopter: InitialFacing: 0 ROT: 4 - Speed: 30 + Speed: 210 LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth @@ -40,7 +40,7 @@ FRIGATE: Description: Supply spacecraft Plane: ROT: 5 - Speed: 50 + Speed: 350 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth Health: @@ -83,7 +83,7 @@ ORNI: LandWhenIdle: false InitialFacing: 20 ROT: 6 - Speed: 40 + Speed: 280 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: @@ -106,7 +106,7 @@ ORNI.bomber: Range: 10 Plane: ROT: 5 - Speed: 50 + Speed: 350 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth LimitedAmmo: @@ -135,7 +135,7 @@ CARRYALL.infantry: Range: 12 Plane: ROT: 4 - Speed: 40 + Speed: 280 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: @@ -167,7 +167,7 @@ CARRYALL.Husk: Name: Carryall Helicopter: ROT: 4 - Speed: 30 + Speed: 210 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: @@ -180,7 +180,7 @@ ORNI.Husk: Name: Ornithopter Helicopter: ROT: 6 - Speed: 40 + Speed: 280 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: @@ -193,7 +193,7 @@ ORNI.bomber.Husk: Name: Ornithopter Plane: ROT: 5 - Speed: 50 + Speed: 350 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: @@ -206,7 +206,7 @@ CARRYALL.infantry.Husk: Name: Carryall Plane: ROT: 4 - Speed: 40 + Speed: 280 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: @@ -219,9 +219,10 @@ BADR.Husk: Name: Crate Carryall Plane: ROT: 4 - Speed: 40 + Speed: 280 RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: Image: carryall - WithShadow: \ No newline at end of file + WithShadow: + diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index 6a53197641..3f19e1c5a8 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -58,7 +58,7 @@ PALACEA: ChargeTime: 180 LongDesc: Ornithopter drops a load of parachuted\nbombs on your target UnitType: orni.bomber - SelectTargetSound: + SelectTargetSound: FlareType: CanPowerDown: RequiresPower: @@ -100,7 +100,7 @@ MCVA: Transforms: Facing: 16 IntoActor: conyarda - Offset:-1,-1 + Offset: -1,-1 NoTransformSounds: AI_DPLOY.AUD RenderUnit: Image: DMCV @@ -175,7 +175,7 @@ SONICTANK: Type: Light Mobile: ROT: 3 - Speed: 7 + Speed: 74 RevealsShroud: Range: 6 RenderUnit: @@ -213,7 +213,7 @@ FREMEN: Bounds: 12,17,0,0 Voice: FremenVoice Mobile: - Speed: 5 + Speed: 53 Health: HP: 70 Passenger: @@ -253,7 +253,7 @@ GRENADIER: Health: HP: 50 Mobile: - Speed: 5 + Speed: 53 Armament: Weapon: Grenade LocalOffset: 0,0,555 @@ -265,4 +265,5 @@ GRENADIER: IdleAnimations: stand,stand2 Explodes: Weapon: UnitExplodeSmall - Chance: 100 \ No newline at end of file + Chance: 100 + diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index aed8639c40..59cf1f916c 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -12,11 +12,11 @@ Dune: 60 ROT: 5 SelectionDecorations: - Selectable: + Selectable: Voice: VehicleVoice TargetableUnit: TargetTypes: Ground - Passenger: + Passenger: CargoType: Vehicle AttackMove: HiddenUnderFog: @@ -25,7 +25,7 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Vehicle + Types: Vehicle GivesBounty: Repairable: RepairBuildings: repaira,repairo,repairh @@ -52,11 +52,11 @@ Dune: 70 ROT: 5 SelectionDecorations: - Selectable: + Selectable: Voice: VehicleVoice TargetableUnit: TargetTypes: Ground - Passenger: + Passenger: CargoType: Vehicle AttackMove: HiddenUnderFog: @@ -65,7 +65,7 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Tank + Types: Tank GivesBounty: Repairable: RepairBuildings: repaira,repairo,repairh @@ -81,7 +81,7 @@ ^Husk: Health: HP: 75 - Armor: + Armor: Type: Light Husk: AllowedTerrain: Sand, Rock, Transition, Concrete, Spice, SpiceBlobs, Dune @@ -90,7 +90,7 @@ Burns: Interval: 4 ProximityCaptor: - Types:Husk + Types: Husk Tooltip: Name: Destroyed Tank BodyOrientation: @@ -99,7 +99,7 @@ ^TowerHusk: Health: HP: 125 - Armor: + Armor: Type: Concrete Husk: AppearsOnRadar: @@ -111,7 +111,7 @@ Tooltip: Name: Destroyed Tower ProximityCaptor: - Types:Husk + Types: Husk BodyOrientation: LuaScriptEvents: @@ -127,7 +127,7 @@ ^Infantry: AppearsOnRadar: Health: - Radius: 3 + Radius: 96 Armor: Type: None RevealsShroud: @@ -161,7 +161,7 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Infantry + Types: Infantry GivesBounty: CrushableInfantry: CrushSound: CRUSH1.WAV @@ -191,7 +191,7 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Plane + Types: Plane GivesBounty: CombatDebugOverlay: BodyOrientation: @@ -238,7 +238,7 @@ RelativeToTopLeft: yes ShakeOnDeath: ProximityCaptor: - Types:Building + Types: Building Sellable: GivesBounty: CombatDebugOverlay: @@ -248,4 +248,5 @@ UpdatesPlayerStatistics: WithCrumbleOverlay: Huntable: - LuaScriptEvents: \ No newline at end of file + LuaScriptEvents: + diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 1caaa7cdbe..febd8d394f 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -95,7 +95,7 @@ PALACEH: LaunchSound: IncomingSound: MissileWeapon: atomic - SpawnOffset:-512,1c171,0 + SpawnOffset: -512,1c171,0 CanPowerDown: RequiresPower: SupportPowerChargeBar: @@ -107,7 +107,7 @@ MCVH: Transforms: Facing: 16 IntoActor: conyardh - Offset:-1,-1 + Offset: -1,-1 NoTransformSounds: HI_DPLOY.AUD RenderUnit: Image: DMCV @@ -134,7 +134,7 @@ COMBATH: Buildable: Owner: harkonnen Mobile: - Speed: 5 + Speed: 53 ROT: 4 Turreted: ROT: 5 @@ -177,7 +177,7 @@ DEVAST: Type: Heavy Mobile: ROT: 3 - Speed: 4 + Speed: 42 Crushes: crate, infantry RevealsShroud: Range: 7 @@ -222,7 +222,7 @@ SARDAUKAR: Health: HP: 100 Mobile: - Speed: 4 + Speed: 42 RevealsShroud: Range: 6 TakeCover: @@ -234,3 +234,4 @@ SARDAUKAR: Armament@SECONDARY: Weapon: Slung AttackFrontal: + diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 171bd9ff02..88efb39574 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -15,7 +15,7 @@ RIFLE: Health: HP: 50 Mobile: - Speed: 5 + Speed: 53 Armament: Weapon: LMG AttackFrontal: @@ -43,7 +43,7 @@ ENGINEER: Health: HP: 25 Mobile: - Speed: 5 + Speed: 53 Passenger: PipType: Yellow EngineerRepair: @@ -70,7 +70,7 @@ BAZOOKA: Health: HP: 45 Mobile: - Speed: 4 + Speed: 42 Armament: Weapon: Bazooka LocalOffset: 0,0,555 @@ -99,7 +99,7 @@ MEDIC: Health: HP: 60 Mobile: - Speed: 4 + Speed: 42 AutoHeal: Armament: Weapon: Heal @@ -109,4 +109,5 @@ MEDIC: PipType: Blue -AutoTarget: AttackMove: - JustMove: true \ No newline at end of file + JustMove: true + diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 3dfceed310..6c4e9ee6c1 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -87,7 +87,7 @@ PALACEO: ChargeTime: 180 LongDesc: Ornithopter drops a load of parachuted\nbombs on your target UnitType: orni.bomber - SelectTargetSound: + SelectTargetSound: FlareType: CanPowerDown: RequiresPower: @@ -100,7 +100,7 @@ MCVO: Transforms: Facing: 16 IntoActor: conyardo - Offset:-1,-1 + Offset: -1,-1 NoTransformSounds: OI_DPLOY.AUD RenderUnit: Image: DMCV @@ -121,7 +121,7 @@ COMBATO: Turreted: ROT: 8 Mobile: - Speed: 9 + Speed: 96 ROT: 8 Crushes: crate, infantry RenderUnit: @@ -162,7 +162,7 @@ RAIDER: Type: Light Mobile: ROT: 10 - Speed: 14 + Speed: 149 RevealsShroud: Range: 7 RenderUnit: @@ -196,7 +196,7 @@ STEALTHRAIDER: Type: Light Mobile: ROT: 10 - Speed: 14 + Speed: 149 RevealsShroud: Range: 7 RenderUnit: @@ -241,7 +241,7 @@ DEVIATORTANK: Hotkey: d Mobile: ROT: 3 - Speed: 6 + Speed: 64 Health: HP: 125 Armor: @@ -251,7 +251,7 @@ DEVIATORTANK: RenderUnit: Armament: Weapon: FakeMissile - LocalOffset: -299,0,85 #7 + LocalOffset: -299,0,85 AttackLoyalty: AutoTarget: InitialStance: Defend @@ -287,7 +287,7 @@ SABOTEUR: Health: HP: 100 Mobile: - Speed: 6 + Speed: 64 RevealsShroud: Range: 7 C4Demolition: @@ -295,3 +295,4 @@ SABOTEUR: -AutoTarget: AttackMove: JustMove: true + diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 8e891b3eb6..ce94979cb5 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -92,10 +92,10 @@ RallyPoint: RallyPoint: 1,3 Exit@1: - SpawnOffset: 11,18 + SpawnOffset: 352,576,0 ExitCell: 0,2 Exit@2: - SpawnOffset: 16,15 + SpawnOffset: 512,480,0 ExitCell: 1,2 Production: Produces: Infantry @@ -211,7 +211,7 @@ RallyPoint: RallyPoint: 2,2 Exit@1: - SpawnOffset: 17,-7 + SpawnOffset: 544,-224,0 ExitCell: 2,1 Production: Produces: Vehicle @@ -251,7 +251,7 @@ RallyPoint: RallyPoint: 0,3 Exit@1: - SpawnOffset: 8,6 + SpawnOffset: 256,192,0 ExitCell: 0,2 Production: Produces: Armor @@ -326,10 +326,10 @@ RallyPoint: RallyPoint: 1,3 Exit@1: - SpawnOffset: 0,-15 + SpawnOffset: 0,-480,0 ExitCell: 2,2 Exit@2: - SpawnOffset: 0,-15 + SpawnOffset: 0,-480,0 ExitCell: 0,2 ProductionAirdrop: Produces: Starport @@ -371,9 +371,6 @@ CrushClasses: Concretewall LineBuild: Range: 8 -# SelectionDecorations: -# Selectable: -# Priority: 1 TargetableBuilding: TargetTypes: Ground, C4 RenderBuildingWall: @@ -383,7 +380,7 @@ RelativeToTopLeft: yes AutoTargetIgnore: ProximityCaptor: - Types:Wall + Types: Wall Sellable: Guardable: BodyOrientation: @@ -463,7 +460,7 @@ WALL: -GivesBuildableArea: Health: HP: 400 - Armor: + Armor: Type: Concrete RevealsShroud: Range: 10 @@ -665,7 +662,6 @@ HEAVYC: RenderBuildingWarFactory: Image: HEAVYC -# custom prerequisites: CONYARD: Tooltip: Name: Construction Yard @@ -689,3 +685,4 @@ REPAIR: RESEARCH: Tooltip: Name: Ix Lab + diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index c529eb38ff..6b855dafd4 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -43,7 +43,7 @@ Player: ActorGroupProxy: DeveloperMode: HackyAI@Omnius: - Name:Omnius + Name: Omnius UnitQueues: Infantry, Vehicle, Armor, Starport RallypointTestBuilding: conyarda BuildingCommonNames: @@ -145,7 +145,7 @@ Player: combato: 100% SquadSize: 8 HackyAI@Vidius: - Name:Vidious + Name: Vidious UnitQueues: Infantry, Vehicle, Armor, Starport RallypointTestBuilding: conyarda BuildingCommonNames: @@ -248,7 +248,7 @@ Player: combato: 100% SquadSize: 6 HackyAI@Gladius: - Name:Gladius + Name: Gladius UnitQueues: Infantry, Vehicle, Armor, Starport RallypointTestBuilding: conyarda BuildingCommonNames: @@ -362,7 +362,6 @@ World: LoadWidgetAtGameStart: Widget: INGAME_ROOT ScreenShaker: -# NukePaletteEffect: # TODO: does not work well with additive blending (idle overlays still use player palette effects) BuildingInfluence: ChooseBuildTabOnSelect: CrateSpawner: @@ -565,7 +564,7 @@ CRATE: Palette: effect WithCrateBody: ProximityCaptor: - Types:Crate + Types: Crate Passenger: BodyOrientation: @@ -588,7 +587,7 @@ SPICEBLOOM: EditorAppearance: RelativeToTopLeft: yes ProximityCaptor: - Types:Tree + Types: Tree Tooltip: Name: Spice Bloom SeedsResource: @@ -597,3 +596,4 @@ SPICEBLOOM: RadarColorFromTerrain: Terrain: Spice BodyOrientation: + diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 9a0a3ccbd2..59044db758 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -18,7 +18,7 @@ Armor: Type: Light Mobile: - Speed: 6 + Speed: 64 Crushes: crate, infantry RevealsShroud: Range: 8 @@ -64,16 +64,14 @@ HARVESTER: HarvestFacings: 8 Resources: Spice UnloadTicksPerBale: 5 - # How far away from our linked refinery to find resources (in cells): SearchFromProcRadius: 24 - # How far away from last harvest order location to find more resources (in cells): SearchFromOrderRadius: 12 Health: HP: 1000 Armor: Type: Heavy Mobile: - Speed: 6 + Speed: 64 Crushes: crate, infantry RenderUnit: Image: HARVESTER @@ -124,7 +122,7 @@ TRIKE: Type: Light Mobile: ROT: 10 - Speed: 12 + Speed: 128 RevealsShroud: Range: 7 RenderUnit: @@ -137,11 +135,6 @@ TRIKE: Explodes: Weapon: UnitExplodeTiny EmptyWeapon: UnitExplodeTiny -# Cargo: -# Types: Infantry -# MaxWeight: 1 -# PipCount: 1 -# UnloadFacing: 220 TRIKE.starport: Inherits: TRIKE @@ -168,11 +161,11 @@ QUAD: Description: Missile Scout\n Strong vs Vehicles\n Weak vs Infantry Health: HP: 125 - Armor: + Armor: Type: Light Mobile: ROT: 8 - Speed: 9 + Speed: 96 RevealsShroud: Range: 8 Armament: @@ -212,7 +205,7 @@ QUAD.starport: Armor: Type: Heavy Mobile: - Speed: 6 + Speed: 64 ROT: 6 Crushes: crate, infantry RevealsShroud: @@ -261,7 +254,7 @@ SIEGETANK: Armor: Type: Heavy Mobile: - Speed: 5 + Speed: 53 ROT: 3 Crushes: crate, infantry RevealsShroud: @@ -318,7 +311,7 @@ MISSILETANK: BuildPaletteOrder: 60 Hotkey: r Mobile: - Speed: 6 + Speed: 64 ROT: 5 Health: HP: 90 @@ -356,3 +349,4 @@ MISSILETANK.starport: Owner: atreides, harkonnen, ordos Valued: Cost: 1250 + diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index a3a467daea..8447341035 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -1,15 +1,15 @@ LMG: ROF: 20 - Range: 5 + Range: 5c0 Report: MGUN2.WAV Projectile: Bullet - Speed: 100 + Speed: 1c256 ContrailLength: 3 TrailInterval: 1 ContrailDelay: 0 ContrailUsePlayerColor: true Warhead: - Spread: 3 + Spread: 96 Versus: Wood: 25% Light: 40% @@ -21,20 +21,20 @@ LMG: Bazooka: ROF: 50 - Range: 5 + Range: 5c0 Report: BAZOOK1.WAV ValidTargets: Ground Projectile: Missile - Speed: 25 + Speed: 160 Arm: 2 Shadow: yes ContrailLength: 10 - Inaccuracy: 3 + Inaccuracy: 96 Image: RPG ROT: 5 RangeLimit: 35 Warhead: - Spread: 3 + Spread: 96 Versus: None: 10% Wood: 75% @@ -49,17 +49,17 @@ Bazooka: Sniper: ROF: 100 - Range: 8.5 + Range: 8c512 Report: FREMODD1.WAV Projectile: Bullet - Speed: 150 + Speed: 1c896 ContrailLength: 6 TrailInterval: 1 ContrailDelay: 0 ContrailUsePlayerColor: true - Warhead: + Warhead: Damage: 60 - Spread: 1 + Spread: 32 Versus: None: 100% Wood: 0% @@ -70,17 +70,17 @@ Sniper: Vulcan: ROF: 30 - Range: 5.75 - Report: VULCAN.AUD # TODO: fallback to RA + Range: 5c768 + Report: VULCAN.AUD ValidTargets: Ground, Air Projectile: Bullet - Speed: 100 + Speed: 1c256 ContrailLength: 3 TrailInterval: 1 ContrailDelay: 0 ContrailUsePlayerColor: true Warhead: - Spread: 3 + Spread: 96 Versus: Wood: 0% Light: 60% @@ -93,18 +93,18 @@ Vulcan: Slung: ROF: 60 Delay: 5 - Range: 5.5 + Range: 5c512 Report: BAZOOK2.WAV ValidTargets: Ground Projectile: Bullet - Speed: 25 + Speed: 320 High: true Shadow: yes - Angle: .15 - Inaccuracy: 12 + Angle: 88 + Inaccuracy: 384 Image: MISSILE Warhead: - Spread: 6 + Spread: 192 Versus: None: 0% Wood: 75% @@ -118,18 +118,18 @@ Slung: HMG: ROF: 30 - Range: 5 + Range: 5c0 Burst: 2 BurstDelay: 5 Report: 20MMGUN1.WAV Projectile: Bullet - Speed: 100 + Speed: 1c256 ContrailLength: 3 TrailInterval: 1 ContrailDelay: 0 ContrailUsePlayerColor: true Warhead: - Spread: 3 + Spread: 96 Versus: Wood: 15% Light: 45% @@ -141,18 +141,18 @@ HMG: HMGo: ROF: 30 - Range: 5 + Range: 5c0 Burst: 2 BurstDelay: 5 Report: 20MMGUN1.WAV Projectile: Bullet - Speed: 100 + Speed: 1c256 ContrailLength: 3 TrailInterval: 1 ContrailDelay: 0 ContrailUsePlayerColor: true Warhead: - Spread: 3 + Spread: 96 Versus: Wood: 15% Light: 45% @@ -166,19 +166,19 @@ QuadRockets: ROF: 40 Burst: 2 BurstDelay: 25 - Range: 7 + Range: 7c0 Report: ROCKET1.WAV ValidTargets: Ground, Air Projectile: Missile Arm: 0 Shadow: yes - Inaccuracy: 3 + Inaccuracy: 96 Image: RPG ROT: 10 - Speed: 40 + Speed: 256 RangeLimit: 40 Warhead: - Spread: 3 + Spread: 96 Versus: None: 35% Wood: 45% @@ -193,16 +193,16 @@ QuadRockets: TurretGun: ROF: 35 - Range: 7 + Range: 7c0 Report: TURRET1.WAV Projectile: Bullet - Speed: 55 + Speed: 704 High: yes Shadow: no - Inaccuracy: 9 + Inaccuracy: 288 Image: 120mm Warhead: - Spread: 8 + Spread: 256 Versus: None: 50% Wood: 75% @@ -216,8 +216,8 @@ TurretGun: TowerMissile: ROF: 35 - Range: 7.75 - MinRange: 1 + Range: 7c768 + MinRange: 1c0 Report: ROCKET1.WAV ValidTargets: Ground, Air Burst: 2 @@ -226,14 +226,14 @@ TowerMissile: Arm: 0 High: yes Shadow: yes - Inaccuracy: 12 + Inaccuracy: 384 Image: MISSILE2 ROT: 10 - Speed: 20 + Speed: 256 RangeLimit: 50 - Angle: 0.2 + Angle: 110 Warhead: - Spread: 12 + Spread: 384 Versus: None: 50% Wood: 45% @@ -248,14 +248,14 @@ TowerMissile: 90mm: ROF: 50 - Range: 5.75 + Range: 5c768 Report: MEDTANK1.WAV Projectile: Bullet - Speed: 50 - Inaccuracy: 12 + Speed: 640 + Inaccuracy: 384 Image: 120mm Warhead: - Spread: 8 + Spread: 256 Versus: None: 50% Wood: 50% @@ -269,14 +269,14 @@ TowerMissile: 90mma: ROF: 50 - Range: 7 + Range: 7c0 Report: MEDTANK1.WAV Projectile: Bullet - Speed: 55 - Inaccuracy: 11 + Speed: 704 + Inaccuracy: 352 Image: 120mm Warhead: - Spread: 8 + Spread: 256 Versus: None: 50% Wood: 50% @@ -290,13 +290,13 @@ TowerMissile: DevBullet: ROF: 50 - Range: 5 + Range: 5c0 Report: TANKHVY1.WAV Projectile: Bullet - Speed: 50 + Speed: 640 Image: doubleblastbullet Warhead: - Spread: 8 + Spread: 256 Versus: None: 100% Wood: 50% @@ -310,24 +310,24 @@ DevBullet: 227mm: ROF: 100 - Range: 10 - MinRange: 4 + Range: 10c0 + MinRange: 4c0 Burst: 4 BurstDelay: 15 Report: MISSLE1.WAV ValidTargets: Ground Projectile: Bullet - Speed: 28 + Speed: 358 Arm: 5 High: yes Shadow: yes - Inaccuracy: 45 - Angle: 0.2 + Inaccuracy: 1c416 + Angle: 110 Image: MISSILE2 ROT: 5 ContrailLength: 5 Warhead: - Spread: 12 + Spread: 384 Versus: None: 20% Wood: 50% @@ -342,20 +342,20 @@ DevBullet: FakeMissile: ROF: 120 - Range: 8 + Range: 8c0 Burst: 1 Report: MISSLE1.WAV Projectile: Bullet - Speed: 35 + Speed: 448 High: true Shadow: yes - Angle: 0.2 - Inaccuracy: 35 + Angle: 110 + Inaccuracy: 1c96 Image: MISSILE ContrailLength: 15 - ContrailUsePlayerColor : True + ContrailUsePlayerColor: True Warhead: - Spread: 3 + Spread: 96 Versus: None: 0% Wood: 0% @@ -367,19 +367,19 @@ FakeMissile: 155mm: ROF: 75 - Range: 8 - MinRange: 2 + Range: 8c0 + MinRange: 2c0 Report: MORTAR1.WAV Projectile: Bullet - Speed: 20 + Speed: 256 High: true Shadow: yes - Angle: .1 - Inaccuracy: 40 + Angle: 62 + Inaccuracy: 1c256 ContrailLength: 20 Image: 155mm Warhead: - Spread: 12 + Spread: 384 Versus: None: 100% Wood: 80% @@ -394,7 +394,7 @@ FakeMissile: Sound: ROF: 100 - Range: 8.5 + Range: 8c512 Report: SONIC1.WAV Projectile: LaserZap BeamWidth: 2 @@ -402,7 +402,7 @@ Sound: BeamDuration: 8 UsePlayerColor: true Warhead: - Spread: 1 + Spread: 32 Versus: None: 60% Wood: 85% @@ -413,14 +413,14 @@ Sound: ChainGun: ROF: 10 - Range: 5 - MinRange: 1 + Range: 5c0 + MinRange: 1c0 Report: 20MMGUN1.WAV Projectile: Bullet - Speed: 100 + Speed: 1c256 High: true Warhead: - Spread: 3 + Spread: 96 Versus: Wood: 50% Light: 60% @@ -432,12 +432,12 @@ ChainGun: Heal: ROF: 160 - Range: 4 + Range: 4c0 Report: Projectile: Bullet - Speed: 100 + Speed: 1c256 Warhead: - Spread: 5 + Spread: 160 Versus: Wood: 0% Light: 0% @@ -448,10 +448,10 @@ Heal: WormJaw: ROF: 10 - Range: 3 + Range: 3c0 Report: WORM.WAV Warhead: - Spread: 5 + Spread: 160 Versus: Wood: 0% Concrete: 0% @@ -459,12 +459,12 @@ WormJaw: ParaBomb: ROF: 10 - Range: 4.5 - Report: + Range: 4c512 + Report: Projectile: GravityBomb Image: BOMBS Warhead: - Spread: 6 + Spread: 192 Versus: None: 30% Wood: 75% @@ -478,11 +478,11 @@ ParaBomb: Napalm: ROF: 2 - Range: 3 + Range: 3c0 Projectile: GravityBomb Image: BOMBS Warhead: - Spread: 20 + Spread: 640 Versus: None: 20% Wood: 100% @@ -508,7 +508,7 @@ Demolish: Atomic: Warhead: Damage: 1800 - Spread: 64 + Spread: 2c0 Versus: None: 100% Wood: 100% @@ -522,7 +522,7 @@ Atomic: CrateNuke: Warhead: Damage: 800 - Spread: 50 + Spread: 1c576 Versus: None: 20% Wood: 75% @@ -536,7 +536,7 @@ CrateNuke: CrateExplosion: Warhead: Damage: 400 - Spread: 10 + Spread: 320 Versus: None: 90% Wood: 75% @@ -549,7 +549,7 @@ CrateExplosion: UnitExplode: Warhead: Damage: 500 - Spread: 10 + Spread: 320 Versus: None: 90% Wood: 75% @@ -562,7 +562,7 @@ UnitExplode: UnitExplodeSmall: Warhead: Damage: 60 - Spread: 10 + Spread: 320 Versus: None: 90% Wood: 75% @@ -575,7 +575,7 @@ UnitExplodeSmall: UnitExplodeTiny: Warhead: Damage: 30 - Spread: 7 + Spread: 224 Versus: None: 90% Wood: 75% @@ -588,7 +588,7 @@ UnitExplodeTiny: UnitExplodeScale: Warhead: Damage: 90 - Spread: 13 + Spread: 416 Versus: None: 90% Wood: 75% @@ -600,16 +600,16 @@ UnitExplodeScale: Grenade: ROF: 60 - Range: 4 - Report: # TODO + Range: 4c0 + Report: Projectile: Bullet - Speed: 16 + Speed: 204 High: true - Angle: .1 - Inaccuracy: 13 - Image: BOMBS # TODO + Angle: 62 + Inaccuracy: 416 + Image: BOMBS Warhead: - Spread: 6 + Spread: 192 Versus: None: 50% Wood: 100% @@ -619,4 +619,5 @@ Grenade: InfDeath: 3 SmudgeType: SandCrater Damage: 60 - ImpactSound: EXPLLG5.WAV \ No newline at end of file + ImpactSound: EXPLLG5.WAV + diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml index 661d6c8cf9..cff38bcc79 100644 --- a/mods/ra/maps/Fort-Lonestar/map.yaml +++ b/mods/ra/maps/Fort-Lonestar/map.yaml @@ -763,7 +763,7 @@ Rules: Armor: Type: Heavy Mobile: - Speed: 5 + Speed: 71 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 7 @@ -814,7 +814,7 @@ Rules: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 4 + Speed: 56 Health: HP: 200 Passenger: @@ -840,7 +840,7 @@ Rules: Health: HP: 25 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 5 Passenger: @@ -865,7 +865,7 @@ Rules: Type: Light Mobile: ROT: 10 - Speed: 9 + Speed: 128 RevealsShroud: Range: 4 Turreted: @@ -890,7 +890,7 @@ Rules: Armor: Type: Heavy Mobile: - Speed: 10 + Speed: 142 RevealsShroud: Range: 5 Armament: @@ -923,7 +923,7 @@ Rules: Type: Light Mobile: ROT: 2 - Speed: 6 + Speed: 85 RevealsShroud: Range: 7 AttackFrontal: @@ -941,7 +941,7 @@ Rules: Armor: Type: Light Mobile: - Speed: 7 + Speed: 99 RevealsShroud: Range: 5 Armament: @@ -960,7 +960,7 @@ Rules: Armor: Type: Heavy Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 14 Turreted: @@ -1013,7 +1013,7 @@ Rules: Type: Light Plane: ROT: 5 - Speed: 30 + Speed: 280 LimitedAmmo: Ammo: 30 RenderUnit: @@ -1044,7 +1044,7 @@ Rules: WithShadow: Plane: ROT: 5 - Speed: 16 + Speed: 149 SmokeTrailWhenDamaged: Offset: -853,0,171 Interval: 2 @@ -1057,17 +1057,17 @@ VoxelSequences: Weapons: 120mm: ROF: 150 - Range: 10 + Range: 10c0 Report: CANNON1.AUD Burst: 6 Projectile: Bullet - Speed: 12 + Speed: 204 High: true - Inaccuracy: 40 + Inaccuracy: 1c682 Image: 120MM ContrailLength: 50 Warhead: - Spread: 6 + Spread: 256 Versus: None: 75% Wood: 75% @@ -1080,23 +1080,23 @@ Weapons: Damage: 150 MammothTusk: ROF: 300 - Range: 10 + Range: 10c0 Report: MISSILE6.AUD Burst: 2 ValidTargets: Ground, Air Projectile: Missile - Speed: 15 + Speed: 128 Arm: 2 High: true Shadow: false Trail: smokey ContrailLength: 150 - Inaccuracy: 20 + Inaccuracy: 853 Image: DRAGON ROT: 10 RangeLimit: 80 Warhead: - Spread: 15 + Spread: 640 Versus: None: 125% Wood: 110% @@ -1110,19 +1110,19 @@ Weapons: Damage: 250 VolkNapalm: ROF: 40 - Range: 8 + Range: 8c0 Report: firebl3.aud ValidTargets: Ground Burst: 6 BurstDelay: 1 Projectile: Bullet - Speed: 25 + Speed: 426 Image: 120MM - Inaccuracy: 60 + Inaccuracy: 2c512 Trail: smokey ContrailLength: 2 Warhead: - Spread: 8 + Spread: 341 Versus: None: 90% Wood: 170% @@ -1137,12 +1137,12 @@ Weapons: Damage: 15 ParaBomb: ROF: 5 - Range: 5 + Range: 5c0 Report: CHUTE1.AUD Projectile: GravityBomb Image: BOMBLET Warhead: - Spread: 10 + Spread: 426 Versus: None: 125% Wood: 100% @@ -1156,20 +1156,20 @@ Weapons: Damage: 200 155mm: ROF: 10 - Range: 7.5 + Range: 7c512 Burst: 20 - MinRange: 3 + MinRange: 3c0 -Report: Projectile: Bullet - Speed: 10 + Speed: 170 Trail: fb4 Image: fb3 High: true - Angle: .1 - Inaccuracy: 40 + Angle: 62 + Inaccuracy: 1c682 ContrailLength: 2 Warhead: - Spread: 10 + Spread: 426 Versus: None: 80% Wood: 100% @@ -1184,14 +1184,14 @@ Weapons: Damage: 10 FLAK-23: ROF: 10 - Range: 8 + Range: 8c0 Report: AACANON3.AUD ValidTargets: Air,Ground Projectile: Bullet - Speed: 100 + Speed: 1c682 High: true Warhead: - Spread: 5 + Spread: 213 Versus: None: 35% Wood: 30% @@ -1202,20 +1202,20 @@ Weapons: Damage: 25 SCUD: ROF: 280 - Range: 7 - MinRange: 3 + Range: 7c0 + MinRange: 3c0 Report: MISSILE1.AUD Projectile: Bullet - Speed: 10 + Speed: 170 Arm: 10 High: true Shadow: false Trail: smokey - Inaccuracy: 10 + Inaccuracy: 426 Image: V2 - Angle: .1 + Angle: 62 Warhead: - Spread: 20 + Spread: 853 Versus: None: 100% Wood: 90% @@ -1230,12 +1230,12 @@ Weapons: WaterImpactSound: kaboom1.aud SilencedPPK: ROF: 80 - Range: 2.5 + Range: 2c512 Report: silppk.aud Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 0% Light: 0% diff --git a/mods/ra/maps/Sahara.oramap b/mods/ra/maps/Sahara.oramap index 7a8311b34a..3e353cf4ac 100644 Binary files a/mods/ra/maps/Sahara.oramap and b/mods/ra/maps/Sahara.oramap differ diff --git a/mods/ra/maps/Survival02/map.yaml b/mods/ra/maps/Survival02/map.yaml index 083a961d56..7a5cbf6cde 100644 --- a/mods/ra/maps/Survival02/map.yaml +++ b/mods/ra/maps/Survival02/map.yaml @@ -1124,12 +1124,12 @@ VoxelSequences: Weapons: ParaBomb: ROF: 5 - Range: 7 + Range: 7c0 Report: CHUTE1 Projectile: GravityBomb Image: BOMBLET Warhead: - Spread: 15 + Spread: 640 Versus: None: 125% Wood: 100% diff --git a/mods/ra/maps/a-path-beyond.oramap b/mods/ra/maps/a-path-beyond.oramap index bc2db0f5f2..a467a874ed 100644 Binary files a/mods/ra/maps/a-path-beyond.oramap and b/mods/ra/maps/a-path-beyond.oramap differ diff --git a/mods/ra/maps/alaska-anarchy-redux.oramap b/mods/ra/maps/alaska-anarchy-redux.oramap index 5f1343b2ad..46ae7ad629 100644 Binary files a/mods/ra/maps/alaska-anarchy-redux.oramap and b/mods/ra/maps/alaska-anarchy-redux.oramap differ diff --git a/mods/ra/maps/all-connected.oramap b/mods/ra/maps/all-connected.oramap index 6fcc23e71d..7859eab282 100644 Binary files a/mods/ra/maps/all-connected.oramap and b/mods/ra/maps/all-connected.oramap differ diff --git a/mods/ra/maps/allies-01-classic/map.yaml b/mods/ra/maps/allies-01-classic/map.yaml index f56f221e72..aa803b38a3 100644 --- a/mods/ra/maps/allies-01-classic/map.yaml +++ b/mods/ra/maps/allies-01-classic/map.yaml @@ -2,6 +2,8 @@ Selectable: True MapFormat: 6 +RequiresMod: ra + Title: Allies 01: In the thick of it Description: In the thick of it @@ -10,6 +12,14 @@ Author: Westwood Studios Tileset: SNOW +MapSize: 128,128 + +Bounds: 49,45,30,36 + +UseAsShellmap: False + +Type: Campaign + Options: Crates: False Fog: True @@ -18,17 +28,6 @@ Options: FragileAlliances: False StartingCash: 0 ConfigurableStartingUnits: False - Difficulties: - -MapSize: 128,128 - -RequiresMod: ra - -Bounds: 49,45,30,36 - -UseAsShellmap: False - -Type: Campaign Players: PlayerReference@USSR: @@ -44,17 +43,17 @@ Players: Enemies: USSR,Greece,England PlayerReference@Greece: Name: Greece - Race: allies - ColorRamp: 161,134,200 - Allies: England - Enemies: Neutral,USSR - Required: True Playable: True AllowBots: False + Required: True LockRace: True + Race: allies + LockColor: True + ColorRamp: 161,134,200 LockSpawn: True LockTeam: True - LockColor: True + Allies: England + Enemies: Neutral,USSR PlayerReference@England: Name: England Race: allies @@ -611,14 +610,14 @@ VoxelSequences: Weapons: 8Inch: - Range: 25 - + Range: 25c0 M60mg: - Range: 5 + Range: 5c0 ROF: 20 Burst: 1 Warhead: Damage: 20 + Voices: Notifications: diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index c487f22cc7..a98bf6a0e0 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/mods/ra/maps/allies-01/map.yaml @@ -414,18 +414,18 @@ VoxelSequences: Weapons: 8Inch: ROF: 200 - Range: 25 + Range: 25c0 Burst: 2 Report: TURRET1.AUD Projectile: Bullet - Speed: 30 + Speed: 512 High: true - Angle: .1 - Inaccuracy: 100 + Angle: 62 + Inaccuracy: 4c170 Image: 120MM ContrailLength: 10 Warhead: - Spread: 5 + Spread: 213 Versus: None: 60% Wood: 75% diff --git a/mods/ra/maps/allies-02-classic/map.yaml b/mods/ra/maps/allies-02-classic/map.yaml index 0500934719..0dbc5b7a21 100644 --- a/mods/ra/maps/allies-02-classic/map.yaml +++ b/mods/ra/maps/allies-02-classic/map.yaml @@ -2,6 +2,8 @@ Selectable: True MapFormat: 6 +RequiresMod: ra + Title: Allies 02: Five to one Description: Five to one @@ -10,6 +12,14 @@ Author: Westwood Studios Tileset: SNOW +MapSize: 128,128 + +Bounds: 43,44,50,42 + +UseAsShellmap: False + +Type: Campaign + Options: Crates: False Fog: True @@ -18,17 +28,6 @@ Options: FragileAlliances: False StartingCash: 5700 ConfigurableStartingUnits: False - Difficulties: - -MapSize: 128,128 - -RequiresMod: ra - -Bounds: 43,44,50,42 - -UseAsShellmap: False - -Type: Campaign Players: PlayerReference@USSR: @@ -943,11 +942,12 @@ VoxelSequences: Weapons: M60mg: - Range: 5 + Range: 5c0 ROF: 20 Burst: 1 Warhead: Damage: 20 + Voices: Notifications: diff --git a/mods/ra/maps/allies-04/map.yaml b/mods/ra/maps/allies-04/map.yaml index fb05156cc2..1d1197688a 100644 --- a/mods/ra/maps/allies-04/map.yaml +++ b/mods/ra/maps/allies-04/map.yaml @@ -1863,7 +1863,7 @@ Rules: Tooltip: Icon: dogicon Mobile: - Speed: 4 + Speed: 56 RenderInfantry: Image: DOG TRUK.Hijackable: diff --git a/mods/ra/maps/arctic-triangle-affair.oramap b/mods/ra/maps/arctic-triangle-affair.oramap index e2313073f4..b4842acedf 100644 Binary files a/mods/ra/maps/arctic-triangle-affair.oramap and b/mods/ra/maps/arctic-triangle-affair.oramap differ diff --git a/mods/ra/maps/asymetric-battle.oramap b/mods/ra/maps/asymetric-battle.oramap index 71c9356558..8b3b162c5b 100644 Binary files a/mods/ra/maps/asymetric-battle.oramap and b/mods/ra/maps/asymetric-battle.oramap differ diff --git a/mods/ra/maps/bad-neighbors.oramap b/mods/ra/maps/bad-neighbors.oramap index 29573a8089..10fb9eef46 100644 Binary files a/mods/ra/maps/bad-neighbors.oramap and b/mods/ra/maps/bad-neighbors.oramap differ diff --git a/mods/ra/maps/battle-lake.oramap b/mods/ra/maps/battle-lake.oramap index 1d1ae3c874..ae894f3cee 100644 Binary files a/mods/ra/maps/battle-lake.oramap and b/mods/ra/maps/battle-lake.oramap differ diff --git a/mods/ra/maps/black-gold.oramap b/mods/ra/maps/black-gold.oramap index 7c7433fdd3..400fbb87b6 100644 Binary files a/mods/ra/maps/black-gold.oramap and b/mods/ra/maps/black-gold.oramap differ diff --git a/mods/ra/maps/bloody-delta.oramap b/mods/ra/maps/bloody-delta.oramap index 723fe708ee..5fd86e78df 100644 Binary files a/mods/ra/maps/bloody-delta.oramap and b/mods/ra/maps/bloody-delta.oramap differ diff --git a/mods/ra/maps/bombardment-islands.oramap b/mods/ra/maps/bombardment-islands.oramap index ce867cc288..c7ca9454b5 100644 Binary files a/mods/ra/maps/bombardment-islands.oramap and b/mods/ra/maps/bombardment-islands.oramap differ diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index 1d0cbf7bbb..a17bee923d 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -824,7 +824,7 @@ Rules: Armor: Type: Heavy Mobile: - Speed: 9 + Speed: 128 WaitAverage: 1 WaitSpread: 1 ROT: 900 diff --git a/mods/ra/maps/breaking-point.oramap b/mods/ra/maps/breaking-point.oramap index c59ec337b1..54800dbd4e 100644 Binary files a/mods/ra/maps/breaking-point.oramap and b/mods/ra/maps/breaking-point.oramap differ diff --git a/mods/ra/maps/caffeinated.oramap b/mods/ra/maps/caffeinated.oramap index 5d8746c9f9..6e3d89628c 100644 Binary files a/mods/ra/maps/caffeinated.oramap and b/mods/ra/maps/caffeinated.oramap differ diff --git a/mods/ra/maps/calm-before-storm.oramap b/mods/ra/maps/calm-before-storm.oramap index 08a402fa1a..cde8f60863 100644 Binary files a/mods/ra/maps/calm-before-storm.oramap and b/mods/ra/maps/calm-before-storm.oramap differ diff --git a/mods/ra/maps/central-conflict.oramap b/mods/ra/maps/central-conflict.oramap index 0c41de0f67..172fe7168c 100644 Binary files a/mods/ra/maps/central-conflict.oramap and b/mods/ra/maps/central-conflict.oramap differ diff --git a/mods/ra/maps/chaos-canyon.oramap b/mods/ra/maps/chaos-canyon.oramap index 20ce5187ae..70a6afdf3c 100644 Binary files a/mods/ra/maps/chaos-canyon.oramap and b/mods/ra/maps/chaos-canyon.oramap differ diff --git a/mods/ra/maps/chokepoint.oramap b/mods/ra/maps/chokepoint.oramap index 733ef4eb06..eac71d53ad 100644 Binary files a/mods/ra/maps/chokepoint.oramap and b/mods/ra/maps/chokepoint.oramap differ diff --git a/mods/ra/maps/coastal-influence.oramap b/mods/ra/maps/coastal-influence.oramap index 2e25edb5b4..6e83763da1 100644 Binary files a/mods/ra/maps/coastal-influence.oramap and b/mods/ra/maps/coastal-influence.oramap differ diff --git a/mods/ra/maps/contact.oramap b/mods/ra/maps/contact.oramap index 01ae000909..5e4acfffb1 100644 Binary files a/mods/ra/maps/contact.oramap and b/mods/ra/maps/contact.oramap differ diff --git a/mods/ra/maps/convergence.oramap b/mods/ra/maps/convergence.oramap index 5de16a0d3d..4ecadfb20f 100644 Binary files a/mods/ra/maps/convergence.oramap and b/mods/ra/maps/convergence.oramap differ diff --git a/mods/ra/maps/crossing-the-river.oramap b/mods/ra/maps/crossing-the-river.oramap index 4b70d442dc..a1a7958765 100644 Binary files a/mods/ra/maps/crossing-the-river.oramap and b/mods/ra/maps/crossing-the-river.oramap differ diff --git a/mods/ra/maps/desert-shellmap/map.yaml b/mods/ra/maps/desert-shellmap/map.yaml index b96b5e5509..4f565bea1f 100644 --- a/mods/ra/maps/desert-shellmap/map.yaml +++ b/mods/ra/maps/desert-shellmap/map.yaml @@ -1332,7 +1332,7 @@ Rules: DesertShellmapAutoUnload: MIG: Plane: - Speed: 30 + Speed: 280 BADR: Invulnerable: MISS: @@ -1346,11 +1346,11 @@ Weapons: 8Inch: Report: tank6.aud 2Inch: - Range: 10 + Range: 10c0 TTankZap: - Range: 4.75 + Range: 4c768 FLAK-23: - Range: 4 + Range: 4c0 Voices: diff --git a/mods/ra/maps/doubles.oramap b/mods/ra/maps/doubles.oramap index d58a0cd02f..db341d5b21 100644 Binary files a/mods/ra/maps/doubles.oramap and b/mods/ra/maps/doubles.oramap differ diff --git a/mods/ra/maps/doughnut.oramap b/mods/ra/maps/doughnut.oramap index 76af73630d..8dab309bb2 100644 Binary files a/mods/ra/maps/doughnut.oramap and b/mods/ra/maps/doughnut.oramap differ diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 45a9a0719a..b302227269 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -344,7 +344,7 @@ Rules: Health: HP: 120 Mobile: - Speed: 7 + Speed: 99 Sequences: @@ -353,9 +353,9 @@ VoxelSequences: Weapons: PortaTesla: ROF: 20 - Range: 10 + Range: 10c0 Warhead: - Spread: 1 + Spread: 42 InfDeath: 5 Damage: 80 diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index c61c0c52c6..43b39c6ffc 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -253,7 +253,7 @@ Rules: Health: HP: 1000 Mobile: - Speed: 12 + Speed: 170 RevealsShroud: Range: 50 Armament@PRIMARY: @@ -303,18 +303,18 @@ VoxelSequences: Weapons: 8Inch: ROF: 200 - Range: 32 + Range: 32c0 Burst: 4 Report: TURRET1 Projectile: Bullet - Speed: 32 + Speed: 546 High: true - Angle: .1 - Inaccuracy: 80 + Angle: 62 + Inaccuracy: 3c341 Image: 120MM ContrailLength: 30 Warhead: - Spread: 3 + Spread: 128 Versus: None: 60% Wood: 75% @@ -329,19 +329,19 @@ Weapons: WaterImpactSound: splash9 SubMissile: ROF: 250 - Range: 32 + Range: 32c0 Burst: 4 Report: MISSILE6 Projectile: Bullet - Speed: 24 + Speed: 409 High: true - Angle: .1 - Inaccuracy: 70 + Angle: 62 + Inaccuracy: 2c938 Image: MISSILE Trail: smokey ContrailLength: 30 Warhead: - Spread: 10 + Spread: 426 Versus: None: 40%, Light: 30% diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index ea728692b0..f25a7981cd 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -239,7 +239,7 @@ Rules: Health: HP: 120 Mobile: - Speed: 7 + Speed: 99 Sequences: @@ -248,9 +248,9 @@ VoxelSequences: Weapons: PortaTesla: ROF: 20 - Range: 10 + Range: 10c0 Warhead: - Spread: 1 + Spread: 42 InfDeath: 5 Damage: 80 diff --git a/mods/ra/maps/east-vs-west.oramap b/mods/ra/maps/east-vs-west.oramap index cbf9f4b71d..18d48c175a 100644 Binary files a/mods/ra/maps/east-vs-west.oramap and b/mods/ra/maps/east-vs-west.oramap differ diff --git a/mods/ra/maps/encounter.oramap b/mods/ra/maps/encounter.oramap index 20c94e1437..bbdeaee92d 100644 Binary files a/mods/ra/maps/encounter.oramap and b/mods/ra/maps/encounter.oramap differ diff --git a/mods/ra/maps/engagement.oramap b/mods/ra/maps/engagement.oramap index c6e9180f72..48922c501d 100644 Binary files a/mods/ra/maps/engagement.oramap and b/mods/ra/maps/engagement.oramap differ diff --git a/mods/ra/maps/equal-opportunity.oramap b/mods/ra/maps/equal-opportunity.oramap index 188be385a5..8de2519344 100644 Binary files a/mods/ra/maps/equal-opportunity.oramap and b/mods/ra/maps/equal-opportunity.oramap differ diff --git a/mods/ra/maps/first-come-first-served.oramap b/mods/ra/maps/first-come-first-served.oramap index 300153808f..80da4bd470 100644 Binary files a/mods/ra/maps/first-come-first-served.oramap and b/mods/ra/maps/first-come-first-served.oramap differ diff --git a/mods/ra/maps/forest-path.oramap b/mods/ra/maps/forest-path.oramap index 9aed8b6726..13f0025ae1 100644 Binary files a/mods/ra/maps/forest-path.oramap and b/mods/ra/maps/forest-path.oramap differ diff --git a/mods/ra/maps/free-coasts.oramap b/mods/ra/maps/free-coasts.oramap index 225bfb6b02..019150e415 100644 Binary files a/mods/ra/maps/free-coasts.oramap and b/mods/ra/maps/free-coasts.oramap differ diff --git a/mods/ra/maps/ghost-town.oramap b/mods/ra/maps/ghost-town.oramap index 38cb212c4e..5d97d06a61 100644 Binary files a/mods/ra/maps/ghost-town.oramap and b/mods/ra/maps/ghost-town.oramap differ diff --git a/mods/ra/maps/haos-ridges.oramap b/mods/ra/maps/haos-ridges.oramap index 2a28da5f1e..798e6d466c 100644 Binary files a/mods/ra/maps/haos-ridges.oramap and b/mods/ra/maps/haos-ridges.oramap differ diff --git a/mods/ra/maps/hasselhoff.oramap b/mods/ra/maps/hasselhoff.oramap index ecc9f2ee7d..792834f4a3 100644 Binary files a/mods/ra/maps/hasselhoff.oramap and b/mods/ra/maps/hasselhoff.oramap differ diff --git a/mods/ra/maps/hectic.oramap b/mods/ra/maps/hectic.oramap index 74c9fad493..5787f5e121 100644 Binary files a/mods/ra/maps/hectic.oramap and b/mods/ra/maps/hectic.oramap differ diff --git a/mods/ra/maps/high-and-low-extended.oramap b/mods/ra/maps/high-and-low-extended.oramap index ca081eff52..ff5d24458b 100644 Binary files a/mods/ra/maps/high-and-low-extended.oramap and b/mods/ra/maps/high-and-low-extended.oramap differ diff --git a/mods/ra/maps/high-and-low.oramap b/mods/ra/maps/high-and-low.oramap index 8c204d9f96..a9844bc03a 100644 Binary files a/mods/ra/maps/high-and-low.oramap and b/mods/ra/maps/high-and-low.oramap differ diff --git a/mods/ra/maps/island-hoppers.oramap b/mods/ra/maps/island-hoppers.oramap index 7e320000ae..bebf02c2a8 100644 Binary files a/mods/ra/maps/island-hoppers.oramap and b/mods/ra/maps/island-hoppers.oramap differ diff --git a/mods/ra/maps/keep-off-the-grass-2.oramap b/mods/ra/maps/keep-off-the-grass-2.oramap index 87fa5979d0..bfa3d5723b 100644 Binary files a/mods/ra/maps/keep-off-the-grass-2.oramap and b/mods/ra/maps/keep-off-the-grass-2.oramap differ diff --git a/mods/ra/maps/mad-scramble.oramap b/mods/ra/maps/mad-scramble.oramap index 372ebff689..cfb4997b0e 100644 Binary files a/mods/ra/maps/mad-scramble.oramap and b/mods/ra/maps/mad-scramble.oramap differ diff --git a/mods/ra/maps/man-to-man.oramap b/mods/ra/maps/man-to-man.oramap index 752bf86dd7..97c1f0f492 100644 Binary files a/mods/ra/maps/man-to-man.oramap and b/mods/ra/maps/man-to-man.oramap differ diff --git a/mods/ra/maps/marooned-2.oramap b/mods/ra/maps/marooned-2.oramap index 355ef4eab8..2b87ce43be 100644 Binary files a/mods/ra/maps/marooned-2.oramap and b/mods/ra/maps/marooned-2.oramap differ diff --git a/mods/ra/maps/mass-confliction.oramap b/mods/ra/maps/mass-confliction.oramap index 60c24adf73..9fdb852e97 100644 Binary files a/mods/ra/maps/mass-confliction.oramap and b/mods/ra/maps/mass-confliction.oramap differ diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 193f34e83c..24bd4d3574 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2578,7 +2578,7 @@ Rules: Armor: Type: Concrete Mobile: - Speed: 3 + Speed: 42 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 6 @@ -2750,14 +2750,14 @@ Weapons: High: True SuperTankPrimary: ROF: 70 - Range: 4.75 + Range: 4c768 Report: TURRET1 Burst: 2 Projectile: Bullet - Speed: 40 + Speed: 682 Image: 120MM Warhead: - Spread: 3 + Spread: 128 Versus: None: 20% Wood: 75% diff --git a/mods/ra/maps/nishnekolymsk.oramap b/mods/ra/maps/nishnekolymsk.oramap index 522d8a1d91..e58cf9c219 100644 Binary files a/mods/ra/maps/nishnekolymsk.oramap and b/mods/ra/maps/nishnekolymsk.oramap differ diff --git a/mods/ra/maps/north-by-northwest.oramap b/mods/ra/maps/north-by-northwest.oramap index 3c33a9223f..5cea88adc3 100644 Binary files a/mods/ra/maps/north-by-northwest.oramap and b/mods/ra/maps/north-by-northwest.oramap differ diff --git a/mods/ra/maps/pearly-wastelands.oramap b/mods/ra/maps/pearly-wastelands.oramap index 7e0606557b..b5613a55c8 100644 Binary files a/mods/ra/maps/pearly-wastelands.oramap and b/mods/ra/maps/pearly-wastelands.oramap differ diff --git a/mods/ra/maps/pressure.oramap b/mods/ra/maps/pressure.oramap index 1407593d0b..9429770571 100644 Binary files a/mods/ra/maps/pressure.oramap and b/mods/ra/maps/pressure.oramap differ diff --git a/mods/ra/maps/puddles-redux.oramap b/mods/ra/maps/puddles-redux.oramap index 437d00a4f0..44b1532f51 100644 Binary files a/mods/ra/maps/puddles-redux.oramap and b/mods/ra/maps/puddles-redux.oramap differ diff --git a/mods/ra/maps/raraku.oramap b/mods/ra/maps/raraku.oramap index f1cad2e99a..03cbc67b24 100644 Binary files a/mods/ra/maps/raraku.oramap and b/mods/ra/maps/raraku.oramap differ diff --git a/mods/ra/maps/regeneration-basin.oramap b/mods/ra/maps/regeneration-basin.oramap index 931068ea55..07ae6e180a 100644 Binary files a/mods/ra/maps/regeneration-basin.oramap and b/mods/ra/maps/regeneration-basin.oramap differ diff --git a/mods/ra/maps/ring-of-fire.oramap b/mods/ra/maps/ring-of-fire.oramap index 776b5df656..cdd7e0547f 100644 Binary files a/mods/ra/maps/ring-of-fire.oramap and b/mods/ra/maps/ring-of-fire.oramap differ diff --git a/mods/ra/maps/river-war-2.oramap b/mods/ra/maps/river-war-2.oramap index f689f7b53d..62fab8d120 100644 Binary files a/mods/ra/maps/river-war-2.oramap and b/mods/ra/maps/river-war-2.oramap differ diff --git a/mods/ra/maps/room-warzone.oramap b/mods/ra/maps/room-warzone.oramap index e9bdbaaa01..d9ea076941 100644 Binary files a/mods/ra/maps/room-warzone.oramap and b/mods/ra/maps/room-warzone.oramap differ diff --git a/mods/ra/maps/seven-stairs.oramap b/mods/ra/maps/seven-stairs.oramap index d37f7941f5..ff750b5e79 100644 Binary files a/mods/ra/maps/seven-stairs.oramap and b/mods/ra/maps/seven-stairs.oramap differ diff --git a/mods/ra/maps/snow town.oramap b/mods/ra/maps/snow town.oramap index edb8442921..1a0995441a 100644 Binary files a/mods/ra/maps/snow town.oramap and b/mods/ra/maps/snow town.oramap differ diff --git a/mods/ra/maps/snowy-island.oramap b/mods/ra/maps/snowy-island.oramap index 3662e3f1d1..4748e30b59 100644 Binary files a/mods/ra/maps/snowy-island.oramap and b/mods/ra/maps/snowy-island.oramap differ diff --git a/mods/ra/maps/snowyridge.oramap b/mods/ra/maps/snowyridge.oramap index b787a066f0..97b8afb56a 100644 Binary files a/mods/ra/maps/snowyridge.oramap and b/mods/ra/maps/snowyridge.oramap differ diff --git a/mods/ra/maps/soviet-01-classic/map.yaml b/mods/ra/maps/soviet-01-classic/map.yaml index 95afd61f23..468ac21a51 100644 --- a/mods/ra/maps/soviet-01-classic/map.yaml +++ b/mods/ra/maps/soviet-01-classic/map.yaml @@ -911,7 +911,7 @@ Rules: RevealsShroud: Range: 7 Exit@1: - SpawnOffset: 0,4 + SpawnOffset: 0,170,0 ExitCell: 1,1 Facing: 192 RenderBuilding: diff --git a/mods/ra/maps/strip-mine.oramap b/mods/ra/maps/strip-mine.oramap index 97fb2fd74d..22befac689 100644 Binary files a/mods/ra/maps/strip-mine.oramap and b/mods/ra/maps/strip-mine.oramap differ diff --git a/mods/ra/maps/styrian-mountains.oramap b/mods/ra/maps/styrian-mountains.oramap index 8fcd885899..16e072be6c 100644 Binary files a/mods/ra/maps/styrian-mountains.oramap and b/mods/ra/maps/styrian-mountains.oramap differ diff --git a/mods/ra/maps/suffrage.oramap b/mods/ra/maps/suffrage.oramap index 4ea50951be..91a56b4470 100644 Binary files a/mods/ra/maps/suffrage.oramap and b/mods/ra/maps/suffrage.oramap differ diff --git a/mods/ra/maps/tainted-peak.oramap b/mods/ra/maps/tainted-peak.oramap index 0e355193f9..01f1615525 100644 Binary files a/mods/ra/maps/tainted-peak.oramap and b/mods/ra/maps/tainted-peak.oramap differ diff --git a/mods/ra/maps/temperal.oramap b/mods/ra/maps/temperal.oramap index 8ce34e42a9..778f379462 100644 Binary files a/mods/ra/maps/temperal.oramap and b/mods/ra/maps/temperal.oramap differ diff --git a/mods/ra/maps/the-white-pentagon.oramap b/mods/ra/maps/the-white-pentagon.oramap index 8c2c4add39..5e4a64ce25 100644 Binary files a/mods/ra/maps/the-white-pentagon.oramap and b/mods/ra/maps/the-white-pentagon.oramap differ diff --git a/mods/ra/maps/tournament-island.oramap b/mods/ra/maps/tournament-island.oramap index 02f1f0ce33..cdeced5773 100644 Binary files a/mods/ra/maps/tournament-island.oramap and b/mods/ra/maps/tournament-island.oramap differ diff --git a/mods/ra/maps/vegetation.oramap b/mods/ra/maps/vegetation.oramap index 2b02e34725..57b945ffb5 100644 Binary files a/mods/ra/maps/vegetation.oramap and b/mods/ra/maps/vegetation.oramap differ diff --git a/mods/ra/maps/winter-warzone.oramap b/mods/ra/maps/winter-warzone.oramap index b79ed35f0d..41b9176986 100644 Binary files a/mods/ra/maps/winter-warzone.oramap and b/mods/ra/maps/winter-warzone.oramap differ diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 21dd684d9c..a5e4c7563c 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -8,13 +8,12 @@ BADR: Type: Light Plane: ROT: 5 - Speed: 16 + Speed: 149 RenderUnit: WithShadow: IronCurtainable: Cargo: MaxWeight: 10 -# Types: Infantry, Vehicle -Selectable: -GainsExperience: Tooltip: @@ -46,7 +45,7 @@ BADR.Bomber: Type: Light Plane: ROT: 5 - Speed: 16 + Speed: 149 LimitedAmmo: Ammo: 7 RenderUnit: @@ -101,7 +100,7 @@ MIG: Plane: InitialFacing: 192 ROT: 5 - Speed: 20 + Speed: 186 RearmBuildings: afld RenderUnit: CameraPitch: 99 @@ -154,7 +153,7 @@ YAK: RearmBuildings: afld InitialFacing: 192 ROT: 5 - Speed: 16 + Speed: 149 RenderUnit: CameraPitch: 99 WithShadow: @@ -190,7 +189,7 @@ TRAN: Description: Fast Infantry Transport Helicopter.\n Unarmed Health: HP: 120 - Armor: + Armor: Type: Light RevealsShroud: Range: 12 @@ -198,7 +197,7 @@ TRAN: RearmBuildings: hpad InitialFacing: 0 ROT: 5 - Speed: 12 + Speed: 112 LandableTerrainTypes: Clear,Rough,Road,Ore,Beach RenderUnit: WithRotor@PRIMARY: @@ -261,7 +260,7 @@ HELI: LandWhenIdle: false InitialFacing: 20 ROT: 4 - Speed: 16 + Speed: 149 RenderUnit: WithRotor: Offset: 0,0,85 @@ -307,7 +306,7 @@ HIND: LandWhenIdle: false InitialFacing: 20 ROT: 4 - Speed: 12 + Speed: 112 RenderUnit: WithRotor: WithShadow: @@ -334,7 +333,7 @@ U2: Type: Heavy Plane: ROT: 7 - Speed: 40 + Speed: 373 RenderUnit: WithShadow: IronCurtainable: @@ -360,7 +359,7 @@ BADR.Husk: WithShadow: Plane: ROT: 5 - Speed: 16 + Speed: 149 SmokeTrailWhenDamaged@0: Offset: -432,560,0 Interval: 2 @@ -384,7 +383,7 @@ MIG.Husk: Offset: -598,683,0 Plane: ROT: 5 - Speed: 20 + Speed: 186 SmokeTrailWhenDamaged: Offset: -853,0,171 Interval: 2 @@ -404,7 +403,7 @@ YAK.Husk: Offset: -853,0,0 Plane: ROT: 5 - Speed: 16 + Speed: 149 SmokeTrailWhenDamaged: Offset: -853,0,0 Interval: 2 @@ -421,7 +420,7 @@ TRAN.Husk: WithShadow: Helicopter: ROT: 4 - Speed: 16 + Speed: 149 WithRotor@PRIMARY: Offset: -597,0,341 WithRotor@SECONDARY: @@ -439,7 +438,7 @@ HELI.Husk: WithShadow: Helicopter: ROT: 4 - Speed: 16 + Speed: 149 WithRotor: Offset: 0,0,85 SmokeTrailWhenDamaged: @@ -457,7 +456,7 @@ HIND.Husk: WithShadow: Helicopter: ROT: 4 - Speed: 12 + Speed: 112 WithRotor: SmokeTrailWhenDamaged: Offset: -427,0,0 @@ -472,7 +471,7 @@ U2.Husk: WithShadow: Plane: ROT: 7 - Speed: 40 + Speed: 373 Contrail@1: Offset: -725,683,0 Contrail@2: @@ -481,3 +480,4 @@ U2.Husk: Offset: -1c43,0,0 Interval: 2 MinDamage: Undamaged + diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 05548a6727..505cb22a4c 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -235,14 +235,14 @@ V18: Inherits: ^CivField EditorTilesetFilter: ExcludeTilesets: DESERT - + V19: Inherits: ^CivBuilding EditorTilesetFilter: ExcludeTilesets: DESERT Tooltip: Name: Oil Pump - LeavesHusk: + LeavesHusk: HuskActor: V19.Husk AutoTargetIgnore: @@ -501,7 +501,6 @@ BRIDGEHUT.small: TargetableBuilding: TargetTypes: BridgeHut -#Desert Terrain Expansion V20: Inherits: ^DesertCivBuilding Building: @@ -648,5 +647,6 @@ SNOWHUT: Building: Footprint: x x Dimensions: 1,2 - RenderBuilding: + RenderBuilding: Scale: 0.7 + diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 87f214d0c2..116b28977d 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -11,15 +11,15 @@ Beach: 40 ROT: 5 SelectionDecorations: - Selectable: + Selectable: Voice: VehicleVoice TargetableUnit: TargetTypes: Ground - Repairable: - Chronoshiftable: - Passenger: + Repairable: + Chronoshiftable: + Passenger: CargoType: Vehicle - IronCurtainable: + IronCurtainable: AttackMove: HiddenUnderFog: GainsExperience: @@ -27,10 +27,10 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Vehicle + Types: Vehicle GivesBounty: GpsDot: - String:Vehicle + String: Vehicle WithSmoke: UpdatesPlayerStatistics: CombatDebugOverlay: @@ -58,13 +58,13 @@ Beach: 70 ROT: 5 SelectionDecorations: - Selectable: + Selectable: Voice: VehicleVoice TargetableUnit: TargetTypes: Ground - Repairable: - Chronoshiftable: - Passenger: + Repairable: + Chronoshiftable: + Passenger: CargoType: Vehicle IronCurtainable: AttackMove: @@ -74,10 +74,10 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Tank + Types: Tank GivesBounty: GpsDot: - String:Vehicle + String: Vehicle WithSmoke: UpdatesPlayerStatistics: CombatDebugOverlay: @@ -95,7 +95,7 @@ ^Infantry: AppearsOnRadar: Health: - Radius: 3 + Radius: 128 Armor: Type: None RevealsShroud: @@ -127,10 +127,10 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Infantry + Types: Infantry GivesBounty: GpsDot: - String:Infantry + String: Infantry ParachuteAttachment: Offset: 0,0,427 CrushableInfantry: @@ -170,10 +170,10 @@ ActorLostNotification: Notification: NavalUnitLost ProximityCaptor: - Types:Ship + Types: Ship GivesBounty: GpsDot: - String:Ship + String: Ship WithSmoke: UpdatesPlayerStatistics: CombatDebugOverlay: @@ -199,7 +199,7 @@ ActorLostNotification: Notification: AirUnitLost ProximityCaptor: - Types:Plane + Types: Plane EjectOnDeath: PilotActor: E1 SuccessRate: 50 @@ -207,7 +207,7 @@ EjectInAir: yes GivesBounty: GpsDot: - String:Plane + String: Plane UpdatesPlayerStatistics: CombatDebugOverlay: BodyOrientation: @@ -217,7 +217,7 @@ ^Helicopter: Inherits: ^Plane GpsDot: - String:Helicopter + String: Helicopter ^Building: AppearsOnRadar: @@ -250,7 +250,7 @@ RelativeToTopLeft: yes ShakeOnDeath: ProximityCaptor: - Types:Building + Types: Building Sellable: AcceptsSupplies: GivesBounty: @@ -261,7 +261,7 @@ BodyOrientation: FrozenUnderFog: GpsDot: - String:Structure + String: Structure Huntable: LuaScriptEvents: @@ -294,7 +294,7 @@ UseTerrainPalette: true AutoTargetIgnore: ProximityCaptor: - Types:Wall + Types: Wall Sellable: Guardable: BodyOrientation: @@ -312,7 +312,7 @@ Tooltip: Name: Civilian Building ProximityCaptor: - Types:CivilianBuilding + Types: CivilianBuilding -AcceptsSupplies: -GivesBuildableArea: -Sellable: @@ -351,14 +351,14 @@ Health: HP: 20 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 2 Armament: Weapon: Pistol AttackFrontal: ProximityCaptor: - Types:CivilianInfantry + Types: CivilianInfantry -RenderInfantry: RenderInfantryPanic: ScaredyCat: @@ -377,7 +377,7 @@ Name: Field -ProximityCaptor: ProximityCaptor: - Types:CivilianField + Types: CivilianField ^Tree: Tooltip: @@ -394,7 +394,7 @@ RelativeToTopLeft: yes UseTerrainPalette: true ProximityCaptor: - Types:Tree + Types: Tree Health: HP: 500 DeadBuildingState: @@ -418,7 +418,7 @@ AppearsOnRadar: Burns: ProximityCaptor: - Types:Husk + Types: Husk BelowUnits: BodyOrientation: Chronoshiftable: @@ -454,12 +454,11 @@ Health: HP: 1000 ProximityCaptor: - Types:Bridge + Types: Bridge AutoTargetIgnore: BodyOrientation: LuaScriptEvents: -#Temperate Terrain Expansion ^SVBridge: Tooltip: Name: Small Bridge @@ -472,7 +471,7 @@ Health: HP: 750 ProximityCaptor: - Types:Bridge + Types: Bridge AutoTargetIgnore: BodyOrientation: LuaScriptEvents: @@ -489,7 +488,7 @@ Health: HP: 750 ProximityCaptor: - Types:Bridge + Types: Bridge AutoTargetIgnore: BodyOrientation: LuaScriptEvents: @@ -506,12 +505,11 @@ Health: HP: 750 ProximityCaptor: - Types:Bridge + Types: Bridge AutoTargetIgnore: BodyOrientation: LuaScriptEvents: -#Desert Terrain Expansion: ^Rock: Tooltip: Name: Rock @@ -527,7 +525,7 @@ RelativeToTopLeft: yes UseTerrainPalette: true ProximityCaptor: - Types:Tree + Types: Tree BodyOrientation: FrozenUnderFog: StartsRevealed: true @@ -537,3 +535,4 @@ Inherits: ^CivBuilding RenderBuilding: Palette: terrain + diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index f9747c002e..7420322916 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -17,7 +17,7 @@ DOG: Health: HP: 12 Mobile: - Speed: 7 + Speed: 99 RevealsShroud: Range: 5 Armament: @@ -44,7 +44,7 @@ E1: Health: HP: 50 Mobile: - Speed: 4 + Speed: 56 Armament: Weapon: M1Carbine AttackFrontal: @@ -72,7 +72,7 @@ E2: Health: HP: 50 Mobile: - Speed: 5 + Speed: 71 Armament: Weapon: Grenade LocalOffset: 0,0,555 @@ -104,7 +104,7 @@ E3: Health: HP: 45 Mobile: - Speed: 4 + Speed: 56 Armament@PRIMARY: Weapon: RedEye LocalOffset: 0,0,555 @@ -136,7 +136,7 @@ E4: Health: HP: 40 Mobile: - Speed: 4 + Speed: 56 Armament: Weapon: Flamer LocalOffset: 427,0,341 @@ -166,7 +166,7 @@ E6: Health: HP: 25 Mobile: - Speed: 4 + Speed: 56 Passenger: PipType: Yellow EngineerRepair: @@ -200,7 +200,7 @@ SPY: Health: HP: 25 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 5 Passenger: @@ -240,7 +240,7 @@ E7: Health: HP: 100 Mobile: - Speed: 5 + Speed: 71 RevealsShroud: Range: 6 C4Demolition: @@ -276,7 +276,7 @@ MEDI: Health: HP: 80 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 3 Passenger: @@ -313,7 +313,7 @@ MECH: Health: HP: 80 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 3 Passenger: @@ -343,7 +343,7 @@ EINSTEIN: Health: HP: 25 Mobile: - Speed: 5 + Speed: 71 RevealsShroud: Range: 2 -AutoTarget: @@ -367,7 +367,7 @@ DELPHI: Health: HP: 25 Mobile: - Speed: 5 + Speed: 71 RevealsShroud: Range: 2 -AutoTarget: @@ -404,7 +404,7 @@ THF: Health: HP: 25 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 5 Passenger: @@ -435,7 +435,7 @@ SHOK: Health: HP: 80 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 4 Armament: @@ -465,7 +465,7 @@ SNIPER: Selectable: Bounds: 12,17,0,-6 Mobile: - Speed: 4 + Speed: 56 Health: HP: 80 Passenger: @@ -511,7 +511,7 @@ Zombie: Health: HP: 250 Mobile: - Speed: 3 + Speed: 42 AutoTarget: ScanRadius: 5 AttackFrontal: @@ -535,9 +535,9 @@ Ant: Bounds: 30,30,0,-2 Health: HP: 750 - Radius: 11 + Radius: 469 Mobile: - Speed: 7 + Speed: 99 ROT: 12 SharesCell: no AutoTarget: @@ -545,3 +545,4 @@ Ant: AttackFrontal: Armament: Weapon: mandible + diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 34ea0d7607..3db6a2e1da 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -17,7 +17,7 @@ SS: Type: Light Mobile: ROT: 4 - Speed: 5 + Speed: 71 RevealsShroud: Range: 6 -TargetableUnit: @@ -64,7 +64,7 @@ MSUB: Type: Light Mobile: ROT: 3 - Speed: 3 + Speed: 42 RevealsShroud: Range: 6 RenderUnit: @@ -111,7 +111,7 @@ DD: Type: Heavy Mobile: ROT: 7 - Speed: 6 + Speed: 85 RevealsShroud: Range: 6 Turreted: @@ -157,7 +157,7 @@ CA: Type: Heavy Mobile: ROT: 3 - Speed: 3 + Speed: 42 RevealsShroud: Range: 7 Turreted@PRIMARY: @@ -215,7 +215,7 @@ LST: Type: Heavy Mobile: ROT: 10 - Speed: 8 + Speed: 113 RevealsShroud: Range: 6 RenderUnit: @@ -247,7 +247,7 @@ PT: Type: Heavy Mobile: ROT: 7 - Speed: 9 + Speed: 128 RevealsShroud: Range: 7 Turreted: @@ -269,3 +269,4 @@ PT: Chronoshiftable: IronCurtainable: RepairableNear: + diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 777391d6cb..e129be89a6 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -103,19 +103,19 @@ SPEN: RevealsShroud: Range: 4 Exit@1: - SpawnOffset: 0,-5 + SpawnOffset: 0,-213,0 Facing: 96 ExitCell: -1,2 Exit@2: - SpawnOffset: 0,-5 + SpawnOffset: 0,-213,0 Facing: 160 ExitCell: 3,2 Exit@3: - SpawnOffset: 0,0 + SpawnOffset: 0,0,0 Facing: 32 ExitCell: 0,0 Exit@4: - SpawnOffset: 0,0 + SpawnOffset: 0,0,0 Facing: 224 ExitCell: 2,0 Production: @@ -160,19 +160,19 @@ SYRD: RevealsShroud: Range: 4 Exit@1: - SpawnOffset: -24,24 + SpawnOffset: -1024,1024,0 Facing: 160 ExitCell: 0,2 Exit@2: - SpawnOffset: 24,24 + SpawnOffset: 1024,1024,0 Facing: 224 ExitCell: 2,2 Exit@3: - SpawnOffset: -24,-24 + SpawnOffset: -1024,-1024,0 Facing: 96 ExitCell: 0,0 Exit@4: - SpawnOffset: 24,-24 + SpawnOffset: 1024,-1024,0 Facing: 32 ExitCell: 2,0 Production: @@ -410,18 +410,12 @@ PBOX: MaxWeight: 1 PipCount: 1 -EmitInfantryOnSell: -# EmitCargoOnSell: DrawLineToTarget: TransformOnPassenger@e1: PassengerTypes: e1 OnEnter: pbox.e1 OnExit: pbox SkipMakeAnims: true -# TransformOnPassenger@e2: -# PassengerTypes: e2 -# OnEnter: pbox.e2 -# OnExit: pbox -# SkipMakeAnims: true TransformOnPassenger@e3: PassengerTypes: e3 OnEnter: pbox.e3 @@ -471,13 +465,6 @@ PBOX.E1: Cargo: InitialUnits: e1 -#PBOX.E2: -# Inherits: PBOX -# Tooltip: -# Name: Pillbox (Grenades) -# RenderBuilding: -# Image: PBOX - PBOX.E3: Inherits: PBOX Tooltip: @@ -572,18 +559,12 @@ HBOX: MaxWeight: 1 PipCount: 1 -EmitInfantryOnSell: -# EmitCargoOnSell: DrawLineToTarget: TransformOnPassenger@e1: PassengerTypes: e1 OnEnter: HBOX.e1 OnExit: HBOX SkipMakeAnims: true -# TransformOnPassenger@e2: -# PassengerTypes: e2 -# OnEnter: HBOX.e2 -# OnExit: HBOX -# SkipMakeAnims: true TransformOnPassenger@e3: PassengerTypes: e3 OnEnter: HBOX.e3 @@ -633,13 +614,6 @@ HBOX.E1: Cargo: InitialUnits: e1 -#HBOX.E2: -# Inherits: HBOX -# Tooltip: -# Name: Camo Pillbox (Grenades) -# RenderBuilding: -# Image: HBOX - HBOX.E3: Inherits: HBOX Tooltip: @@ -888,7 +862,7 @@ WEAP: RenderBuildingWarFactory: RallyPoint: Exit@1: - SpawnOffset: 5,-3 + SpawnOffset: 213,-128,0 ExitCell: 1,2 Production: Produces: Vehicle @@ -915,7 +889,7 @@ FACT: Bib: Production: Produces: Building,Defense - IronCurtainable: + IronCurtainable: Valued: Cost: 2500 Tooltip: @@ -926,7 +900,7 @@ FACT: BaseBuilding: Transforms: IntoActor: mcv - Offset:1,1 + Offset: 1,1 Facing: 96 ProductionBar: DeadBuildingState: @@ -1033,7 +1007,7 @@ HPAD: Range: 5 Bib: Exit@1: - SpawnOffset: 0,-6 + SpawnOffset: 0,-256,0 ExitCell: 0,0 Production: Produces: Helicopter @@ -1066,9 +1040,9 @@ AFLD: RevealsShroud: Range: 7 Exit@1: - SpawnOffset: 0,4 + SpawnOffset: 0,170,0 ExitCell: 1,1 - Facing:192 + Facing: 192 Production: Produces: Plane Reservable: @@ -1203,10 +1177,10 @@ BARR: Bib: RallyPoint: Exit@1: - SpawnOffset: -4,19 + SpawnOffset: -170,810,0 ExitCell: 0,2 Exit@2: - SpawnOffset: -17,15 + SpawnOffset: -725,640,0 ExitCell: 0,2 Production: Produces: Infantry @@ -1240,17 +1214,17 @@ TENT: Bib: RallyPoint: Exit@1: - SpawnOffset: -1,19 + SpawnOffset: -42,810,0 ExitCell: 0,2 Exit@2: - SpawnOffset: -17,15 + SpawnOffset: -725,640,0 ExitCell: 0,2 Production: Produces: Infantry PrimaryBuilding: IronCurtainable: ProductionBar: - + KENN: Inherits: ^Building Tooltip: @@ -1519,9 +1493,9 @@ CYCL: Inherits: ^Wall Health: HP: 100 - Armor: + Armor: Type: Wood - + BARB: Inherits: ^Wall Health: @@ -1533,10 +1507,9 @@ WOOD: Inherits: ^Wall Health: HP: 100 - Armor: + Armor: Type: Wood -# custom prerequisites: BARRACKS: Tooltip: Name: Infantry Production @@ -1556,3 +1529,4 @@ ANYPOWER: Tooltip: Name: Power Plant Description: Power Plant + diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml index 515a412357..eb320b7e7e 100644 --- a/mods/ra/rules/system.yaml +++ b/mods/ra/rules/system.yaml @@ -48,7 +48,7 @@ Player: ActorGroupProxy: DeveloperMode: HackyAI@EasyAI: - Name:Easy AI + Name: Easy AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -100,7 +100,7 @@ Player: 3tnk: 50% SquadSize: 20 HackyAI@NormalAI: - Name:Normal AI + Name: Normal AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -166,7 +166,7 @@ Player: pt: 10% SquadSize: 40 HackyAI@HardAI: - Name:Hard AI + Name: Hard AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -231,7 +231,7 @@ Player: pt: 10% SquadSize: 10 HackyAI@TestAI: - Name:Test AI + Name: Test AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -304,7 +304,7 @@ Player: pt: 8% SquadSize: 10 HackyAI@IslandMapAI: - Name:Island Map AI + Name: Island Map AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -354,7 +354,7 @@ Player: pt: 10% SquadSize: 1 HackyAI@HightechAI: - Name:High-Tech AI + Name: High-Tech AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -425,7 +425,7 @@ Player: msub: 100% SquadSize: 10 HackyAI@LongrangeAI: - Name:Long-Range AI + Name: Long-Range AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -477,7 +477,7 @@ Player: 3tnk: 15% SquadSize: 25 HackyAI@TankAI: - Name:Tank AI + Name: Tank AI BuildingCommonNames: ConstructionYard: fact Refinery: proc @@ -654,11 +654,11 @@ World: AllowUnderActors: false TerrainType: Gems SmudgeLayer@SCORCH: - Type:Scorch + Type: Scorch Sequence: scorches - SmokePercentage:50 + SmokePercentage: 50 SmudgeLayer@CRATER: - Type:Crater + Type: Crater Sequence: craters PathfinderDebugOverlay: SpawnMapActors: @@ -814,24 +814,24 @@ CRATE: Images: scrate XmasImages: xcratea, xcrateb, xcratec, xcrated ProximityCaptor: - Types:Crate + Types: Crate Passenger: BodyOrientation: CAMERA: Aircraft: Health: - HP:1000 + HP: 1000 RevealsShroud: Range: 10 ProximityCaptor: - Types:Camera + Types: Camera BodyOrientation: FLARE: Aircraft: Health: - HP:1000 + HP: 1000 RevealsShroud: Range: 3 RenderFlare: @@ -873,3 +873,4 @@ waypoint: Waypoint: RenderEditorOnly: BodyOrientation: + diff --git a/mods/ra/rules/trees.yaml b/mods/ra/rules/trees.yaml index 43c712d4e2..cb8dd883eb 100644 --- a/mods/ra/rules/trees.yaml +++ b/mods/ra/rules/trees.yaml @@ -51,7 +51,7 @@ T08: Building: Footprint: x_ Dimensions: 2,1 - + T10: Inherits: ^Tree Building: @@ -197,7 +197,6 @@ BOXES01: Inherits: ^Tree Tooltip: Name: Boxes - BOXES02: Inherits: ^Tree @@ -283,7 +282,6 @@ ICE05: EditorTilesetFilter: ExcludeTilesets: DESERT -# Desert Terrain Expansion ROCK1: Inherits: ^Rock Building: @@ -404,3 +402,4 @@ LAR2: EditorAppearance: RelativeToTopLeft: yes UseTerrainPalette: true + diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 94550af14f..222f7873e1 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -16,7 +16,7 @@ V2RL: Armor: Type: Light Mobile: - Speed: 6 + Speed: 85 RevealsShroud: Range: 5 Armament: @@ -45,7 +45,7 @@ V2RL: Armor: Type: Heavy Mobile: - Speed: 9 + Speed: 128 RevealsShroud: Range: 4 Turreted: @@ -84,7 +84,7 @@ V2RL: Armor: Type: Heavy Mobile: - Speed: 6 + Speed: 85 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 5 @@ -126,7 +126,7 @@ V2RL: Armor: Type: Heavy Mobile: - Speed: 5 + Speed: 71 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 5 @@ -170,7 +170,7 @@ V2RL: Armor: Type: Heavy Mobile: - Speed: 3 + Speed: 42 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 6 @@ -224,7 +224,7 @@ ARTY: Type: Light Mobile: ROT: 2 - Speed: 6 + Speed: 85 RevealsShroud: Range: 5 Armament: @@ -258,16 +258,14 @@ HARV: Capacity: 20 Resources: Ore,Gems UnloadTicksPerBale: 1 - # How far away from our linked proc (refinery) to find resources (in cells): SearchFromProcRadius: 24 - # How far away from last harvest order location to find more resources (in cells): SearchFromOrderRadius: 12 Health: HP: 600 Armor: Type: Heavy Mobile: - Speed: 6 + Speed: 85 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 4 @@ -275,7 +273,7 @@ HARV: ImagesByFullness: harvempty, harvhalf, harv -AttackMove: GpsDot: - String:Harvester + String: Harvester LeavesHusk: HuskActor: HARV.EmptyHusk HarvesterHuskModifier: @@ -305,13 +303,13 @@ MCV: Armor: Type: Light Mobile: - Speed: 6 + Speed: 85 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 4 Transforms: IntoActor: fact - Offset:-1,-1 + Offset: -1,-1 Facing: 96 TransformSounds: placbldg.aud, build5.aud NoTransformSounds: nodeply1.aud @@ -340,7 +338,7 @@ JEEP: Type: Light Mobile: ROT: 10 - Speed: 12 + Speed: 170 RevealsShroud: Range: 8 Turreted: @@ -376,7 +374,7 @@ APC: Armor: Type: Heavy Mobile: - Speed: 10 + Speed: 142 RevealsShroud: Range: 5 Armament: @@ -410,7 +408,7 @@ MNLY.AP: Armor: Type: Heavy Mobile: - Speed: 9 + Speed: 128 RevealsShroud: Range: 5 RenderUnit: @@ -444,7 +442,7 @@ MNLY.AT: Armor: Type: Heavy Mobile: - Speed: 9 + Speed: 128 RevealsShroud: Range: 5 RenderUnit: @@ -478,7 +476,7 @@ TRUK: Armor: Type: Light Mobile: - Speed: 9 + Speed: 128 RevealsShroud: Range: 3 RenderUnit: @@ -505,7 +503,7 @@ MGG: Armor: Type: Heavy Mobile: - Speed: 6 + Speed: 85 RenderUnit: WithIdleOverlay@SPINNER: Offset: -299,0,171 @@ -551,7 +549,7 @@ MRJ: Armor: Type: Heavy Mobile: - Speed: 6 + Speed: 85 RevealsShroud: Range: 6 RenderUnit: @@ -644,7 +642,7 @@ TTNK: Armor: Type: Light Mobile: - Speed: 8 + Speed: 113 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 7 @@ -673,11 +671,11 @@ FTRK: Description: Flak Truck, good for scouting.\n Strong vs Light Vehicles, Aircraft \n Weak vs Tanks Health: HP: 120 - Armor: + Armor: Type: Light Mobile: ROT: 10 - Speed: 9 + Speed: 128 RevealsShroud: Range: 4 Turreted: @@ -716,7 +714,7 @@ DTRK: Armor: Type: Light Mobile: - Speed: 6 + Speed: 85 RevealsShroud: Range: 3 RenderUnit: @@ -750,7 +748,7 @@ CTNK: Armor: Type: Light Mobile: - Speed: 8 + Speed: 113 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 6 @@ -785,7 +783,7 @@ QTNK: Armor: Type: Heavy Mobile: - Speed: 4 + Speed: 56 Crushes: wall, atmine, crate, infantry RevealsShroud: Range: 6 @@ -799,4 +797,5 @@ QTNK: MadTank: -EjectOnDeath: TargetableUnit: - TargetTypes: Ground, MADTank \ No newline at end of file + TargetTypes: Ground, MADTank + diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 8bbd84e9e4..621cb343d6 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1,11 +1,11 @@ Colt45: ROF: 5 - Range: 7 + Range: 7c0 Report: GUN5.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 1 + Spread: 42 Versus: None: 100% Wood: 0% @@ -19,14 +19,14 @@ Colt45: ZSU-23: ROF: 10 - Range: 10 + Range: 10c0 Report: AACANON3.AUD ValidTargets: Air Projectile: Bullet - Speed: 100 + Speed: 1c682 High: true Warhead: - Spread: 5 + Spread: 213 Versus: None: 30% Wood: 75% @@ -37,12 +37,12 @@ ZSU-23: Vulcan: ROF: 30 - Range: 6 + Range: 6c0 Report: GUN13.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead@1: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -53,7 +53,7 @@ Vulcan: InfDeath: 2 Damage: 10 Warhead@2: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -65,7 +65,7 @@ Vulcan: Damage: 10 Delay: 2 Warhead@3: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -77,7 +77,7 @@ Vulcan: Damage: 10 Delay: 4 Warhead@4: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -89,7 +89,7 @@ Vulcan: Damage: 10 Delay: 6 Warhead@5: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -101,7 +101,7 @@ Vulcan: Damage: 10 Delay: 8 Warhead@6: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -115,24 +115,24 @@ Vulcan: Maverick: ROF: 30 - Range: 9 - MinRange: 3 + Range: 9c0 + MinRange: 3c0 Report: MISSILE7.AUD Burst: 2 BurstDelay: 7 ValidTargets: Ground Projectile: Missile - Speed: 30 + Speed: 256 Arm: 2 High: true Shadow: false ContrailLength: 10 - Inaccuracy: 12 + Inaccuracy: 512 Image: DRAGON ROT: 5 RangeLimit: 60 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -148,16 +148,16 @@ Maverick: FireballLauncher: ROF: 65 - Range: 5 + Range: 5c0 Burst: 2 BurstDelay: 20 Projectile: Bullet - Speed: 12 + Speed: 204 Trail: fb2 Image: FB1 Warhead: - Spread: 5 - Versus: + Spread: 213 + Versus: None: 90% Wood: 50% Light: 60% @@ -172,17 +172,17 @@ FireballLauncher: Flamer: ROF: 50 - Range: 5 + Range: 5c0 Burst: 15 BurstDelay: 1 Projectile: Bullet - Speed: 10 + Speed: 170 Trail: fb4 Image: fb3 - Angle: .1 - Inaccuracy: 20 + Angle: 62 + Inaccuracy: 853 Warhead: - Spread: 8 + Spread: 341 Versus: None: 90% Wood: 100% @@ -198,14 +198,14 @@ Flamer: ChainGun: ROF: 10 - Range: 5 - MinRange: 1 + Range: 5c0 + MinRange: 1c0 Report: GUN13.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 High: true Warhead: - Spread: 3 + Spread: 128 Versus: None: 120% Wood: 50% @@ -219,14 +219,14 @@ ChainGun: ChainGun.Yak: ROF: 3 - Range: 5 - MinRange: 3 + Range: 5c0 + MinRange: 3c0 Report: GUN13.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 High: true Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -239,12 +239,12 @@ ChainGun.Yak: Pistol: ROF: 7 - Range: 3 + Range: 3c0 Report: GUN27.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -257,12 +257,12 @@ Pistol: M1Carbine: ROF: 20 - Range: 5 + Range: 5c0 Report: GUN11.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 25% Light: 30% @@ -275,22 +275,22 @@ M1Carbine: Dragon: ROF: 50 - Range: 5 + Range: 5c0 Report: MISSILE6.AUD ValidTargets: Ground Projectile: Missile - Speed: 25 + Speed: 213 Arm: 2 High: true Shadow: false Trail: smokey ContrailLength: 10 - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 5 RangeLimit: 35 Warhead: - Spread: 3 + Spread: 128 Versus: None: 10% Wood: 75% @@ -306,23 +306,23 @@ Dragon: HellfireAG: ROF: 60 - Range: 4 + Range: 4c0 Report: MISSILE6.AUD Burst: 2 BurstDelay: 10 ValidTargets: Ground Projectile: Missile - Speed: 30 + Speed: 256 Arm: 2 High: true Shadow: false ContrailLength: 10 - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 RangeLimit: 20 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -338,23 +338,23 @@ HellfireAG: HellfireAA: ROF: 60 - Range: 4 + Range: 4c0 Report: MISSILE6.AUD Burst: 2 BurstDelay: 10 ValidTargets: Air Projectile: Missile - Speed: 45 + Speed: 384 Arm: 2 High: true Shadow: false ContrailLength: 10 - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 RangeLimit: 20 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -369,17 +369,17 @@ HellfireAA: Grenade: ROF: 60 - Range: 4 + Range: 4c0 Report: grenade1.aud Projectile: Bullet - Speed: 8 + Speed: 136 High: true - Angle: .1 - Inaccuracy: 13 + Angle: 62 + Inaccuracy: 554 Image: BOMB Warhead: - Spread: 6 - Versus: + Spread: 256 + Versus: None: 50% Wood: 100% Light: 25% @@ -394,13 +394,13 @@ Grenade: 25mm: ROF: 13 - Range: 4 + Range: 4c0 Report: CANNON2.AUD Projectile: Bullet - Speed: 50 + Speed: 853 Image: 50CAL Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 40% @@ -414,13 +414,13 @@ Grenade: 90mm: ROF: 50 - Range: 4.75 + Range: 4c768 Report: CANNON1.AUD Projectile: Bullet - Speed: 40 + Speed: 682 Image: 120MM Warhead: - Spread: 3 + Spread: 128 Versus: None: 20% Wood: 75% @@ -436,15 +436,15 @@ Grenade: 105mm: ROF: 70 - Range: 4.75 + Range: 4c768 Report: CANNON1.AUD Burst: 2 BurstDelay: 4 Projectile: Bullet - Speed: 40 + Speed: 682 Image: 120MM Warhead: - Spread: 3 + Spread: 128 Versus: None: 20% Wood: 75% @@ -460,14 +460,14 @@ Grenade: 120mm: ROF: 90 - Range: 4.75 + Range: 4c768 Report: CANNON1.AUD Burst: 2 Projectile: Bullet - Speed: 40 + Speed: 682 Image: 120MM Warhead: - Spread: 3 + Spread: 128 Versus: None: 20% Wood: 75% @@ -483,13 +483,13 @@ Grenade: TurretGun: ROF: 30 - Range: 7 + Range: 7c0 Report: TURRET1.AUD Projectile: Bullet - Speed: 40 + Speed: 682 Image: 120MM Warhead: - Spread: 3 + Spread: 128 Versus: None: 20% Wood: 50% @@ -505,22 +505,22 @@ TurretGun: MammothTusk: ROF: 60 - Range: 8 + Range: 8c0 Report: MISSILE6.AUD Burst: 2 ValidTargets: Ground, Air Projectile: Missile - Speed: 40 + Speed: 341 Arm: 2 High: true Shadow: false ContrailLength: 10 - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 15 RangeLimit: 40 Warhead: - Spread: 6 + Spread: 256 Versus: None: 90% Wood: 75% @@ -536,18 +536,18 @@ MammothTusk: 155mm: ROF: 85 - Range: 14 - MinRange: 3 + Range: 14c0 + MinRange: 3c0 Report: TANK5.AUD Projectile: Bullet - Speed: 12 + Speed: 204 High: true - Angle: .1 - Inaccuracy: 40 + Angle: 62 + Inaccuracy: 1c682 Image: 120MM ContrailLength: 30 Warhead: - Spread: 10 + Spread: 426 Versus: None: 90% Wood: 75% @@ -564,13 +564,13 @@ MammothTusk: M60mg: ROF: 30 - Range: 4 + Range: 4c0 Report: PILLBOX1.AUD Burst: 5 Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 10% Light: 30% @@ -583,13 +583,13 @@ M60mg: Napalm: ROF: 20 - Range: 4.5 + Range: 4c512 Projectile: Bullet Image: BOMBLET - Speed: 5 + Speed: 85 High: yes Warhead: - Spread: 4 + Spread: 170 Versus: None: 90% Light: 60% @@ -605,7 +605,7 @@ Napalm: CrateNapalm: Warhead: - Spread: 4 + Spread: 170 Versus: None: 90% Light: 60% @@ -621,8 +621,8 @@ CrateNapalm: CrateExplosion: Warhead: Damage: 500 - Spread: 10 - Versus: + Spread: 426 + Versus: None: 90% Wood: 75% Light: 60% @@ -635,7 +635,7 @@ CrateExplosion: CrateNuke: Warhead@impact: Damage: 1000 - Spread: 6 + Spread: 256 Ore: true Versus: None: 90% @@ -664,11 +664,11 @@ CrateNuke: TeslaZap: ROF: 3 Charges: true - Range: 8.5 + Range: 8c512 Report: TESLA1.AUD Projectile: TeslaZap Warhead: - Spread: 1 + Spread: 42 InfDeath: 6 Damage: 100 Versus: @@ -676,7 +676,7 @@ TeslaZap: Nike: ROF: 15 - Range: 7.5 + Range: 7c512 Report: MISSILE1.AUD ValidTargets: Air Projectile: Missile @@ -687,9 +687,9 @@ Nike: Image: MISSILE ROT: 25 RangeLimit: 50 - Speed: 40 + Speed: 341 Warhead: - Spread: 3 + Spread: 128 Versus: None: 90% Wood: 0% @@ -704,7 +704,7 @@ Nike: RedEye: ROF: 50 - Range: 7.5 + Range: 7c512 Report: MISSILE1.AUD ValidTargets: Air Projectile: Missile @@ -715,9 +715,9 @@ RedEye: Image: MISSILE ROT: 20 RangeLimit: 30 - Speed: 35 + Speed: 298 Warhead: - Spread: 3 + Spread: 128 Versus: None: 90% Wood: 75% @@ -731,18 +731,18 @@ RedEye: 8Inch: ROF: 250 - Range: 16 + Range: 16c0 Burst: 2 Report: TURRET1.AUD Projectile: Bullet - Speed: 12 + Speed: 204 High: true - Angle: .1 - Inaccuracy: 70 + Angle: 62 + Inaccuracy: 2c938 Image: 120MM ContrailLength: 30 Warhead: - Spread: 5 + Spread: 213 Versus: None: 60% Wood: 75% @@ -758,19 +758,19 @@ RedEye: SubMissile: ROF: 300 - Range: 16 + Range: 16c0 Burst: 2 Report: MISSILE6.AUD Projectile: Bullet - Speed: 6 + Speed: 102 High: true - Angle: .4 - Inaccuracy: 70 + Angle: 165 + Inaccuracy: 2c938 Image: MISSILE Trail: smokey ContrailLength: 30 Warhead: - Spread: 10 + Spread: 426 Versus: None: 40% Light: 30% @@ -785,7 +785,7 @@ SubMissile: Stinger: ROF: 60 - Range: 9 + Range: 9c0 Report: MISSILE6.AUD Burst: 2 BurstDelay: 0 @@ -799,9 +799,9 @@ Stinger: ROT: 20 RangeLimit: 50 TurboBoost: true - Speed: 20 + Speed: 170 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -817,7 +817,7 @@ Stinger: TorpTube: ROF: 100 - Range: 9 + Range: 9c0 Report: TORPEDO1.AUD ValidTargets: Water, Underwater Underwater: yes @@ -826,12 +826,12 @@ TorpTube: Projectile: Missile Image: MISSILE Arm: 3 - Speed: 10 + Speed: 85 Trail: bubbles ROT: 1 RangeLimit: 160 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -845,13 +845,13 @@ TorpTube: 2Inch: ROF: 60 - Range: 5.5 + Range: 5c512 Report: CANNON2.AUD Projectile: Bullet - Speed: 25 + Speed: 426 Image: 120MM Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -867,16 +867,16 @@ TorpTube: DepthCharge: ROF: 60 - Range: 5 + Range: 5c0 ValidTargets: Underwater Projectile: Bullet - Speed: 5 + Speed: 85 Image: BOMB - Angle: .1 + Angle: 62 High: true - Inaccuracy: 3 + Inaccuracy: 128 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -890,14 +890,14 @@ DepthCharge: ParaBomb: ROF: 10 - Range: 3 + Range: 3c0 Report: CHUTE1.AUD Projectile: GravityBomb Image: PARABOMB Velocity: 43 Acceleration: 0 Warhead: - Spread: 6 + Spread: 256 Versus: None: 30% Wood: 75% @@ -914,10 +914,10 @@ ParaBomb: DogJaw: ValidTargets: Infantry ROF: 10 - Range: 3 + Range: 3c0 Report: DOGG5P.AUD Warhead: - Spread: 5 + Spread: 213 Versus: Wood: 0% Light: 0% @@ -928,13 +928,13 @@ DogJaw: Heal: ROF: 80 - Range: 4 + Range: 4c0 Report: HEAL2.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 5 - Versus: + Spread: 213 + Versus: Wood: 0% Light: 0% Heavy: 0% @@ -944,13 +944,13 @@ Heal: Repair: ROF: 80 - Range: 4 + Range: 4c0 Report: FIXIT1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 5 - Versus: + Spread: 213 + Versus: None: 0% Wood: 0% Light: 100% @@ -961,12 +961,12 @@ Repair: SilencedPPK: ROF: 80 - Range: 2.5 + Range: 2c512 Report: silppk.aud Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 0% Light: 0% @@ -979,21 +979,21 @@ SilencedPPK: SCUD: ROF: 240 - Range: 10 - MinRange: 3 + Range: 10c0 + MinRange: 3c0 Report: MISSILE1.AUD Projectile: Bullet - Speed: 10 + Speed: 170 High: true Shadow: false Trail: smokey TrailDelay: 5 - Inaccuracy: 5 + Inaccuracy: 213 Image: V2 - Angle: .1 + Angle: 62 Warhead: - Spread: 8 - Versus: + Spread: 341 + Versus: None: 90% Wood: 75% Light: 70% @@ -1010,7 +1010,7 @@ Atomic: ValidTargets: Ground, Water, Air Warhead@impact: Damage: 1500 - Spread: 24 + Spread: 1c0 SmudgeType: Scorch Size: 1 Ore: true @@ -1022,7 +1022,7 @@ Atomic: ImpactSound: kaboom1.aud Warhead@areanuke1: Damage: 600 - Spread: 48 + Spread: 2c0 SmudgeType: Scorch Size: 2 Ore: true @@ -1033,7 +1033,7 @@ Atomic: ImpactSound: kaboom22.aud Warhead@areanuke2: Damage: 600 - Spread: 72 + Spread: 3c0 SmudgeType: Scorch Size: 3 Ore: true @@ -1043,7 +1043,7 @@ Atomic: InfDeath: 5 Warhead@areanuke3: Damage: 600 - Spread: 96 + Spread: 4c0 SmudgeType: Scorch Size: 4 Ore: true @@ -1053,7 +1053,7 @@ Atomic: InfDeath: 5 Warhead@areanuke4: Damage: 600 - Spread: 120 + Spread: 5c0 SmudgeType: Scorch Size: 5 Ore: true @@ -1066,7 +1066,7 @@ MiniNuke: ValidTargets: Ground, Water, Air Warhead@impact: Damage: 1500 - Spread: 24 + Spread: 1c0 Size: 1 Ore: true Versus: @@ -1077,7 +1077,7 @@ MiniNuke: ImpactSound: kaboom1.aud Warhead@areanuke1: Damage: 600 - Spread: 48 + Spread: 2c0 Size: 2 Ore: true Versus: @@ -1087,7 +1087,7 @@ MiniNuke: ImpactSound: kaboom22 Warhead@areanuke2: Damage: 600 - Spread: 72 + Spread: 3c0 Size: 3 Ore: true Versus: @@ -1096,7 +1096,7 @@ MiniNuke: InfDeath: 5 Warhead@areanuke3: Damage: 600 - Spread: 96 + Spread: 4c0 Size: 4 SmudgeType: Scorch Ore: true @@ -1108,8 +1108,8 @@ MiniNuke: UnitExplode: Warhead: Damage: 500 - Spread: 10 - Versus: + Spread: 426 + Versus: None: 90% Wood: 75% Light: 60% @@ -1122,7 +1122,7 @@ UnitExplode: UnitExplodeSmall: Warhead: Damage: 40 - Spread: 10 + Spread: 426 Versus: None: 90% Wood: 75% @@ -1135,7 +1135,7 @@ UnitExplodeSmall: BarrelExplode: Warhead: Damage: 500 - Spread: 10 + Spread: 426 Versus: None: 120% Wood: 200% @@ -1157,7 +1157,7 @@ Crush: ATMine: Warhead: Damage: 500 - Versus: + Versus: None: 0% Wood: 0% Concrete: 0% @@ -1167,7 +1167,7 @@ ATMine: APMine: Warhead: Damage: 500 - Versus: + Versus: Wood: 0% Light: 10% Heavy: 10% @@ -1183,38 +1183,37 @@ Demolish: PortaTesla: ROF: 70 - Range: 3.5 + Range: 3c512 Report: TESLA1.AUD -# Report: SHKTROP1.AUD Charges: yes Projectile: TeslaZap Warhead: - Spread: 1 + Spread: 42 InfDeath: 6 Damage: 45 TTankZap: ROF: 120 - Range: 7 + Range: 7c0 Report: TESLA1.AUD Charges: yes Projectile: TeslaZap Warhead: - Spread: 1 + Spread: 42 InfDeath: 6 Damage: 100 FLAK-23: ROF: 10 - Range: 8 + Range: 8c0 Report: AACANON3.AUD ValidTargets: Air,Ground Projectile: Bullet - Speed: 100 + Speed: 1c682 High: true Warhead: - Spread: 5 - Versus: + Spread: 213 + Versus: None: 40% Wood: 10% Light: 60% @@ -1226,12 +1225,12 @@ FLAK-23: Sniper: Report: GUN5.AUD ROF: 70 - Range: 10 + Range: 10c0 Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 140 - Spread: 1 + Spread: 42 Versus: None: 100% Wood: 0% @@ -1242,22 +1241,22 @@ Sniper: ChronoTusk: ROF: 60 - Range: 6 + Range: 6c0 Report: MISSILE6.AUD ValidTargets: Ground Projectile: Missile - Speed: 35 + Speed: 298 Arm: 2 High: true Shadow: false Trail: smokey ContrailLength: 10 - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 RangeLimit: 22 Warhead: - Spread: 3 + Spread: 128 Versus: None: 25% Wood: 75% @@ -1273,10 +1272,10 @@ ChronoTusk: Claw: ROF: 30 - Range: 1 + Range: 1c0 Projectile: Bullet Warhead: - Spread: 5 + Spread: 213 Versus: None: 90% Wood: 10% @@ -1288,10 +1287,10 @@ Claw: Mandible: ROF: 10 - Range: 1 + Range: 1c0 Projectile: Bullet Warhead: - Spread: 5 + Spread: 213 Versus: None: 90% Wood: 10% @@ -1321,3 +1320,4 @@ MADTankDetonate: Explosion: med_explosion ImpactSound: mineblo1.aud SmudgeType: Crater + diff --git a/mods/ts/maps/blank-conquest.oramap b/mods/ts/maps/blank-conquest.oramap index 4172632e24..4d29917ebe 100644 Binary files a/mods/ts/maps/blank-conquest.oramap and b/mods/ts/maps/blank-conquest.oramap differ diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 16558fb91d..235cabd2a5 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -11,9 +11,9 @@ DPOD: Helicopter: LandWhenIdle: yes ROT: 5 - Speed: 16 + Speed: 149 InitialFacing: 0 - LandableTerrainTypes: Clear # TODO: add more + LandableTerrainTypes: Clear Health: HP: 60 Armor: @@ -47,11 +47,11 @@ DSHP: Owner: gdi Prerequisites: gaweap Helicopter: - LandWhenIdle: yes # TODO: use DROPUP1.AUD and DROPDWN1.AUD + LandWhenIdle: yes ROT: 5 - Speed: 18 + Speed: 168 InitialFacing: 0 - LandableTerrainTypes: Clear # TODO: add more + LandableTerrainTypes: Clear Health: HP: 200 Armor: @@ -81,9 +81,9 @@ ORCA: Selectable: Bounds: 30,24 Helicopter: - RearmBuildings: gahpad # TODO: use ORCAUP1.AUD and ORCADWN1.AUD + RearmBuildings: gahpad ROT: 5 - Speed: 20 + Speed: 186 Health: HP: 200 Armor: @@ -111,14 +111,14 @@ ORCAB: Buildable: Queue: Air BuildPaletteOrder: 20 - Prerequisites: gahpad#, gatech + Prerequisites: gahpad Owner: gdi Selectable: Bounds: 30,24 Helicopter: - RearmBuildings: gahpad # TODO: use ORCAUP1.AUD and ORCADWN1.AUD + RearmBuildings: gahpad ROT: 5 - Speed: 12 + Speed: 112 Health: HP: 260 Armor: @@ -149,11 +149,11 @@ ORCATRAN: Owner: gdi Prerequisites: gahpad Helicopter: - LandWhenIdle: yes # TODO: use ORCAUP1.AUD and ORCADWN1.AUD + LandWhenIdle: yes ROT: 5 - Speed: 9 + Speed: 84 InitialFacing: 0 - LandableTerrainTypes: Clear # TODO: add more + LandableTerrainTypes: Clear Health: HP: 200 Armor: @@ -168,7 +168,7 @@ ORCATRAN: RenderVoxels: WithVoxelBody: -TRNSPORT: # TODO: set up the vehicle cargo traits, but beware of desyncs +TRNSPORT: Inherits: ^Helicopter Valued: Cost: 750 @@ -178,13 +178,13 @@ TRNSPORT: # TODO: set up the vehicle cargo traits, but beware of desyncs Queue: Air BuildPaletteOrder: 10 Owner: gdi - Prerequisites: gahpad#, gadept + Prerequisites: gahpad Helicopter: - LandWhenIdle: yes # TODO: use DROPUP1.AUD and DROPDWN1.AUD + LandWhenIdle: yes ROT: 5 - Speed: 16 + Speed: 149 InitialFacing: 0 - LandableTerrainTypes: Clear # TODO: add more + LandableTerrainTypes: Clear Health: HP: 175 Armor: @@ -204,14 +204,14 @@ SCRIN: Buildable: Queue: Air BuildPaletteOrder: 20 - Prerequisites: nahpad #, natech + Prerequisites: nahpad Owner: nod Selectable: Bounds: 30,24 Helicopter: - RearmBuildings: nahpad # TODO: use DROPUP1.AUD and DROPDWN1.AUD + RearmBuildings: nahpad ROT: 3 - Speed: 18 + Speed: 168 Health: HP: 280 Armor: @@ -246,7 +246,7 @@ APACHE: Helicopter: RearmBuildings: nahpad ROT: 5 - Speed: 14 + Speed: 130 Health: HP: 225 Armor: @@ -265,4 +265,5 @@ APACHE: Offset: 85,0,384 RenderSprites: RenderVoxels: - WithVoxelBody: \ No newline at end of file + WithVoxelBody: + diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 9c692cc530..fa3a5bac6a 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -12,22 +12,20 @@ GivesBuildableArea: Capturable: SoundOnDamageTransition: - DamagedSound: #TODO - DestroyedSound: #TODO + DamagedSound: + DestroyedSound: RenderBuilding: WithBuildingExplosion: RepairableBuilding: EngineerRepairable: -# EmitInfantryOnSell: MustBeDestroyed: GivesExperience: -# FrozenUnderFog: CaptureNotification: EditorAppearance: RelativeToTopLeft: yes ShakeOnDeath: ProximityCaptor: - Types:Building + Types: Building Sellable: AcceptsSupplies: GivesBounty: @@ -42,7 +40,7 @@ ^Infantry: AppearsOnRadar: Health: - Radius: 3 + Radius: 128 Armor: Type: None RevealsShroud: @@ -94,21 +92,18 @@ Cost: 10 Tooltip: Name: Civilian - Buildable: # TODO: remove this once the testing period is over + Buildable: Queue: Infantry BuildPaletteOrder: 1000 Owner: gdi, nod Health: HP: 50 Mobile: - Speed: 5 + Speed: 71 RevealsShroud: Range: 2 Armament: - Weapon: Pistola # deviation from RULES.INI (only CTECH is armed) -# LimitedAmmo: -# Ammo: 10 -# PipCount: 2 + Weapon: Pistola AttackFrontal: ProximityCaptor: Types: CivilianInfantry @@ -127,7 +122,7 @@ Beach: 40 ROT: 5 SelectionDecorations: - Selectable: + Selectable: Voice: Vehicle TargetableUnit: TargetTypes: Ground @@ -141,9 +136,8 @@ DrawLineToTarget: ActorLostNotification: ProximityCaptor: - Types:Vehicle + Types: Vehicle GivesBounty: -# WithSmoke: UpdatesPlayerStatistics: CombatDebugOverlay: Guard: @@ -206,4 +200,5 @@ CombatDebugOverlay: BodyOrientation: Huntable: - LuaScriptEvents: \ No newline at end of file + LuaScriptEvents: + diff --git a/mods/ts/rules/infantry.yaml b/mods/ts/rules/infantry.yaml index fadfcbac81..fce3436e99 100644 --- a/mods/ts/rules/infantry.yaml +++ b/mods/ts/rules/infantry.yaml @@ -15,7 +15,7 @@ E1: Health: HP: 125 Mobile: - Speed: 5 + Speed: 71 Armament: Weapon: Minigun AttackFrontal: @@ -41,7 +41,7 @@ E2: Health: HP: 150 Mobile: - Speed: 4 + Speed: 56 Armament: Weapon: Grenade LocalOffset: 0,0,555 @@ -70,7 +70,7 @@ E3: Health: HP: 100 Mobile: - Speed: 3 + Speed: 42 Armament@PRIMARY: Weapon: Bazooka LocalOffset: 0,0,555 @@ -95,7 +95,7 @@ WEEDGUY: Bounds: 12,17,0,-6 Voice: Weed Mobile: - Speed: 3 + Speed: 42 Health: HP: 130 CrushableInfantry: @@ -105,7 +105,6 @@ WEEDGUY: LocalOffset: 85,0,384 FireDelay: 3 AttackFrontal: -# -PoisonedByTiberium: -RenderInfantry: RenderInfantryProne: TakeCover: @@ -125,7 +124,7 @@ MEDIC: Bounds: 12,17,0,-6 Voice: Medic Mobile: - Speed: 4 + Speed: 56 Health: HP: 125 CrushableInfantry: @@ -156,7 +155,7 @@ ENGINEER: Bounds: 12,17,0,-6 Voice: Engineer Mobile: - Speed: 4 + Speed: 56 Health: HP: 500 Passenger: @@ -189,11 +188,10 @@ UMAGON: Bounds: 12,17,0,-6 Voice: Umagon Mobile: - Speed: 5 + Speed: 71 Health: HP: 150 - Passenger: # TODO: -# PipType: White + Passenger: RevealsShroud: Range: 7 Armament: @@ -220,11 +218,10 @@ GHOST: Bounds: 12,17,0,-6 Voice: Ghost Mobile: - Speed: 4 + Speed: 56 Health: HP: 200 - Passenger: # TODO: -# PipType: White + Passenger: RevealsShroud: Range: 6 Armament: @@ -253,7 +250,7 @@ JUMPJET: Bounds: 12,17,0,-6 Voice: JumpJet Mobile: - Speed: 4 + Speed: 56 Health: HP: 120 Armor: @@ -268,8 +265,6 @@ JUMPJET: AttackFrontal: TakeCover: RenderInfantry: -# LeavesHusk: # TODO -# Transforms: # TODO CHAMSPY: Inherits: ^Infantry @@ -289,11 +284,10 @@ CHAMSPY: Health: HP: 120 Mobile: - Speed: 6 + Speed: 85 RevealsShroud: Range: 9 - Passenger: # TODO -# PipType: White + Passenger: TakeCover: Spy: Infiltrates: @@ -321,16 +315,13 @@ CYBORG: -CrushableInfantry: CrushSound: squish2.aud Selectable: - Bounds: 12,17,0,-6 # TODO: wrong + Bounds: 12,17,0,-6 Voice: Cyborg Mobile: - Speed: 4 + Speed: 56 Health: HP: 300 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO - Passenger: # TODO: -# PipType: White + Passenger: RevealsShroud: Range: 5 Armament: @@ -340,8 +331,6 @@ CYBORG: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# LeavesHusk: # TODO: -# CrawlingCyborg CYC2: Inherits: ^Infantry @@ -359,16 +348,13 @@ CYC2: -CrushableInfantry: CrushSound: squish2.aud Selectable: - Bounds: 12,17,0,-6 # TODO: wrong + Bounds: 12,17,0,-6 Voice: CyborgCommando Mobile: - Speed: 4 + Speed: 56 Health: HP: 500 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO - Passenger: # TODO: -# PipType: White + Passenger: RevealsShroud: Range: 7 Armament: @@ -378,8 +364,6 @@ CYC2: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# LeavesHusk: # TODO: -# CrawlingCyborgCommando MUTANT: Inherits: ^Infantry @@ -398,7 +382,7 @@ MUTANT: Health: HP: 50 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 4 Armament: @@ -408,8 +392,6 @@ MUTANT: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO MWMN: Inherits: ^Infantry @@ -428,7 +410,7 @@ MWMN: Health: HP: 50 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 4 Armament: @@ -438,8 +420,6 @@ MWMN: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO MUTANT3: Inherits: ^Infantry @@ -458,7 +438,7 @@ MUTANT3: Health: HP: 50 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 4 Armament: @@ -468,10 +448,8 @@ MUTANT3: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO -MHIJACK: # TODO: does not work +MHIJACK: Inherits: ^Infantry Buildable: Queue: Infantry @@ -488,7 +466,7 @@ MHIJACK: # TODO: does not work Health: HP: 300 Mobile: - Speed: 7 + Speed: 99 RevealsShroud: Range: 6 -AutoTarget: @@ -497,8 +475,6 @@ MHIJACK: # TODO: does not work -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO TRATOS: Inherits: ^Infantry @@ -516,7 +492,7 @@ TRATOS: Health: HP: 200 Mobile: - Speed: 5 + Speed: 71 RevealsShroud: Range: 4 TakeCover: @@ -525,8 +501,6 @@ TRATOS: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO OXANNA: Inherits: ^Infantry @@ -544,7 +518,7 @@ OXANNA: Health: HP: 50 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 4 TakeCover: @@ -553,8 +527,6 @@ OXANNA: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO SLAV: Inherits: ^Infantry @@ -572,7 +544,7 @@ SLAV: Health: HP: 300 Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 4 TakeCover: @@ -581,8 +553,6 @@ SLAV: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 -# -PoisonedByTiberium: -# TiberiumHeal: # TODO DOGGIE: Inherits: ^Infantry @@ -593,7 +563,7 @@ DOGGIE: BuildPaletteOrder: 100 Owner: None Health: - Radius: 3 + Radius: 128 HP: 250 Valued: Cost: 100 @@ -602,9 +572,7 @@ DOGGIE: RevealsShroud: Range: 4 Mobile: - Speed: 8 -# CrushableInfantry: -# CrushSound: squish2.aud + Speed: 113 Selectable: Voice: Fiend TargetableUnit: @@ -613,8 +581,6 @@ DOGGIE: Weapon: FiendShard AttackFrontal: AttackWander: -# -PoisonedByTiberium: -# TiberiumHeal: # TODO VISSML: Inherits: ^Infantry @@ -633,7 +599,7 @@ VISSML: RevealsShroud: Range: 0 Mobile: - Speed: 8 + Speed: 113 ROT: 16 -CrushableInfantry: Selectable: @@ -642,8 +608,6 @@ VISSML: TargetTypes: Ground -AutoTarget: -AttackMove: -# -PoisonedByTiberium: -# TiberiumHeal: # TODO -RenderInfantry: RenderUnit: @@ -664,7 +628,7 @@ VISLRG: RevealsShroud: Range: 0 Mobile: - Speed: 8 + Speed: 113 ROT: 16 -CrushableInfantry: Selectable: @@ -675,8 +639,6 @@ VISLRG: Weapon: SlimeAttack AttackFrontal: AttackWander: -# -PoisonedByTiberium: -# TiberiumHeal: # TODO -RenderInfantry: RenderUnit: @@ -687,4 +649,5 @@ CIV2: Inherits: ^CivilianInfantry CIV3: - Inherits: ^CivilianInfantry \ No newline at end of file + Inherits: ^CivilianInfantry + diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index 57fe851208..7910b27226 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -26,7 +26,7 @@ GACNST: BaseBuilding: Transforms: IntoActor: mcv - Offset:1,1 + Offset: 1,1 Facing: 96 ProductionBar: -Sellable: @@ -89,9 +89,8 @@ GAPILE: Type: Wood RevealsShroud: Range: 5 -# RallyPoint: #TODO: setup sequences Exit@1: - SpawnOffset: -64,64,0 + SpawnOffset: -2730,2730,0 ExitCell: 0,2 Production: Produces: Infantry @@ -112,8 +111,6 @@ GAWEAP: Tooltip: Name: GDI War Factory Description: Assembly point for\nvehicle reinforcements -# ProvidesCustomPrerequisite: -# Prerequisite: VehicleProduction Buildable: Queue: Building BuildPaletteOrder: 50 @@ -128,11 +125,10 @@ GAWEAP: Range: 4 -RenderBuilding: RenderBuildingWarFactory: - RallyPoint: # TODO: setup sequences/palettes + RallyPoint: RallyPoint: 6,5 -# IndicatorPalettePrefix: effect Exit@1: - SpawnOffset: -4,24 + SpawnOffset: -170,1024,0 ExitCell: 3,3 Production: Produces: Vehicle @@ -188,9 +184,8 @@ NAHAND: Type: Wood RevealsShroud: Range: 5 -# RallyPoint: #TODO: setup sequences Exit@1: - SpawnOffset: -64,64,0 + SpawnOffset: -2730,2730,0 ExitCell: 0,2 Production: Produces: Infantry @@ -209,8 +204,6 @@ NAWEAP: Tooltip: Name: Nod War Factory Description: Assembly point for\nvehicle reinforcements -# ProvidesCustomPrerequisite: -# Prerequisite: VehicleProduction Buildable: Queue: Building BuildPaletteOrder: 50 @@ -225,11 +218,10 @@ NAWEAP: Range: 4 -RenderBuilding: RenderBuildingWarFactory: - RallyPoint: # TODO: setup sequences/palettes + RallyPoint: RallyPoint: 6,5 -# IndicatorPalettePrefix: effect Exit@1: - SpawnOffset: -4,24 + SpawnOffset: -170,1024,0 ExitCell: 3,3 Production: Produces: Vehicle @@ -287,16 +279,16 @@ GATICK: RenderBuilding: RenderVoxels: Image: ttnk - WithVoxelBarrel: # TODO: offsets - WithVoxelTurret: # TODO: offsets + WithVoxelBarrel: + WithVoxelTurret: Transforms: IntoActor: ttnk - Offset: 1,1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: 1,1 + Facing: 96 + TransformSounds: + NoTransformSounds: -GAICBM: # TODO: does not launch anything yet +GAICBM: Inherits: ^Building Valued: Cost: 800 @@ -304,8 +296,8 @@ GAICBM: # TODO: does not launch anything yet Tooltip: Name: Deployed ICBM Building: - Footprint: _ x # TODO - Dimensions: 1,2 # TODO + Footprint: _ x + Dimensions: 1,2 -GivesBuildableArea: Health: HP: 400 @@ -315,10 +307,10 @@ GAICBM: # TODO: does not launch anything yet Range: 5 Transforms: IntoActor: icbm - Offset: 1,1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: 1,1 + Facing: 96 + TransformSounds: + NoTransformSounds: GADPSA: Inherits: ^Building @@ -328,8 +320,8 @@ GADPSA: Tooltip: Name: Deployed Sensor Array Building: - Footprint: _ x # TODO - Dimensions: 1,2 # TODO + Footprint: _ x + Dimensions: 1,2 -GivesBuildableArea: Health: HP: 600 @@ -339,10 +331,10 @@ GADPSA: Range: 8 Transforms: IntoActor: lpst - Offset: 1,1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: 1,1 + Facing: 96 + TransformSounds: + NoTransformSounds: RenderDetectionCircle: DetectCloaked: Range: 6 @@ -378,16 +370,16 @@ GAARTY: RenderBuilding: RenderVoxels: Image: art2 - WithVoxelBarrel: # TODO: offsets - WithVoxelTurret: # TODO: offsets + WithVoxelBarrel: + WithVoxelTurret: Transforms: IntoActor: art2 - Offset: 1,1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: 1,1 + Facing: 96 + TransformSounds: + NoTransformSounds: -GASPOT: # TODO: has moving spotlights +GASPOT: Inherits: ^Building Buildable: Queue: Defense @@ -422,7 +414,6 @@ GAHPAD: Description: Produces, rearms and\nrepairs helicopters Buildable: BuildPaletteOrder: 60 -# Prerequisites: garadr Owner: gdi Queue: Building Building: @@ -434,13 +425,12 @@ GAHPAD: RevealsShroud: Range: 5 Exit@1: - SpawnOffset: 0,-6 + SpawnOffset: 0,-256,0 Production: Produces: Air BelowUnits: Reservable: RepairsUnits: -# RallyPoint: ProductionBar: WithIdleOverlay@PLATFORM: Sequence: idle-platform @@ -456,7 +446,6 @@ NAHPAD: Description: Produces, rearms and\nrepairs helicopters Buildable: BuildPaletteOrder: 60 -# Prerequisites: naradr Owner: nod Queue: Building Building: @@ -468,20 +457,18 @@ NAHPAD: RevealsShroud: Range: 5 Exit@1: - SpawnOffset: 0,-6 + SpawnOffset: 0,-256,0 Production: Produces: Air BelowUnits: Reservable: RepairsUnits: -# RallyPoint: ProductionBar: WithIdleOverlay@PLATFORM: Sequence: idle-platform WithIdleOverlay@LIGHTS: Sequence: idle-lights -# custom prerequisites: ANYPOWER: Tooltip: Name: Power Plant @@ -490,4 +477,5 @@ ANYPOWER: BARRACKS: Tooltip: Name: Infantry Production - Description: Infantry Production \ No newline at end of file + Description: Infantry Production + diff --git a/mods/ts/rules/system.yaml b/mods/ts/rules/system.yaml index 81e8c48519..51e43e388e 100644 --- a/mods/ts/rules/system.yaml +++ b/mods/ts/rules/system.yaml @@ -148,4 +148,5 @@ mpspawn: waypoint: Waypoint: RenderEditorOnly: - BodyOrientation: \ No newline at end of file + BodyOrientation: + diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index 2864a420e8..360743a113 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -18,7 +18,7 @@ MCV: Armor: Type: Light Mobile: - Speed: 6 + Speed: 85 Crushes: wall, crate, infantry RevealsShroud: Range: 4 @@ -27,10 +27,10 @@ MCV: -AttackMove: Transforms: IntoActor: gacnst - Offset:-1,-1 + Offset: -1,-1 Facing: 96 - TransformSounds: # TODO - NoTransformSounds: # TODO + TransformSounds: + NoTransformSounds: RenderSprites: RenderVoxels: WithVoxelBody: @@ -40,7 +40,7 @@ APC: Valued: Cost: 600 Tooltip: - Name: Amphibious APC # TODO: not yet amphibious + Name: Amphibious APC Description: Armored infantry transport and mobile AA\n Strong vs Aircraft, Vehicles\n Weak vs Infantry Buildable: Queue: Vehicle @@ -48,7 +48,7 @@ APC: Owner: gdi Mobile: ROT: 5 - Speed: 8 + Speed: 113 Health: HP: 200 Armor: @@ -67,7 +67,7 @@ APC: RenderVoxels: WithVoxelBody: -HARV: # TODO: without back: HORV +HARV: Inherits: ^Vehicle Valued: Cost: 1400 @@ -77,28 +77,19 @@ HARV: # TODO: without back: HORV Buildable: Queue: Vehicle BuildPaletteOrder: 10 -# Prerequisites: proc Owner: gdi,nod Selectable: Priority: 7 Bounds: 36,36 -# Harvester: -# Resources: Tiberium, BlueTiberium -# PipCount: 7 -# Capacity: 28 -# LoadTicksPerBale: 6 -# UnloadTicksPerBale: 12 -# SearchFromProcRadius: 24 -# SearchFromOrderRadius: 12 Mobile: - Speed: 5 + Speed: 71 Health: HP: 1000 SelfHealing: Ticks: 10 HealIfBelow: 50% DamageCooldown: 200 - Armor: + Armor: Type: Heavy RevealsShroud: Range: 4 @@ -120,11 +111,11 @@ HVR: Queue: Vehicle BuildPaletteOrder: 30 Owner: gdi - Mobile: # TODO: amphibious - Speed: 7 + Mobile: + Speed: 99 Health: HP: 230 - Armor: + Armor: Type: Light RevealsShroud: Range: 7 @@ -151,7 +142,7 @@ HVR: BuildPaletteOrder: 60 Owner: gdi Mobile: - Speed: 4 + Speed: 56 ROT: 5 Health: HP: 600 @@ -177,7 +168,7 @@ HVR: WithVoxelTurret: WithVoxelBarrel: -TRUCKB: # NOTE: TRUCKA is unloaded +TRUCKB: Inherits: ^Vehicle Buildable: Queue: Vehicle @@ -193,7 +184,7 @@ TRUCKB: # NOTE: TRUCKA is unloaded Armor: Type: Light Mobile: - Speed: 4 + Speed: 56 RevealsShroud: Range: 5 SupplyTruck: @@ -219,7 +210,7 @@ LPST: Armor: Type: Light Mobile: - Speed: 6 + Speed: 85 ROT: 5 RevealsShroud: Range: 10 @@ -230,10 +221,10 @@ LPST: WithVoxelBody: Transforms: IntoActor: gadpsa - Offset: -1,-1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: -1,-1 + Facing: 96 + TransformSounds: + NoTransformSounds: ICBM: Inherits: ^Vehicle @@ -250,7 +241,7 @@ ICBM: Armor: Type: Light Mobile: - Speed: 6 + Speed: 85 ROT: 5 RevealsShroud: Range: 7 @@ -261,10 +252,10 @@ ICBM: WithVoxelBody: Transforms: IntoActor: gaicbm - Offset:-1,-1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: -1,-1 + Facing: 96 + TransformSounds: + NoTransformSounds: REPAIR: Inherits: ^Vehicle @@ -280,7 +271,7 @@ REPAIR: Health: HP: 200 Mobile: - Speed: 6 + Speed: 85 ROT: 5 RevealsShroud: Range: 5 @@ -309,7 +300,7 @@ ART2: Armor: Type: Light Mobile: - Speed: 5 + Speed: 71 ROT: 2 RevealsShroud: Range: 9 @@ -320,10 +311,10 @@ ART2: WithVoxelBody: Transforms: IntoActor: gaarty - Offset: -1,-1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: -1,-1 + Facing: 96 + TransformSounds: + NoTransformSounds: WEED: Inherits: ^Vehicle @@ -335,18 +326,9 @@ WEED: Buildable: Queue: Vehicle BuildPaletteOrder: 10 -# Prerequisites: naweap, nawast Owner: nod -# Harvester: -# Resources: Veins -# PipCount: 7 -# Capacity: 28 -# LoadTicksPerBale: 6 -# UnloadTicksPerBale: 12 -# SearchFromProcRadius: 24 -# SearchFromOrderRadius: 12 Mobile: - Speed: 5 + Speed: 71 ROT: 5 Health: HP: 600 @@ -373,7 +355,7 @@ BUS: Owner: gdi Mobile: ROT: 5 - Speed: 8 + Speed: 113 Health: HP: 100 Armor: @@ -402,7 +384,7 @@ PICK: Owner: gdi Mobile: ROT: 5 - Speed: 8 + Speed: 113 Health: HP: 100 Armor: @@ -431,7 +413,7 @@ CAR: Owner: gdi Mobile: ROT: 5 - Speed: 8 + Speed: 113 Health: HP: 100 Armor: @@ -460,7 +442,7 @@ GGHUNT: Queue: Vehicle Mobile: ROT: 16 - Speed: 25 + Speed: 355 Health: HP: 500 Armor: @@ -487,7 +469,7 @@ WINI: Owner: gdi Mobile: ROT: 5 - Speed: 8 + Speed: 113 Health: HP: 200 Armor: @@ -516,7 +498,7 @@ MMCH: Owner: gdi Mobile: ROT: 5 - Speed: 4 + Speed: 56 Health: HP: 400 Armor: @@ -549,7 +531,7 @@ HMEC: Owner: gdi Mobile: ROT: 3 - Speed: 3 + Speed: 42 Health: HP: 800 SelfHealing: @@ -581,7 +563,7 @@ SMECH: Owner: gdi Mobile: ROT: 5 - Speed: 7 + Speed: 99 Health: HP: 800 Armor: @@ -609,7 +591,7 @@ BIKE: Owner: nod Mobile: ROT: 8 - Speed: 12 + Speed: 170 Health: HP: 150 Armor: @@ -639,7 +621,7 @@ BGGY: Owner: nod Mobile: ROT: 8 - Speed: 10 + Speed: 142 Health: HP: 220 Armor: @@ -659,7 +641,7 @@ SAPC: Valued: Cost: 800 Tooltip: - Name: Subterranean APC # TODO: not yet subterranean + Name: Subterranean APC Description: Armored infantry transport and mobile AA\n Strong vs Aircraft, Vehicles\n Weak vs Infantry Buildable: Queue: Vehicle @@ -667,7 +649,7 @@ SAPC: Owner: nod Mobile: ROT: 5 - Speed: 5 + Speed: 71 Health: HP: 175 Armor: @@ -697,7 +679,7 @@ SUBTANK: Owner: nod Mobile: ROT: 6 - Speed: 5 + Speed: 71 Health: HP: 300 Armor: @@ -724,7 +706,7 @@ SONIC: Owner: gdi Mobile: ROT: 4 - Speed: 4 + Speed: 56 Health: HP: 500 Armor: @@ -753,7 +735,7 @@ TTNK: Owner: nod Mobile: ROT: 5 - Speed: 6 + Speed: 85 Health: HP: 350 Armor: @@ -766,10 +748,10 @@ TTNK: WithVoxelBody: Transforms: IntoActor: gatick - Offset:-1,-1 # TODO - Facing: 96 # TODO - TransformSounds: # TODO - NoTransformSounds: # TODO + Offset: -1,-1 + Facing: 96 + TransformSounds: + NoTransformSounds: STNK: Inherits: ^Vehicle @@ -784,7 +766,7 @@ STNK: Owner: nod Mobile: ROT: 5 - Speed: 6 + Speed: 85 Health: HP: 180 Armor: @@ -794,8 +776,8 @@ STNK: Cloak: InitialDelay: 90 CloakDelay: 90 - CloakSound: # TODO - UncloakSound: # TODO + CloakSound: + UncloakSound: Armament: Weapon: Dragon LocalOffset: 213,43,128, 213,-43,128 @@ -804,4 +786,5 @@ STNK: InitialStance: HoldFire RenderSprites: RenderVoxels: - WithVoxelBody: \ No newline at end of file + WithVoxelBody: + diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index 5b582305f3..a1710e6213 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -1,11 +1,11 @@ Minigun: ROF: 21 - Range: 4 + Range: 4c0 Report: INFGUN2.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 25% Light: 30% @@ -17,16 +17,16 @@ Minigun: Grenade: ROF: 60 - Range: 4.5 + Range: 4c512 Projectile: Bullet - Speed: 5 + Speed: 85 High: yes Shadow: yes - Angle: 0.1 - Inaccuracy: 13 + Angle: 62 + Inaccuracy: 554 Image: DISCUS Warhead: - Spread: 6 + Spread: 256 Versus: None: 50% Wood: 100% @@ -39,20 +39,20 @@ Grenade: Bazooka: ROF: 60 - Range: 6 + Range: 6c0 Report: RKETINF1.AUD ValidTargets: Ground, Air Projectile: Missile - Speed: 25 + Speed: 213 Arm: 2 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 8 RangeLimit: 35 Warhead: - Spread: 3 + Spread: 128 Versus: None: 10% Wood: 75% @@ -65,20 +65,20 @@ Bazooka: MultiCluster: ROF: 80 - Range: 6 + Range: 6c0 Report: MISL1.AUD ValidTargets: Ground Projectile: Missile - Speed: 20 + Speed: 170 Arm: 2 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 8 RangeLimit: 35 Warhead: - Spread: 3 + Spread: 128 Versus: None: 10% Wood: 75% @@ -91,12 +91,12 @@ MultiCluster: Heal: ROF: 80 - Range: 2.83 + Range: 2c849 Report: HEALER1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 5 + Spread: 213 Versus: Wood: 0% Light: 0% @@ -107,13 +107,13 @@ Heal: Sniper: ROF: 60 - Range: 6.75 + Range: 6c768 Report: SILENCER.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 150 - Spread: 1 + Spread: 42 Versus: None: 100% Wood: 5% @@ -123,12 +123,12 @@ Sniper: M1Carbine: ROF: 20 - Range: 4 + Range: 4c0 Report: INFGUN3.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: None: 100% Wood: 25% @@ -140,13 +140,13 @@ M1Carbine: LtRail: ROF: 60 - Range: 6 + Range: 6c0 Report: BIGGGUN1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Damage: 150 - Spread: 1 + Spread: 42 Versus: None: 100% Wood: 5% @@ -157,12 +157,12 @@ LtRail: Vulcan3: ROF: 30 Burst: 3 - Range: 4 + Range: 4c0 Report: CYGUN1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 25% Light: 30% @@ -175,12 +175,12 @@ Vulcan3: Vulcan2: ROF: 50 Burst: 3 - Range: 6 + Range: 6c0 Report: TSGUN4.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: None: 100% Wood: 60% @@ -193,10 +193,10 @@ Vulcan2: Vulcan: ROF: 60 - Range: 4 + Range: 4c0 Report: CHAINGN1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Versus: Wood: 25% @@ -210,13 +210,13 @@ Vulcan: FiendShard: ROF: 30 Burst: 3 - Range: 5 + Range: 5c0 Report: FIEND2.AUD Projectile: Missile - Speed: 25 + Speed: 213 Image: CRYSTAL4 Shadow: yes - Angle: 0.15 + Angle: 88 Warhead: Versus: Wood: 25% @@ -229,10 +229,10 @@ FiendShard: JumpCannon: ROF: 40 Burst: 2 - Range: 5 + Range: 5c0 Report: JUMPJET1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: Versus: Wood: 25% @@ -246,20 +246,20 @@ JumpCannon: HoverMissile: ROF: 68 Burst: 2 - Range: 8 + Range: 8c0 Report: HOVRMIS1.AUD ValidTargets: Ground, Air Projectile: Missile - Speed: 30 + Speed: 256 Arm: 2 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 8 RangeLimit: 35 Warhead: - Spread: 3 + Spread: 128 Versus: None: 10% Wood: 75% @@ -272,17 +272,17 @@ HoverMissile: 120mmx: ROF: 80 - Range: 6.75 + Range: 6c768 Report: 120MMF.AUD Burst: 2 BurstDelay: 5 Projectile: Bullet - Speed: 40 + Speed: 682 Image: 120mm Shadow: yes - Angle: 0.1 + Angle: 62 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -296,7 +296,7 @@ HoverMissile: MammothTusk: ROF: 80 - Range: 6 + Range: 6c0 Report: MISL1.AUD ValidTargets: Air Burst: 2 @@ -304,13 +304,13 @@ MammothTusk: Arm: 0 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 10 - Speed: 20 + Speed: 170 RangeLimit: 35 Warhead: - Spread: 6 + Spread: 256 Versus: None: 40% Wood: 75% @@ -323,12 +323,12 @@ MammothTusk: Repair: ROF: 80 - Range: 1.8 + Range: 1c819 Report: REPAIR11.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 5 + Spread: 213 Versus: None: 0% Wood: 0% @@ -341,10 +341,10 @@ Repair: SlimeAttack: ROF: 80 Burst: 3 - Range: 5 + Range: 5c0 Report: VICER1.AUD Projectile: Bullet - Speed: 25 + Speed: 426 Warhead: Versus: Wood: 25% @@ -356,11 +356,11 @@ SlimeAttack: SuicideBomb: ROF: 1 - Range: 0.5 + Range: 0c512 Report: HUNTER2.AUD Warhead: Damage: 11000 - Spread: 6 + Spread: 256 Ore: true Versus: None: 90% @@ -371,12 +371,12 @@ SuicideBomb: 120mm: ROF: 80 - Range: 6.75 + Range: 6c768 Report: 120MMF.AUD Projectile: Bullet - Speed: 90 + Speed: 1c512 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -390,7 +390,7 @@ SuicideBomb: MechRailgun: ROF: 60 - Range: 8 + Range: 8c0 Burst: 2 BurstDelay: 10 Charges: yes @@ -399,19 +399,18 @@ MechRailgun: Color: 200,0,255,255 BeamWidth: 2 Warhead: - Spread: 1 + Spread: 42 InfDeath: 5 -# SmudgeType: Scorch Damage: 200 AssaultCannon: ROF: 50 - Range: 5 + Range: 5c0 Report: TSGUN4.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 100% Light: 60% @@ -425,20 +424,20 @@ BikeMissile: ROF: 60 Burst: 2 BurstDelay: 60 - Range: 5 + Range: 5c0 Report: MISL1.AUD ValidTargets: Ground Projectile: Missile Arm: 2 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 8 - Speed: 30 + Speed: 256 RangeLimit: 35 Warhead: - Spread: 6 + Spread: 256 Versus: None: 40% Wood: 75% @@ -451,12 +450,12 @@ BikeMissile: RaiderCannon: ROF: 55 - Range: 4 + Range: 4c0 Report: CHAINGN1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 25% Light: 30% @@ -466,16 +465,16 @@ RaiderCannon: InfDeath: 2 Damage: 40 -FireballLauncher: # TODO: add fire particles +FireballLauncher: ROF: 50 - Range: 4.25 + Range: 4c256 Report: FLAMTNK1.AUD Projectile: Bullet - Speed: 20 + Speed: 341 Burst: 2 BurstDelay: 25 Warhead: - Spread: 8 + Spread: 341 Versus: None: 100% Wood: 100% @@ -487,37 +486,36 @@ FireballLauncher: # TODO: add fire particles SonicZap: ROF: 120 - Range: 6 + Range: 6c0 Burst: 2 BurstDelay: 10 Charges: yes Report: SONIC4.AUD - Projectile: LaserZap # TODO: SonicBeam + Projectile: LaserZap Color: 200,0,255,255 BeamWidth: 10 Warhead: - Spread: 1 + Spread: 42 InfDeath: 5 -# SmudgeType: Scorch Damage: 100 Dragon: ROF: 50 - Range: 6 + Range: 6c0 Burst: 2 Report: MISL1.AUD ValidTargets: Ground, Air Projectile: Missile - Speed: 25 + Speed: 213 Arm: 2 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 8 RangeLimit: 35 Warhead: - Spread: 3 + Spread: 128 Versus: None: 10% Wood: 75% @@ -530,15 +528,15 @@ Dragon: 90mm: ROF: 50 - Range: 6.75 + Range: 6c768 Report: 120MMF.AUD Projectile: Bullet - Speed: 40 + Speed: 682 Image: 120mm Shadow: yes - Angle: 0.1 + Angle: 62 Warhead: - Spread: 3 + Spread: 128 Versus: None: 30% Wood: 75% @@ -552,16 +550,16 @@ Dragon: 155mm: ROF: 110 - Range: 18 + Range: 18c0 Report: 120MMF.AUD Projectile: Bullet - Speed: 10 + Speed: 170 Image: 120mm - Angle: 0.4 + Angle: 165 Shadow: yes - MinRange: 5 + MinRange: 5c0 Warhead: - Spread: 7 + Spread: 298 Versus: None: 100% Wood: 85% @@ -575,21 +573,21 @@ Dragon: Hellfire: ROF: 50 - Range: 6 + Range: 6c0 Report: ORCAMIS1.AUD Burst: 2 ValidTargets: Ground, Air Projectile: Missile - Speed: 30 + Speed: 256 Arm: 2 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: DRAGON ROT: 8 RangeLimit: 35 Warhead: - Spread: 2 + Spread: 85 Versus: None: 30% Wood: 65% @@ -603,13 +601,13 @@ Hellfire: Bomb: ROF: 10 - Range: 5 + Range: 5c0 Projectile: Bullet - Speed: 10 + Speed: 170 Image: 120MM Shadow: yes Warhead: - Spread: 7 + Spread: 298 Versus: None: 200% Wood: 90% @@ -623,21 +621,21 @@ Bomb: Proton: ROF: 3 - Range: 5 + Range: 5c0 Report: SCRIN5B.AUD Burst: 2 ValidTargets: Ground, Air Projectile: Missile - Speed: 30 + Speed: 256 Arm: 2 High: yes Shadow: yes - Inaccuracy: 3 + Inaccuracy: 128 Image: TORPEDO ROT: 1 RangeLimit: 35 Warhead: - Spread: 3 + Spread: 128 Versus: None: 25% Wood: 65% @@ -651,13 +649,13 @@ Proton: HarpyClaw: ROF: 36 - Range: 5 + Range: 5c0 Report: CYGUN1.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 ValidTargets: Ground, Air Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 25% Light: 30% @@ -669,12 +667,12 @@ HarpyClaw: Pistola: ROF: 20 - Range: 3 + Range: 3c0 Report: GUN18.AUD Projectile: Bullet - Speed: 100 + Speed: 1c682 Warhead: - Spread: 3 + Spread: 128 Versus: Wood: 50% Light: 60% @@ -682,4 +680,5 @@ Pistola: Concrete: 25% Explosion: piff InfDeath: 2 - Damage: 2 \ No newline at end of file + Damage: 2 +