From 996877d9e5eef33f21e6e9b33871228144a16cce Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 26 Dec 2013 20:33:56 +1300 Subject: [PATCH] Upgrade mod rules to match engine changes. --- mods/cnc/maps/Instant_Karma.oramap | Bin 7255 -> 7255 bytes mods/cnc/maps/Nullpeter.oramap | Bin 7451 -> 7451 bytes mods/cnc/maps/break_of_day.oramap | Bin 9693 -> 9693 bytes mods/cnc/maps/chokepoint.oramap | Bin 3348 -> 3348 bytes mods/cnc/maps/chord_simple.oramap | Bin 6612 -> 6612 bytes mods/cnc/maps/dead_in_motion.oramap | Bin 3341 -> 3341 bytes mods/cnc/maps/dead_in_motion_(redux).oramap | Bin 3392 -> 3392 bytes mods/cnc/maps/deterring_democracy.oramap | Bin 3778 -> 3778 bytes mods/cnc/maps/deterring_democracy_plus.oramap | Bin 7001 -> 7001 bytes mods/cnc/maps/eastwest3.oramap | Bin 3739 -> 3739 bytes mods/cnc/maps/garden2.oramap | Bin 6696 -> 6696 bytes mods/cnc/maps/haos_ridges_cnc.oramap | Bin 6926 -> 6926 bytes mods/cnc/maps/into_the_river_below.oramap | Bin 8379 -> 8379 bytes mods/cnc/maps/lessons_from_kosovo.oramap | Bin 8029 -> 8029 bytes mods/cnc/maps/llamas.oramap | Bin 2869 -> 2869 bytes mods/cnc/maps/llamas2.oramap | Bin 3412 -> 3412 bytes mods/cnc/maps/manufacturing_consent.oramap | Bin 4677 -> 4677 bytes mods/cnc/maps/minus_two.oramap | Bin 4640 -> 4640 bytes mods/cnc/maps/no_escapism.oramap | Bin 5518 -> 5518 bytes mods/cnc/maps/rubicon.oramap | Bin 4981 -> 4981 bytes mods/cnc/maps/sea_and_cake.oramap | Bin 4381 -> 4381 bytes mods/cnc/maps/shellmap/map.yaml | 4 +- mods/cnc/maps/skull_valley.oramap | Bin 7048 -> 7048 bytes mods/cnc/maps/slippery_slopes.oramap | Bin 4952 -> 4952 bytes mods/cnc/maps/the_hourglass.oramap | Bin 2908 -> 2908 bytes mods/cnc/maps/thesentinel.oramap | Bin 2416 -> 2416 bytes mods/cnc/maps/tiberium-oasis-cluster.oramap | Bin 11663 -> 11663 bytes mods/cnc/rules/aircraft.yaml | 20 +- mods/cnc/rules/civilian-desert.yaml | 39 +- mods/cnc/rules/civilian.yaml | 45 +-- mods/cnc/rules/defaults.yaml | 38 +- mods/cnc/rules/husks.yaml | 7 +- mods/cnc/rules/infantry.yaml | 17 +- mods/cnc/rules/ships.yaml | 9 +- mods/cnc/rules/structures.yaml | 46 ++- mods/cnc/rules/system.yaml | 13 +- mods/cnc/rules/tech.yaml | 15 +- mods/cnc/rules/trees.yaml | 21 +- mods/cnc/rules/vehicles.yaml | 45 +-- mods/cnc/weapons.yaml | 305 +++++++-------- mods/d2k/maps/death-depths.oramap | Bin 9170 -> 9170 bytes mods/d2k/maps/imperial-basin.oramap | Bin 9104 -> 9104 bytes mods/d2k/maps/the-duell.oramap | Bin 7653 -> 7653 bytes mods/d2k/maps/tucks-sietch.oramap | Bin 4303 -> 4303 bytes mods/d2k/maps/venac-ditch.oramap | Bin 9687 -> 9687 bytes mods/d2k/rules/aircraft.yaml | 25 +- mods/d2k/rules/atreides.yaml | 13 +- mods/d2k/rules/defaults.yaml | 31 +- mods/d2k/rules/harkonnen.yaml | 11 +- mods/d2k/rules/infantry.yaml | 11 +- mods/d2k/rules/ordos.yaml | 17 +- mods/d2k/rules/structures.yaml | 21 +- mods/d2k/rules/system.yaml | 12 +- mods/d2k/rules/vehicles.yaml | 24 +- mods/d2k/weapons.yaml | 201 +++++----- mods/ra/maps/Fort-Lonestar/map.yaml | 84 ++-- mods/ra/maps/Sahara.oramap | Bin 10307 -> 10307 bytes mods/ra/maps/Survival02/map.yaml | 4 +- mods/ra/maps/a-path-beyond.oramap | Bin 6214 -> 6214 bytes mods/ra/maps/alaska-anarchy-redux.oramap | Bin 20584 -> 20584 bytes mods/ra/maps/all-connected.oramap | Bin 9805 -> 9805 bytes mods/ra/maps/allies-01-classic/map.yaml | 39 +- mods/ra/maps/allies-01/map.yaml | 10 +- mods/ra/maps/allies-02-classic/map.yaml | 24 +- mods/ra/maps/allies-04/map.yaml | 2 +- mods/ra/maps/arctic-triangle-affair.oramap | Bin 10110 -> 10110 bytes mods/ra/maps/asymetric-battle.oramap | Bin 15327 -> 15327 bytes mods/ra/maps/bad-neighbors.oramap | Bin 5318 -> 5318 bytes mods/ra/maps/battle-lake.oramap | Bin 15447 -> 15341 bytes mods/ra/maps/black-gold.oramap | Bin 4380 -> 4380 bytes mods/ra/maps/bloody-delta.oramap | Bin 13640 -> 13640 bytes mods/ra/maps/bombardment-islands.oramap | Bin 10816 -> 10816 bytes mods/ra/maps/bomber-john/map.yaml | 2 +- mods/ra/maps/breaking-point.oramap | Bin 8405 -> 8405 bytes mods/ra/maps/caffeinated.oramap | Bin 9017 -> 9017 bytes mods/ra/maps/calm-before-storm.oramap | Bin 8189 -> 8189 bytes mods/ra/maps/central-conflict.oramap | Bin 6685 -> 6685 bytes mods/ra/maps/chaos-canyon.oramap | Bin 19603 -> 19603 bytes mods/ra/maps/chokepoint.oramap | Bin 8875 -> 8875 bytes mods/ra/maps/coastal-influence.oramap | Bin 8550 -> 8550 bytes mods/ra/maps/contact.oramap | Bin 5019 -> 5019 bytes mods/ra/maps/convergence.oramap | Bin 6486 -> 6486 bytes mods/ra/maps/crossing-the-river.oramap | Bin 4866 -> 4866 bytes mods/ra/maps/desert-shellmap/map.yaml | 8 +- mods/ra/maps/doubles.oramap | Bin 7082 -> 7082 bytes mods/ra/maps/doughnut.oramap | Bin 11731 -> 11731 bytes .../maps/drop-zone-battle-of-tikiaki/map.yaml | 6 +- mods/ra/maps/drop-zone-w/map.yaml | 22 +- mods/ra/maps/drop-zone/map.yaml | 6 +- mods/ra/maps/east-vs-west.oramap | Bin 3181 -> 3181 bytes mods/ra/maps/encounter.oramap | Bin 7262 -> 7262 bytes mods/ra/maps/engagement.oramap | Bin 18437 -> 18437 bytes mods/ra/maps/equal-opportunity.oramap | Bin 5231 -> 5231 bytes mods/ra/maps/first-come-first-served.oramap | Bin 5442 -> 5442 bytes mods/ra/maps/forest-path.oramap | Bin 3917 -> 3917 bytes mods/ra/maps/free-coasts.oramap | Bin 10742 -> 10742 bytes mods/ra/maps/ghost-town.oramap | Bin 8486 -> 8486 bytes mods/ra/maps/haos-ridges.oramap | Bin 12002 -> 12002 bytes mods/ra/maps/hasselhoff.oramap | Bin 5889 -> 5889 bytes mods/ra/maps/hectic.oramap | Bin 9787 -> 9787 bytes mods/ra/maps/high-and-low-extended.oramap | Bin 14925 -> 14925 bytes mods/ra/maps/high-and-low.oramap | Bin 5647 -> 5647 bytes mods/ra/maps/island-hoppers.oramap | Bin 7327 -> 7327 bytes mods/ra/maps/keep-off-the-grass-2.oramap | Bin 5184 -> 5184 bytes mods/ra/maps/mad-scramble.oramap | Bin 12238 -> 12238 bytes mods/ra/maps/man-to-man.oramap | Bin 3664 -> 3664 bytes mods/ra/maps/marooned-2.oramap | Bin 7770 -> 7770 bytes mods/ra/maps/mass-confliction.oramap | Bin 11891 -> 11891 bytes mods/ra/maps/monster-tank-madness/map.yaml | 8 +- mods/ra/maps/nishnekolymsk.oramap | Bin 43063 -> 43063 bytes mods/ra/maps/north-by-northwest.oramap | Bin 5149 -> 5149 bytes mods/ra/maps/pearly-wastelands.oramap | Bin 7426 -> 7426 bytes mods/ra/maps/pressure.oramap | Bin 11255 -> 11255 bytes mods/ra/maps/puddles-redux.oramap | Bin 10959 -> 10959 bytes mods/ra/maps/raraku.oramap | Bin 7520 -> 7520 bytes mods/ra/maps/regeneration-basin.oramap | Bin 9196 -> 9196 bytes mods/ra/maps/ring-of-fire.oramap | Bin 7303 -> 7303 bytes mods/ra/maps/river-war-2.oramap | Bin 8921 -> 8921 bytes mods/ra/maps/room-warzone.oramap | Bin 4382 -> 4382 bytes mods/ra/maps/seven-stairs.oramap | Bin 13298 -> 13298 bytes mods/ra/maps/snow town.oramap | Bin 11874 -> 11874 bytes mods/ra/maps/snowy-island.oramap | Bin 14558 -> 14558 bytes mods/ra/maps/snowyridge.oramap | Bin 2256 -> 2256 bytes mods/ra/maps/soviet-01-classic/map.yaml | 2 +- mods/ra/maps/strip-mine.oramap | Bin 10684 -> 10684 bytes mods/ra/maps/styrian-mountains.oramap | Bin 12135 -> 12135 bytes mods/ra/maps/suffrage.oramap | Bin 7450 -> 7450 bytes mods/ra/maps/tainted-peak.oramap | Bin 16177 -> 16177 bytes mods/ra/maps/temperal.oramap | Bin 11607 -> 11607 bytes mods/ra/maps/the-white-pentagon.oramap | Bin 9808 -> 9808 bytes mods/ra/maps/tournament-island.oramap | Bin 13484 -> 13484 bytes mods/ra/maps/vegetation.oramap | Bin 11855 -> 11855 bytes mods/ra/maps/winter-warzone.oramap | Bin 4954 -> 4954 bytes mods/ra/rules/aircraft.yaml | 34 +- mods/ra/rules/civilian.yaml | 8 +- mods/ra/rules/defaults.yaml | 73 ++-- mods/ra/rules/infantry.yaml | 37 +- mods/ra/rules/ships.yaml | 13 +- mods/ra/rules/structures.yaml | 72 ++-- mods/ra/rules/system.yaml | 31 +- mods/ra/rules/trees.yaml | 5 +- mods/ra/rules/vehicles.yaml | 51 ++- mods/ra/weapons.yaml | 368 +++++++++--------- mods/ts/maps/blank-conquest.oramap | Bin 672 -> 672 bytes mods/ts/rules/aircraft.yaml | 47 +-- mods/ts/rules/defaults.yaml | 27 +- mods/ts/rules/infantry.yaml | 103 ++--- mods/ts/rules/structures.yaml | 86 ++-- mods/ts/rules/system.yaml | 3 +- mods/ts/rules/vehicles.yaml | 129 +++--- mods/ts/weapons.yaml | 229 ++++++----- 151 files changed, 1215 insertions(+), 1308 deletions(-) diff --git a/mods/cnc/maps/Instant_Karma.oramap b/mods/cnc/maps/Instant_Karma.oramap index ad9f67f73c206468a3e369763a334b7f54f149a1..1f5b9761f7d178c3d5b86835dd30f014e3ca48f2 100644 GIT binary patch delta 47 wcmca^aovJ9z?+#xgn@y9gF$S`tc|>KlFUGQv!3J@CJXqUR@MdNaVPIh3U=Uw2Ya{P*c4i>G`8xYS77%0dY#t*peSyao04r|}aR2}S delta 47 wcmeB`>XqUR@MdNaVPIh3U=WDu*vNaFof$}PzRrG-1;m&gbwG+Yz?+#xgn@y9gF$@Btc|=??94!Va~HcKD~K`q9FGy0X6Cg8049A6B>(^b delta 47 vcmX>gbwG+Yz?+#xgn@y9gFzssVkdq|cyz?+#xgn@y9gF$@Btc|=sxtM|UW=?JwW)Nd?0G|<kdq|cyz?+#xgn@y9gFzssV)77%0db15S*EhB9U05!7>y8r+H delta 47 wcmca>T+Bdvb1BzGW)NetCZ7?Qj^nch02sLpoemG@MdNaVPIh3U=Uw2Ya?&EFf)+eTrRA{4q{B6BV`1pFG|@002|s3g#Z8m delta 47 vcmeA(>oemG@MdNaVPIh3U=WDu*vOkM%nYPAmkTSggBX+NNEw0Yi&C}#|LqI` diff --git a/mods/cnc/maps/into_the_river_below.oramap b/mods/cnc/maps/into_the_river_below.oramap index d3c83fbb0776432398515758393292e020d1e52a..965c430b569940e099f613687fa99eee3248a455 100644 GIT binary patch delta 47 wcmdn(xZ9C8z?+#xgn@y9gF$@Btc|=W;>lADO99#^F diff --git a/mods/cnc/maps/lessons_from_kosovo.oramap b/mods/cnc/maps/lessons_from_kosovo.oramap index 993a1cd37a8f726fd9e2e5ceaba0f00a83bcf35a..ad06b331f9c88f0b3cb8cc1800e7cab2d4dedaeb 100644 GIT binary patch delta 47 wcmca>ch`ch`K1=>Px# diff --git a/mods/cnc/maps/llamas.oramap b/mods/cnc/maps/llamas.oramap index 90d9a81d3205ea25b61d1c05591c54c6843900b4..1634dc8e896893302147fdd904fa039bfd09e35f 100644 GIT binary patch delta 47 wcmdlgwpENbz?+#xgn@y9gF$@Btc|=IIhcX;=7Svn89|K6hq;Wv^bamu06NPL761SM delta 47 wcmdlgwpENbz?+#xgn@y9gFzssVSwd diff --git a/mods/cnc/maps/manufacturing_consent.oramap b/mods/cnc/maps/manufacturing_consent.oramap index a2e8071bcb762615859336000ca82544f3f1b7b7..950ef1eac66f97c943b0ccd619ab4660e799adb7 100644 GIT binary patch delta 47 wcmX@Aa#V#kz?+#xgn@y9gF$@Btc|?7Jj_6Pvn|hLRuE(IWkDk_%^_q903^{382|tP delta 47 wcmX@Aa#V#kz?+#xgn@y9gFzssVOS7Y|As56~vf)Sh($ diff --git a/mods/cnc/maps/minus_two.oramap b/mods/cnc/maps/minus_two.oramap index abc99655bd71db862600c098df1d7ae4740754e3..fe997a1da8bd2ab2a9561029f452fd03a03aac82 100644 GIT binary patch delta 47 wcmZ3WvOtA5z?+#xgn@y9gF$@Btc|>jaI!^kYF=06EkS{Qv*} delta 47 wcmZ3WvOtA5z?+#xgn@y9gFzssVn+a diff --git a/mods/cnc/maps/no_escapism.oramap b/mods/cnc/maps/no_escapism.oramap index 3d09e6c03703188a64334f77c4175a753a67e492..0f202e505bc3009c58aa2e83a9abb3ad1f7b7144 100644 GIT binary patch delta 47 vcmeCv?$hQC@MdNaVPIh3U=Uw2Ya_2VA2X2NY|VF%4aAr%BWeVu14V5C5&{gK delta 47 vcmeCv?$hQC@MdNaVPIh3U=WDu*vPBR#|)%5Tl3vx12HDch#Ge9S<4b3C6X6NoW+wSWPx# 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 c185b6dfdbc973a05e7e81abee0e50831f211b13..fbcde276602dd1ecbaebeeb964c2670ea493d2c7 100644 GIT binary patch delta 47 vcmeA$?=a^L@MdNaVPIh3U=Uw2Ya{O`QDz{$nMq8L6~ve delta 47 vcmcbic0-Lfz?+#xgn@y9gFzssVz?+#xgn@y9gF$@Btc|?SSeb$J=5MU5%pk_(e;h_&+L+T807iWdV*mgE delta 47 wcmew$^g)O>z?+#xgn@y9gFzssVu3d}%yv!{XxGl(%cLD>jQPgS-B05F>keEKEa(gz?+#xgn@y9gF$l1tc|>y3d}%yv!%i#CJKEa(gz?+#xgn@y9gF!T=V@BUz1Y%4smNf#?D`af}8KVq0 diff --git a/mods/d2k/maps/tucks-sietch.oramap b/mods/d2k/maps/tucks-sietch.oramap index 9d0ea68dce396680ff7e32c71524c9c50f60f413..192cd5fd7551b41a127134e2202a31e1ac6afc18 100644 GIT binary patch delta 47 wcmX@FcwUh=z?+#xgn@y9gF$l1tc|>rc$tCp=0&_am_Urlu>wY5dXj)G06CNnE&u=k delta 47 wcmX@FcwUh=z?+#xgn@y9gF!T=Vca5#WBz?+#xgn@y9gW=lZSsQu9l$n9_W;Nv%EFi|@i|R&TnoYwN0B@iWp#T5? delta 47 wcmX>ca5#WBz?+#xgn@y9gW+j($3|W;Wo96~SxtEb3y3lKqPh{7X49|*09tkrbpQYW 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 bc2db0f5f25cf523693494e5489a4d3dbf568a85..a467a874ede0f743eb6e162f3628589cdb930d9e 100644 GIT binary patch delta 47 wcmX?RaLj-=z?+#xgn@y9gW=lZSsQsnMVNu~=2Vd!W)NfY6>%dl%_(6E0BM5|Z~y=R delta 47 wcmX?RaLj-=z?+#xgn@y9gW+j($41^z5oRF0IaMTw8N`@;McfEXb4u6(0908IL;wH) diff --git a/mods/ra/maps/alaska-anarchy-redux.oramap b/mods/ra/maps/alaska-anarchy-redux.oramap index 5f1343b2ad2cb528db8f0b3f7cad81a412b0babb..46ae7ad629dea47337e2b1218ebfae8ec9d598df 100644 GIT binary patch delta 49 ycmaE{fbqowM&1B#W)=|!1_lm>Yl~-Xr_mi7dFOdB1L@7{JY3m9jLF~pjli^afGq%}a}o6b diff --git a/mods/ra/maps/all-connected.oramap b/mods/ra/maps/all-connected.oramap index 6fcc23e71de2e7558d32ff224e72d27b17ebb41c..7859eab2823b4eb4734e4c4a1310fc5c03441b88 100644 GIT binary patch delta 47 wcmX@>bJmA9z?+#xgn@y9gW=lZSsQuRC^7@-&3hDOSU`-)w^fb6w1Ao|0E3(nSpWb4 delta 47 wcmX@>bJmA9z?+#xgn@y9gW+j($41^Yip)TI^BzSR77%0dZB-*MEudx#0B&*+EdT%j 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 e2313073f4f39bffd7af87e03ba202c3f3ca4e57..b4842acedfb1ac260b4a35e1d457cdb11f70e6e7 100644 GIT binary patch delta 47 wcmez8_s@?vz?+#xgn@y9gW=lZSsQt+>$Qu9(5xy?Wk@G0E7_`;s5{u delta 47 wcmez8_s@?vz?+#xgn@y9gW+j($3|W&d1fHJ*-L&uJBTrvN8JcaJF43P0B+|Gwg3PC diff --git a/mods/ra/maps/asymetric-battle.oramap b/mods/ra/maps/asymetric-battle.oramap index 71c9356558fea0416e1a98192add4308d42a6c32..8b3b162c5b00ab704943dc1ff151e9a355943079 100644 GIT binary patch delta 47 wcmca#e!rYIz?+#xgn@y9gW=lZSsQtsEtrAy=3onPW)Nd?uC)=EUSw?x0EdkccmMzZ delta 47 wcmca#e!rYIz?+#xgn@y9gW+j($3|Xf3uYj_IoLv+8N`^JYi$Ik7g^f^0CHmxOaK4? diff --git a/mods/ra/maps/bad-neighbors.oramap b/mods/ra/maps/bad-neighbors.oramap index 29573a80898b3ed271e2cd79722b9ba6075a68a5..10fb9eef466ae6137c67763d682323d7c227daf0 100644 GIT binary patch delta 47 wcmX@6c}$Zxz?+#xgn@y9gW=lZSsQsL3Ni!f%?kxLFo778Lqv?gbf<_d0CF1<5C8xG delta 47 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 znnPeVx;=0T004kM000O8000000000000000)-V77ZDDXOd0}mAP)h{{000000ssO4 NYXATMY&!q|003xEU`7A{ delta 2915 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 I)c0@@#mYXATM diff --git a/mods/ra/maps/black-gold.oramap b/mods/ra/maps/black-gold.oramap index 7c7433fdd3f88d413697309f3c192250d90518be..400fbb87b60dad36c975d8795f023b0faec6b878 100644 GIT binary patch delta 47 wcmbQEG)IXyz?+#xgn@y9gW=lZSsQsfxS4_U<{8}ltRTkZRRTs}`o4fI09QQ_mH+?% delta 47 wcmbQEG)IXyz?+#xgn@y9gW+j($41@`Ze}38c?LH>D~K_9m4FeLzAs=4074TFY5)KL diff --git a/mods/ra/maps/bloody-delta.oramap b/mods/ra/maps/bloody-delta.oramap index 723fe708eed863b7c0cefabc25065c4ca5ce3ac3..5fd86e78df5889a81a3d6d21693abe63486df1e5 100644 GIT binary patch delta 47 wcmX?+bs~#5z?+#xgn@y9gW=lZSsQsRw3vbPW)H1yE)Zk#H4`H+&24H60D(slJ^%m! delta 47 wcmX?+bs~#5z?+#xgn@y9gW+j($3|WYEoLCS*+Z+F3&faw&BO>ybDP=%0Bju)5&!@I diff --git a/mods/ra/maps/bombardment-islands.oramap b/mods/ra/maps/bombardment-islands.oramap index ce867cc288e2176b6fffdcfbfd6e4555535fd205..c7ca9454b5e8ea1c787918cd4c85ad96f432c436 100644 GIT binary patch delta 47 wcmX>Qav+2^z?+#xgn@y9gW=lZSsQuF)R=+v<~B7~W)NfYIZY!l&8%e$0DA%v0{{R3 delta 47 wcmX>Qav+2^z?+#xgn@y9gW+j($41^VHD(~axlPTL8N`@;PSXfXGi%ub0A<(@*8l(j 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 c59ec337b1317e8c7dc8239683129760df0c9737..54800dbd4e914e30a61a05d17d2a952936772ff1 100644 GIT binary patch delta 47 wcmccWc-4_Nz?+#xgn@y9gW=lZSsQtu%P<4!&EI7*nL&)n$qGhbdWM260FE6J5C8xG delta 47 wcmccWc-4_Nz?+#xgn@y9gW*|p$41`gGR#1F^LLp{W)Nd?vVswqo}pk10C_w(SsQtCWtoBW=2}^IRuE(IaU~-#{YS|b0CO@Cpa1{> delta 47 wcmdn#w$qI_z?+#xgn@y9gW*|p$41^w(SsQsTOEUxM&5xy*GJ_bCyXB3*^Z|KW0G^r>zyJUM delta 47 wcmexs|JR;3z?+#xgn@y9gW*|p$41`E(#$}5^JD3y%pk_(Zh0dxeL&t80EuuBlmGw# diff --git a/mods/ra/maps/central-conflict.oramap b/mods/ra/maps/central-conflict.oramap index 0c41de0f67670f1a792b29ed4562d62139a528c9..172fe7168c251aabe416bb246e91b25078763e5a 100644 GIT binary patch delta 47 wcmbPhGS`GRz?+#xgn@y9gW>w(SsQtmi7*4{&D%siv49wpS4$d!=?9Xw0Clkv1ONa4 delta 47 wcmbPhGS`GRz?+#xgn@y9gW*|p$41^|BFsQ~^EQ!BEFi|@)sjYF`hlb^0APm@*Z=?k diff --git a/mods/ra/maps/chaos-canyon.oramap b/mods/ra/maps/chaos-canyon.oramap index 20ce5187ae1ce344abd71faf2ad5e9994b0198f9..70a6afdf3cb23c62cfc3236c974ffa89d4affe6f 100644 GIT binary patch delta 49 ycmbO{lX3D)M&1B#W)=|!1_lm>>x*Y?XVD!Sd9S%L1L@7rTrJo@jLC{VMqoP3#})vCr4Z}@ diff --git a/mods/ra/maps/chokepoint.oramap b/mods/ra/maps/chokepoint.oramap index 733ef4eb06c1c9f99377c1585f8ac74e83443ccf..eac71d53ade97fb181f0c7a836f97dd46dfa10ae 100644 GIT binary patch delta 46 vcmZ4Oy4saDz?+#xgn@y9gW>w(SqpjPnSs=10eLlM5M#2Xk`b8BQ?dmBNU;xH delta 46 ucmZ4Oy4saDz?+#xgn@y9gW*|p$3k9tW+1g$Kwga*#F%WUWCW)3lxzVr(he~I diff --git a/mods/ra/maps/coastal-influence.oramap b/mods/ra/maps/coastal-influence.oramap index 2e25edb5b40be28c6cb3b4a7cf9ec440238e08d7..6e83763da17bde26f7ad69524d5b52c8e6f840f4 100644 GIT binary patch delta 47 wcmaFn^vsDjz?+#xgn@y9gW>w(SsQutWtf5V=6abT77%0d7X>3Qt*K}W0EB!IbpQYW delta 47 wcmaFn^vsDjz?+#xgn@y9gW*|p$41_K8D=28xn8D-1;m*AMZpM6Ybx3T0B=$dNdN!< diff --git a/mods/ra/maps/contact.oramap b/mods/ra/maps/contact.oramap index 01ae000909f16bec66682c4e711a1ace75c9ddf3..5e4acfffb16829a05f63daabc254d3fb9c2a0470 100644 GIT binary patch delta 47 wcmbQOK3knPz?+#xgn@y9gW>w(SsQu3@iPPI&1?b+%pk^OO<^N29VcuH08|hUng9R* delta 47 wcmbQOK3knPz?+#xgn@y9gW*|p$41_7{LDalGn;?{Gl(%+Q`iVh#|hg406yjpZU6uP diff --git a/mods/ra/maps/convergence.oramap b/mods/ra/maps/convergence.oramap index 5de16a0d3dc9c03aae7396153b6fc6c8b0351346..4ecadfb20f6dbd03e02373da0038c7e6b43e4fdc 100644 GIT binary patch delta 47 wcmca+bj^r2z?+#xgn@y9gW>w(SsQs}#F&BfW*xDuOd!VOClW?rT2j&$0Bj`?lmGw# delta 47 wcmca+bj^r2z?+#xgn@y9gW*|p$3|WmF=imWSx0Ou6NoYSiG&fDmXx#w09N}CXaE2J diff --git a/mods/ra/maps/crossing-the-river.oramap b/mods/ra/maps/crossing-the-river.oramap index 4b70d442dcf836d290ab3549609cafbcbb8eecb2..a1a79587659477175a1de8813eaea9ce0a0c7f67 100644 GIT binary patch delta 47 wcmZotYf|G4@MdNaVPIh3V7R_`)<)j%e9S<4Gdq79Gl(&Hf{+oIJ}P7j09Sqxm;e9( delta 47 wcmZotYf|G4@MdNaVPIh3V0aeYv61&XA2X2N%+BA&3}Q^4AY=rlj|$lW076s`YybcN 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 d58a0cd02f595c67eb27695a66cb5e6e6d1425bf..db341d5b2153a52e564925562266aa1852463fc8 100644 GIT binary patch delta 47 wcmZ2wzRH|8z?+#xgn@y9gW>w(SsQt0OE3fJ&8sE4m_Url7ScvwI#=2j0Bm*;$^ZZW delta 47 wcmZ2wzRH|8z?+#xgn@y9gW*|p$41`S63jq)^Jw(SsQt))R=+v<}S4>Y#_$uL|r2=Jx$jZ0F2KP0ssI2 delta 47 wcmcZ{eL0#pz?+#xgn@y9gW*|p$41^NHD(~axl8Q|8;CJEQP&7ePt&yp0C%Mj)&Kwi 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 cbf9f4b71d91224dffd2fdd35c672a386d8a3f67..18d48c175a2acb65894c55bf97289a366093e769 100644 GIT binary patch delta 47 wcmaDW@m7L2z?+#xgn@y9gW>w(SsQspIhldwD1Od!VO-`qxE+JMIv0BUs*m;e9( delta 47 wcmaDW@m7L2z?+#xgn@y9gW*|p$3|XJPG%szS(WoL6NoYSH@6X(HsG-Z098v5YybcN diff --git a/mods/ra/maps/encounter.oramap b/mods/ra/maps/encounter.oramap index 20c94e14376bc34ddc01c9463836034e31e5faea..bbdeaee92df19c6a650d83637ba6a886785ced1b 100644 GIT binary patch delta 47 wcmca-anFJ`z?+#xgn@y9gW>w(SsQtsB$%aix7SQ diff --git a/mods/ra/maps/equal-opportunity.oramap b/mods/ra/maps/equal-opportunity.oramap index 188be385a5b93da03d90b9fc6fd223b290b3e272..8de2519344b042fc72e2fd1508dedba5c8da9a9b 100644 GIT binary patch delta 47 wcmaE_@m_;Bz?+#xgn@y9gW>w(SsQs(1et;KW)s0R diff --git a/mods/ra/maps/first-come-first-served.oramap b/mods/ra/maps/first-come-first-served.oramap index 300153808f184784b6109afd4020a11df09d89ee..80da4bd4706b48d00483477e77b3d5c4082d7001 100644 GIT binary patch delta 47 wcmX@4bx4ahz?+#xgn@y9gW>w(SsQuZ3Ni!f&3^?iFo778FNhd{X;x8N0Ej^m-v9sr delta 47 wcmX@4bx4ahz?+#xgn@y9gW*|p$41__g3LgA^IyRWOd!VO3nE5fnpM;m0CN`*vj6}9 diff --git a/mods/ra/maps/forest-path.oramap b/mods/ra/maps/forest-path.oramap index 9aed8b672698c0b0c7ead27dd775dc02ffd41bf9..13f0025ae1de4348a38d1a55808dc7efa8dda518 100644 GIT binary patch delta 47 wcmX>rcUF!!z?+#xgn@y9gW>w(SsQuzxtW3VW_j+N%pk_(+k8e~T7cgc09^7A2><{9 delta 47 wcmX>rcUF!!z?+#xgn@y9gW*|p$3|X$Ze}38S)O|*Gl((yHlGog7T~u907u9U-2eap diff --git a/mods/ra/maps/free-coasts.oramap b/mods/ra/maps/free-coasts.oramap index 225bfb6b0218d2cc7892c91f4ad68925074fbad2..019150e415fc8268ac5a3ac840c911db6cdca106 100644 GIT binary patch delta 47 wcmews{4JO_z?+#xgn@y9gW>w(SsQtmDKP`-&D)etvw;|sTQrTp^iEA%0G|sIy#N3J delta 47 wcmews{4JO_z?+#xgn@y9gW*|p$41^|O3Xld^ERc^Y#_$u7EL2Cy;IW`0EyudkpKVy diff --git a/mods/ra/maps/ghost-town.oramap b/mods/ra/maps/ghost-town.oramap index 38cb212c4e4442dcef4fdbb83b4d1e4ab035fe95..5d97d06a610fc1a7487e1726ee5af8a11a0afe11 100644 GIT binary patch delta 47 wcmZ4Hw9JV&z?+#xgn@y9gW>w(SsQuxN-_iK&1WT_uz?tpw6Z$&0D|ihegFUf delta 47 wcmZ4Hw9JV&z?+#xgn@y9gW*|p$41`0lFUGQ^I6F!Y#_$uEeb|p`lW&`0Byk$QUCw| diff --git a/mods/ra/maps/haos-ridges.oramap b/mods/ra/maps/haos-ridges.oramap index 2a28da5f1e39c6d7337d59a26baa0350faf7d5e8..798e6d466c7751219233002ea5e807ac050a5883 100644 GIT binary patch delta 47 wcmaD9`zV$-z?+#xgn@y9gW>w(SsQud)R}?w<~;TPY#_$u0zD%zy;RQ@0Fl%ZIRF3v delta 47 wcmaD9`zV$-z?+#xgn@y9gW*|p$41^bb!H&FIZypR8;CKvK+gzFFV(XJ0DP(u4FCWD diff --git a/mods/ra/maps/hasselhoff.oramap b/mods/ra/maps/hasselhoff.oramap index ecc9f2ee7d85d8d59782b62e57c779f492f7e2a0..792834f4a3d0be1a7bb935faf7df6156b37c0a55 100644 GIT binary patch delta 47 wcmZqFYt-Wn@MdNaVPIh3V7R_`)<#}AVP+t`Sx-2Q8N`^}FJ=U$kBHd<07N?v+W-In delta 47 vcmZqFYt-Wn@MdNaVPIh3V0aeYv5{9!m>EcK))S6n1~Df0iy49GBVx7yFA)x} diff --git a/mods/ra/maps/hectic.oramap b/mods/ra/maps/hectic.oramap index 74c9fad493784f5f286f7661d1423bdbc6a54074..5787f5e121dd8264dea6caa2cf64f7c748212366 100644 GIT binary patch delta 47 wcmdn(v)hL^z?+#xgn@y9gW>w(SsQuv6`6tbW_!hU77%0dNmU~-{ZG{v0B{Epg#Z8m delta 47 wcmdn(v)hL^z?+#xgn@y9gW*|p$3|X#MP?wq*4d|5LRE09xG;SpWb4 diff --git a/mods/ra/maps/high-and-low-extended.oramap b/mods/ra/maps/high-and-low-extended.oramap index ca081eff524b7a75077744c8250a2f62fa58f7a0..ff5d24458b051b4637cae5978e140c2eb78f67ef 100644 GIT binary patch delta 47 wcmX?Ga<+swz?+#xgn@y9gW>w(SsQsLm@otB%?nH{SV4@*w=Ippw1AZ@0Fx#W-~a#s delta 47 wcmX?Ga<+swz?+#xgn@y9gW*|p$41@>Cd@#3^8ynKRuE(IZA&9CEnsB}0Db%rv;Y7A diff --git a/mods/ra/maps/high-and-low.oramap b/mods/ra/maps/high-and-low.oramap index 8c204d9f96462a8a42bfd3cadfd7b528c26ce5fe..a9844bc03ac0d4fe8760f4a53f7fe7cd684957e1 100644 GIT binary patch delta 47 wcmeCz>DS>6@MdNaVPIh3V7R_`)<#}UL1rMm*-|i(1;m&DS>6@MdNaVPIh3V0aeYv5{9(kQqpCwiHZc0Wl`e6*U6Wmqcv=HV+Q> diff --git a/mods/ra/maps/island-hoppers.oramap b/mods/ra/maps/island-hoppers.oramap index 7e320000ae70dd118131ddd37d1b928f6aba1a6b..bebf02c2a8609e625138cde5fc4c6bb711fa33ea 100644 GIT binary patch delta 47 wcmbPlIp2~uz?+#xgn@y9gW>w(SsQuNB$w(SsQsp1(<>KW>tY@%pk_(bHYYonpwma09*AB_5c6? delta 47 wcmX@0aX^DNz?+#xgn@y9gW*|p$3|XJ0cIe*Syf;eGl((yoUjp?W)`sp07lCW$^ZZW diff --git a/mods/ra/maps/mad-scramble.oramap b/mods/ra/maps/mad-scramble.oramap index 372ebff689e33406c407804ed6a494b5a105b80b..cfb4997b0e9d1065c40265ce7f595cee763c2b9d 100644 GIT binary patch delta 47 wcmX>Xe=eRkz?+#xgn@y9gW>w(SsQuZX)*)p&Hpr`SwW1+G5SVedZNB90GWLfZU6uP delta 47 wcmX>Xe=eRkz?+#xgn@y9gW-8}$41_Fn#@3Y^FPgKRuE%yjJ^?=o~UmN0ED3tMgRZ+ diff --git a/mods/ra/maps/man-to-man.oramap b/mods/ra/maps/man-to-man.oramap index 752bf86dd7aed34b2ef7e6584e6b2ec5f4efaee1..97c1f0f4923f401e0a2cca8d9268dfd22030fb26 100644 GIT binary patch delta 47 wcmca0b3ukTz?+#xgn@y9gW>w(SsQtixS4_U<|6J)CJpF delta 47 wcmca0b3ukTz?+#xgn@y9gW-8}$41^HZe}38xrjTH3B;IukJkuH3-j3m08$_iJOBUy diff --git a/mods/ra/maps/marooned-2.oramap b/mods/ra/maps/marooned-2.oramap index 355ef4eab860fbc16bcd6de46da7c0ed3a3010bf..2b87ce43be1f82d305bfcfcd46e5a8e687a8fbce 100644 GIT binary patch delta 47 wcmca*bIXP|z?+#xgn@y9gW>w(SsQs5NHPQI%^M_5SwM`*FJz6tw5*&h0D*E5QUCw| delta 47 wcmca*bIXP|z?+#xgn@y9gW-8}$41@-lFUGQ^9D&%77%0d3t1yDEh}dW0Bn{JDgXcg diff --git a/mods/ra/maps/mass-confliction.oramap b/mods/ra/maps/mass-confliction.oramap index 60c24adf73341f8aa2b3eaace77a234ac25f73cd..9fdb852e972f3fd3e5ae67ccc897d00bd62088e4 100644 GIT binary patch delta 47 wcmewy^Erk$z?+#xgn@y9gW>w(SsQtoG?{_)W+BZtEFi{YMm-}iZKh`n0DpoIvH$=8 delta 47 wcmewy^Erk$z?+#xgn@y9gW-8}$3|WzO=cjySxEB@3y3k9QO^iWo9WpC0BWWWiU0rr 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 522d8a1d916c30e0b80a62d63bee41d1cfc736b1..e58cf9c219c9e351e4fd5cff661ab98e919c18ac 100644 GIT binary patch delta 49 zcmdmffob~%Cf)#VW)=|!1_lm>8;fUc=g}P-dFRbx2GX0?%@N@SF(w~fZUm-(Ew=>#wXqY$ diff --git a/mods/ra/maps/north-by-northwest.oramap b/mods/ra/maps/north-by-northwest.oramap index 3c33a9223fc295e17af5712fdea577ab25c79b73..5cea88adc31f4107c8dc15c17ab52a86614746b8 100644 GIT binary patch delta 47 wcmbQMF;{~(z?+#xgn@y9gW<;FSsQuH_?dz9W;gyM77%0dYGETV{Xp0j08#D`Y5)KL delta 47 wcmbQMF;{~(z?+#xgn@y9gW-8}$3|W=er6!O*^NJm1;m)VTG$9oKM=MB06fGGJ^%m! diff --git a/mods/ra/maps/pearly-wastelands.oramap b/mods/ra/maps/pearly-wastelands.oramap index 7e0606557bf2ef9e805154b4bfe750eecbdb2103..b5613a55c8c289cf9663d033fa0da82e6a3427ee 100644 GIT binary patch delta 47 wcmZp&YO>-D@MdNaVPIh3V7Re()<#}iDP|zO*;mSe3B;H@LB-D@MdNaVPIh3V0a$gv60tSiWx|6_LXvA0x>2}kTC+&M`dgQIS3C3 diff --git a/mods/ra/maps/pressure.oramap b/mods/ra/maps/pressure.oramap index 1407593d0bc66d4369cfa1b315f5695629136bb2..94297705719287a3f02e52da217f71197ef1a0b1 100644 GIT binary patch delta 47 wcmew!{ym&Gz?+#xgn@y9gW<;FSsQs()tQ0xW>a-v77$}{tF{rC-lc5|0D*TASpWb4 delta 47 wcmew!{ym&Gz?+#xgn@y9gW-8}$3|XNb!H&F*;L(^1;m)#s%-?OcWK)K0BlVVEdT%j diff --git a/mods/ra/maps/puddles-redux.oramap b/mods/ra/maps/puddles-redux.oramap index 437d00a4f0ad2d4efe33aae2f15c62c1d7ad3492..44b1532f51de211ae4656e6ab08ad6c1d2f21d5d 100644 GIT binary patch delta 47 wcmX>fdOnmlz?+#xgn@y9gW<;FSsQt;s4@fT%}-RzSU`-)v06r8dXknc0FuxWHUIzs delta 47 wcmX>fdOnmlz?+#xgn@y9gW-8}$41^Os?0!o^ApuF77$}{tdGg*z?+#xgn@y9gW<;FSsQu($uI-y&3v+%Y#_$uDrF-uyGg*z?+#xgn@y9gW-8}$41_NGR#1FGoNfG8;CKvO4$fZuUEDO0Cm(5i~s-t diff --git a/mods/ra/maps/ring-of-fire.oramap b/mods/ra/maps/ring-of-fire.oramap index 776b5df656c77b1215b033ea2ffff9566db5457c..cdd7e0547f88349581d1a78d01bee45e7a80f625 100644 GIT binary patch delta 47 wcmZp-Y`5eM@MdNaVPIh3V7Re()<)hSab_UBIZ1p23y3jURK^HQd&$@W08~H^+yDRo delta 47 vcmZp-Y`5eM@MdNaVPIh3V0a$gv5_}OoEb=OP7>e10%A-Sl`#U-UNW`-KNb$K diff --git a/mods/ra/maps/river-war-2.oramap b/mods/ra/maps/river-war-2.oramap index f689f7b53dd2dd1d572dca3f082ba2d6f936db74..62fab8d120a85a02e54394d326067f3ff4a607b3 100644 GIT binary patch delta 47 wcmccVdefCRz?+#xgn@y9gW<;FSsQuZ$ua}!&HrT6SU`-)=}JamdXADU0FyEjLI3~& delta 47 wcmccVdefCRz?+#xgn@y9gW-8}$41_Fvdlnw^FP@%77$}{x{?u?o}*+70DcG&761SM diff --git a/mods/ra/maps/room-warzone.oramap b/mods/ra/maps/room-warzone.oramap index e9bdbaaa01f03576b058939388ecce7d277b8124..d9ea07694102478873a16b3dba14061b529974e0 100644 GIT binary patch delta 47 wcmbQIG*5{)z?+#xgn@y9gW<;FSsQsba4`ev%?G$%vVs_s*9aJa>4yTg0B>$SE54uKRT2;>$0ETA~f&c&j delta 47 wcmaD9^C*Tlz?+#xgn@y9gCV+b>PB95HD(~a*<5WKJBTs)gRT*nR@Jiw08oDpvH$=8 diff --git a/mods/ra/maps/snowy-island.oramap b/mods/ra/maps/snowy-island.oramap index 3662e3f1d1a9cc66d6c327154ecd888c4ef790b4..4748e30b596bdbcac75433dadaee13d50e9124cb 100644 GIT binary patch delta 47 wcmcatc(0H*z?+#xgn@y9gW<;FSsQt|jF^G+W+@|oHV|WSjs;j?@8B{Pv)=%08?)doB#j- 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 97fb2fd74d75bda773b9d8bed80358b8c24237b4..22befac689e7a24c3b30fc16e849d0d8c2c30ef8 100644 GIT binary patch delta 47 wcmdlJyeF79z?+#xgn@y9gW<;FSsQs-)tG_wW>GaGW)Netm!=VzuGh2$0AGa=0{{R3 delta 47 vcmdlJyeF79z?+#xgn@y9gW-8}$3|XOHD(~aSyau48N`_ErD+7F>osiwN?Q)s diff --git a/mods/ra/maps/styrian-mountains.oramap b/mods/ra/maps/styrian-mountains.oramap index 8fcd885899e8d05d9a67cb9737bdabf502b41eb1..16e072be6c404e9d00c1ceb4cf674c76931c1989 100644 GIT binary patch delta 47 wcmaDJ_dJd_z?+#xgn@y9gW<;FSsQr|X)*)p&6hM4SV4@*U-gW@w3fat0Go#rKmY&$ delta 47 wcmaDJ_dJd_z?+#xgn@y9gW-8}$41^mn#@3Y^Ce9MRuE(IS3M&zt)*`Z0ES%=6aWAK diff --git a/mods/ra/maps/suffrage.oramap b/mods/ra/maps/suffrage.oramap index 4ea50951be754ef3cfc166cf8a14124addd65ffb..91a56b4470b1b184aeddd9b5e3f00356c9aec341 100644 GIT binary patch delta 47 wcmbPbHOq=Oz?+#xgn@y9gW<;FSsQu9q?m#9W;LmLCJdZiT^GbC~RuE(IQyn8PEv0J<0C*k{ivR!s diff --git a/mods/ra/maps/the-white-pentagon.oramap b/mods/ra/maps/the-white-pentagon.oramap index 8c2c4add39e484a7a56cf3a04cca684785c39d9c..5e4a64ce259dc17237ad050e360b220907fe472e 100644 GIT binary patch delta 47 wcmccMbHRr4J=&Fd9)SU`-)_f(C*w6K~j0E9CUV*mgE delta 47 wcmccMbHRr0B;EpHvj+t diff --git a/mods/ra/maps/tournament-island.oramap b/mods/ra/maps/tournament-island.oramap index 02f1f0ce33bc0ffc87a634984f178525ab7b4ea2..cdeced577356b5ddf8c18365acd32ced8a3a8a95 100644 GIT binary patch delta 47 wcmZ3Jxh9i0z?+#xgn@y9gW<;FSsQt^^qGP5W-I-_EFi{YD-$Cyoo`|b0C(IGEdT%j delta 47 wcmZ3Jxh9i0z?+#xgn@y9gW-8}$3|W)eP$rN*-HN}3y3k<%ESmv=bP990AjKb0RR91 diff --git a/mods/ra/maps/vegetation.oramap b/mods/ra/maps/vegetation.oramap index 2b02e347254dba56735dbae2f95e07cfd0b3c278..57b945ffb516f61922da894b8f07d8795bb968da 100644 GIT binary patch delta 47 wcmX>fb3TSQz?+#xgn@y9gW<;FSsQtK)tG_w=DBLN>>$SEySheTT1d|p0Eod6i2wiq delta 47 wcmX>fb3TSQz?+#xgn@y9gW*MV$41^>HD(~ad9Io*JBTs)uC5W77Sgi?0CVLKVE_OC diff --git a/mods/ra/maps/winter-warzone.oramap b/mods/ra/maps/winter-warzone.oramap index b79ed35f0d84cca365c9c2b4f90344f88b9d6aae..41b9176986ede414c94028f70441e10675121bc6 100644 GIT binary patch delta 47 wcmcbmc1w*nz?+#xgn@y9gW<;FSsQu1`I&+A=4k#dW)NfY3n3#gEh}sb0B#HrssI20 delta 47 wcmcbmc1w*nz?+#xgn@y9gW*MV$3|Xner6!OIhwzV8N`_ULdXbA%L>~909h~(f&c&j 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 4172632e24bc6ac692b1a9d59553aaf24d6c595e..4d29917ebea34a86642a93fec276684bb6d431d0 100644 GIT binary patch delta 45 ucmZ3$x`358z?+#xgn@y9gF$A=tckqs%s^`6^eK!Wda@pq5tvS9vIPJJ2n@3T delta 45 tcmZ3$x`358z?+#xgn@y9gFzyuVa3p)S+ 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 +