epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4407 from Mailaender/torpedo-bridges

Browse Source 
Made torpedos not travel through land, but destroy bridges
This commit is contained in:
Paul Chote
2014-01-04 01:31:58 -08:00
parent 87d544fd26 7e437c620c
commit a58c0f66cd
25 changed files with 296 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -4,6 +4,8 @@ NEW:
Added randomized tiles for Sand and Rock terrain. Added randomized tiles for Sand and Rock terrain.
Red Alert: Red Alert:
Tanya can now plant C4 on bridges. Tanya can now plant C4 on bridges.
Submarine torpedoes can now hit bridges when force fired.
Increased torpedo splash damage and raised multiplier vs. concrete.
Tiberian Dawn: Tiberian Dawn:
Commando can now plant C4 on bridges. Commando can now plant C4 on bridges.
Engine: Engine:

3
OpenRA.FileFormats/Map/TileSet.cs
View File

@@ -18,8 +18,9 @@ namespace OpenRA.FileFormats
public class TerrainTypeInfo public class TerrainTypeInfo
{ {
public string Type; public string Type;
public string[] TargetTypes = { };
public string[] AcceptsSmudgeType = { }; public string[] AcceptsSmudgeType = { };
public bool IsWater = false; public bool IsWater = false; // TODO: Remove this
public Color Color; public Color Color;
public string CustomCursor; public string CustomCursor;

13
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -105,7 +105,7 @@ namespace OpenRA.GameRules
public readonly int ROF = 1; public readonly int ROF = 1;
public readonly int Burst = 1; public readonly int Burst = 1;
public readonly bool Charges = false; public readonly bool Charges = false;
public readonly bool Underwater = false; public readonly string Palette = "effect";
public readonly string[] ValidTargets = { "Ground", "Water" }; public readonly string[] ValidTargets = { "Ground", "Water" };
public readonly string[] InvalidTargets = { }; public readonly string[] InvalidTargets = { };
public readonly int BurstDelay = 5; public readonly int BurstDelay = 5;
@@ -179,13 +179,12 @@ namespace OpenRA.GameRules
if (!world.Map.IsInMap(cell)) if (!world.Map.IsInMap(cell))
return false; return false;
if (ValidTargets.Contains("Ground") && world.GetTerrainType(cell) != "Water") var cellInfo = world.GetTerrainInfo(cell);
return true; if (!ValidTargets.Intersect(cellInfo.TargetTypes).Any()
|| InvalidTargets.Intersect(cellInfo.TargetTypes).Any())
return false;
if (ValidTargets.Contains("Water") && world.GetTerrainType(cell) == "Water") return true;
return true;
return false;
} }
return false; return false;

6
OpenRA.Game/Traits/Player/DeveloperMode.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Traits
public bool PathDebug = false; public bool PathDebug = false;
public bool UnlimitedPower; public bool UnlimitedPower;
public bool BuildAnywhere; public bool BuildAnywhere;
public bool ShowMuzzles; public bool ShowCombatGeometry;
public bool ShowDebugGeometry; public bool ShowDebugGeometry;
public object Create (ActorInitializer init) { return new DeveloperMode(this); } public object Create (ActorInitializer init) { return new DeveloperMode(this); }
@@ -37,7 +37,7 @@ namespace OpenRA.Traits
[Sync] public bool BuildAnywhere; [Sync] public bool BuildAnywhere;
// Client size only // Client size only
public bool ShowMuzzles; public bool ShowCombatGeometry;
public bool ShowDebugGeometry; public bool ShowDebugGeometry;
public DeveloperMode(DeveloperModeInfo info) public DeveloperMode(DeveloperModeInfo info)
@@ -49,7 +49,7 @@ namespace OpenRA.Traits
PathDebug = info.PathDebug; PathDebug = info.PathDebug;
UnlimitedPower = info.UnlimitedPower; UnlimitedPower = info.UnlimitedPower;
BuildAnywhere = info.BuildAnywhere; BuildAnywhere = info.BuildAnywhere;
ShowMuzzles = info.ShowMuzzles; ShowCombatGeometry = info.ShowCombatGeometry;
ShowDebugGeometry = info.ShowDebugGeometry; ShowDebugGeometry = info.ShowDebugGeometry;
} }

2
OpenRA.Mods.RA/BridgeHut.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
public bool IsValidTarget(Actor self, Actor saboteur) public bool IsValidTarget(Actor self, Actor saboteur)
{ {
return BridgeDamageState == DamageState.Undamaged; return BridgeDamageState != DamageState.Dead;
} }
public DamageState BridgeDamageState { get { return bridge.AggregateDamageState(); } } public DamageState BridgeDamageState { get { return bridge.AggregateDamageState(); } }

2
OpenRA.Mods.RA/CombatDebugOverlay.cs Executable file → Normal file
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
public void RenderAfterWorld(WorldRenderer wr, Actor self) public void RenderAfterWorld(WorldRenderer wr, Actor self)
{ {
if (devMode == null || !devMode.ShowMuzzles) if (devMode == null || !devMode.ShowCombatGeometry)
return; return;
if (health.Value != null) if (health.Value != null)

2
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -143,7 +143,7 @@ namespace OpenRA.Mods.RA.Effects
yield return r; yield return r;
} }
var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); var palette = wr.Palette(args.Weapon.Palette);
foreach (var r in anim.Render(pos, palette)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }

11
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -42,6 +42,8 @@ namespace OpenRA.Mods.RA.Effects
public readonly bool ContrailUsePlayerColor = false; public readonly bool ContrailUsePlayerColor = false;
public readonly int ContrailDelay = 1; public readonly int ContrailDelay = 1;
public readonly bool Jammable = true; public readonly bool Jammable = true;
[Desc("Explodes when leaving the following terrain type, e.g., Water for torpedoes.")]
public readonly string BoundToTerrainType = "";
public IEffect Create(ProjectileArgs args) { return new Missile(this, args); } public IEffect Create(ProjectileArgs args) { return new Missile(this, args); }
} }
@@ -153,11 +155,14 @@ namespace OpenRA.Mods.RA.Effects
if (info.ContrailLength > 0) if (info.ContrailLength > 0)
trail.Update(pos); trail.Update(pos);
var cell = pos.ToCPos();
var shouldExplode = (pos.Z < 0) // Hit the ground var shouldExplode = (pos.Z < 0) // Hit the ground
|| (dist.LengthSquared < MissileCloseEnough.Range * MissileCloseEnough.Range) // Within range || (dist.LengthSquared < MissileCloseEnough.Range * MissileCloseEnough.Range) // Within range
|| (info.RangeLimit != 0 && ticks > info.RangeLimit) // Ran out of fuel || (info.RangeLimit != 0 && ticks > info.RangeLimit) // Ran out of fuel
|| (!info.High && world.ActorMap.GetUnitsAt(pos.ToCPos()) || (!info.High && world.ActorMap.GetUnitsAt(cell)
.Any(a => a.HasTrait<IBlocksBullets>())); // Hit a wall .Any(a => a.HasTrait<IBlocksBullets>())) // Hit a wall
|| (!string.IsNullOrEmpty(info.BoundToTerrainType) && world.GetTerrainType(cell) != info.BoundToTerrainType); // Hit incompatible terrain
if (shouldExplode) if (shouldExplode)
Explode(world); Explode(world);
@@ -184,7 +189,7 @@ namespace OpenRA.Mods.RA.Effects
if (!args.SourceActor.World.FogObscures(pos.ToCPos())) if (!args.SourceActor.World.FogObscures(pos.ToCPos()))
{ {
var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); var palette = wr.Palette(args.Weapon.Palette);
foreach (var r in anim.Render(pos, palette)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }

8
OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
View File

@@ -57,11 +57,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
fastChargeCheckbox.OnClick = () => Order(world, "DevFastCharge"); fastChargeCheckbox.OnClick = () => Order(world, "DevFastCharge");
} }
var showMuzzlesCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_MUZZLES"); var showCombatCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_COMBATOVERLAY");
if (showMuzzlesCheckbox != null) if (showCombatCheckbox != null)
{ {
showMuzzlesCheckbox.IsChecked = () => devTrait.ShowMuzzles; showCombatCheckbox.IsChecked = () => devTrait.ShowCombatGeometry;
showMuzzlesCheckbox.OnClick = () => devTrait.ShowMuzzles ^= true; showCombatCheckbox.OnClick = () => devTrait.ShowCombatGeometry ^= true;
} }
var showGeometryCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_GEOMETRY"); var showGeometryCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_GEOMETRY");

29
OpenRA.Utility/UpgradeRules.cs
View File

@@ -159,6 +159,24 @@ namespace OpenRA.Utility
} }
} }
static void UpgradeTileset(int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth)
{
var parentKey = parent != null ? parent.Key.Split('@').First() : null;
List<MiniYamlNode> addNodes = new List<MiniYamlNode>();
foreach (var node in nodes)
{
if (engineVersion < 20140104)
{
if (depth == 2 && parentKey == "TerrainType" && node.Key.Split('@').First() == "Type")
addNodes.Add(new MiniYamlNode("TargetTypes", node.Value.Value == "Water" ? "Water" : "Ground"));
}
UpgradeTileset(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
nodes.AddRange(addNodes);
}
[Desc("MAP", "CURRENTENGINE", "Upgrade map rules to the latest engine version.")] [Desc("MAP", "CURRENTENGINE", "Upgrade map rules to the latest engine version.")]
public static void UpgradeMap(string[] args) public static void UpgradeMap(string[] args)
{ {
@@ -201,6 +219,17 @@ namespace OpenRA.Utility
file.WriteLine(yaml.WriteToString()); file.WriteLine(yaml.WriteToString());
} }
Console.WriteLine("Processing Tilesets:");
foreach (var filename in Game.modData.Manifest.TileSets)
{
Console.WriteLine("\t" + filename);
var yaml = MiniYaml.FromFile(filename);
UpgradeTileset(engineDate, ref yaml, null, 0);
using (var file = new StreamWriter(filename))
file.WriteLine(yaml.WriteToString());
}
Console.WriteLine("Processing Maps:"); Console.WriteLine("Processing Maps:");
foreach (var map in Game.modData.FindMaps().Values) foreach (var map in Game.modData.FindMaps().Values)
{ {

2
mods/cnc/chrome/cheats.yaml
View File

@@ -101,7 +101,7 @@ Container@CHEATS_PANEL:
Width:200 Width:200
Font:Regular Font:Regular
Text:Show A* Cost Text:Show A* Cost
Checkbox@SHOW_MUZZLES: Checkbox@SHOW_COMBATOVERLAY:
X:290 X:290
Y:235 Y:235
Height:20 Height:20

11
mods/cnc/tilesets/desert.yaml
View File

@@ -10,47 +10,58 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 134, 95, 69 Color: 134, 95, 69
TargetTypes: Ground
TerrainType@Water: TerrainType@Water:
Type: Water Type: Water
IsWater: true IsWater: true
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 93, 165, 206 Color: 93, 165, 206
TargetTypes: Water
TerrainType@Road: TerrainType@Road:
Type: Road Type: Road
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 168, 123, 83 Color: 168, 123, 83
TargetTypes: Ground
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 116, 90, 63 Color: 116, 90, 63
TargetTypes: Ground
TerrainType@Tree: TerrainType@Tree:
Type: Tree Type: Tree
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@River: TerrainType@River:
Type: River Type: River
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 111, 132, 139 Color: 111, 132, 139
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Beach: TerrainType@Beach:
Type: Beach Type: Beach
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 176, 156, 120
TargetTypes: Ground
TerrainType@Tiberium: TerrainType@Tiberium:
Type: Tiberium Type: Tiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 161, 226, 28 Color: 161, 226, 28
TargetTypes: Ground
TerrainType@BlueTiberium: TerrainType@BlueTiberium:
Type: BlueTiberium Type: BlueTiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 84, 252, 252 Color: 84, 252, 252
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:

12
mods/cnc/tilesets/snow.yaml
View File

@@ -10,47 +10,58 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 196, 196, 196 Color: 196, 196, 196
TargetTypes: Ground
TerrainType@Water: TerrainType@Water:
Type: Water Type: Water
IsWater: true IsWater: true
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 116, 164 Color: 92, 116, 164
TargetTypes: Water
TerrainType@Road: TerrainType@Road:
Type: Road Type: Road
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 88, 116, 116 Color: 88, 116, 116
TargetTypes: Ground
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Tree: TerrainType@Tree:
Type: Tree Type: Tree
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@River: TerrainType@River:
Type: River Type: River
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 140, 180 Color: 92, 140, 180
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Beach: TerrainType@Beach:
Type: Beach Type: Beach
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 176, 156, 120
TargetTypes: Ground
TerrainType@Tiberium: TerrainType@Tiberium:
Type: Tiberium Type: Tiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 161, 226, 28 Color: 161, 226, 28
TargetTypes: Ground
TerrainType@BlueTiberium: TerrainType@BlueTiberium:
Type: BlueTiberium Type: BlueTiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 84, 252, 252 Color: 84, 252, 252
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:
@@ -1321,3 +1332,4 @@ Templates:
3: Water 3: Water
4: River 4: River
6: Water 6: Water

14
mods/cnc/tilesets/temperat.yaml
View File

@@ -10,47 +10,58 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 40, 68, 40 Color: 40, 68, 40
TargetTypes: Ground
TerrainType@Water: TerrainType@Water:
Type: Water Type: Water
IsWater: true IsWater: true
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 116, 164 Color: 92, 116, 164
TargetTypes: Water
TerrainType@Road: TerrainType@Road:
Type: Road Type: Road
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 88, 116, 116 Color: 88, 116, 116
TargetTypes: Ground
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Tree: TerrainType@Tree:
Type: Tree Type: Tree
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@River: TerrainType@River:
Type: River Type: River
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 140, 180 Color: 92, 140, 180
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Beach: TerrainType@Beach:
Type: Beach Type: Beach
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 176, 156, 120
TargetTypes: Ground
TerrainType@Tiberium: TerrainType@Tiberium:
Type: Tiberium Type: Tiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 161, 226, 28 Color: 161, 226, 28
TargetTypes: Ground
TerrainType@BlueTiberium: TerrainType@BlueTiberium:
Type: BlueTiberium Type: BlueTiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 84, 252, 252 Color: 84, 252, 252
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:
@@ -1332,4 +1343,5 @@ Templates:
7: Tree 7: Tree
3: Tree 3: Tree
2: Tree 2: Tree
4: Tree 4: Tree

14
mods/cnc/tilesets/winter.yaml
View File

@@ -10,47 +10,58 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 40, 68, 40 Color: 40, 68, 40
TargetTypes: Ground
TerrainType@Water: TerrainType@Water:
Type: Water Type: Water
IsWater: true IsWater: true
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 116, 164 Color: 92, 116, 164
TargetTypes: Water
TerrainType@Road: TerrainType@Road:
Type: Road Type: Road
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 88, 116, 116 Color: 88, 116, 116
TargetTypes: Ground
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Tree: TerrainType@Tree:
Type: Tree Type: Tree
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@River: TerrainType@River:
Type: River Type: River
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 140, 180 Color: 92, 140, 180
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Beach: TerrainType@Beach:
Type: Beach Type: Beach
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 176, 156, 120
TargetTypes: Ground
TerrainType@Tiberium: TerrainType@Tiberium:
Type: Tiberium Type: Tiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 161, 226, 28 Color: 161, 226, 28
TargetTypes: Ground
TerrainType@BlueTiberium: TerrainType@BlueTiberium:
Type: BlueTiberium Type: BlueTiberium
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 84, 252, 252 Color: 84, 252, 252
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:
@@ -1326,4 +1337,5 @@ Templates:
1: River 1: River
3: Water 3: Water
4: River 4: River
6: Water 6: Water

10
mods/d2k/tilesets/arrakis.yaml
View File

@@ -9,52 +9,62 @@ Terrain:
TerrainType@Clear: # TODO: workaround for the stupid WinForms editor TerrainType@Clear: # TODO: workaround for the stupid WinForms editor
Type: Clear Type: Clear
Color: 0, 0, 0 Color: 0, 0, 0
TargetTypes: Ground
TerrainType@Sand: TerrainType@Sand:
Type: Sand Type: Sand
AcceptsSmudgeType: SandCrater AcceptsSmudgeType: SandCrater
IsWater: False IsWater: False
Color: 255,208,192,160 Color: 255,208,192,160
TargetTypes: Ground
TerrainType@Transition: TerrainType@Transition:
Type: Transition Type: Transition
AcceptsSmudgeType: AcceptsSmudgeType:
IsWater: False IsWater: False
Color: 255,207,166,100 Color: 255,207,166,100
TargetTypes: Ground
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
AcceptsSmudgeType: RockCrater AcceptsSmudgeType: RockCrater
IsWater: False IsWater: False
Color: 255,206,140,66 Color: 255,206,140,66
TargetTypes: Ground
TerrainType@Cliff: TerrainType@Cliff:
Type: Cliff Type: Cliff
AcceptsSmudgeType: AcceptsSmudgeType:
IsWater: False IsWater: False
Color: 255,74,41,16 Color: 255,74,41,16
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
AcceptsSmudgeType: AcceptsSmudgeType:
IsWater: False IsWater: False
Color: 255,88,116,116 Color: 255,88,116,116
CustomCursor: move-rough CustomCursor: move-rough
TargetTypes: Ground
TerrainType@Concrete: TerrainType@Concrete:
Type: Concrete Type: Concrete
AcceptsSmudgeType: AcceptsSmudgeType:
IsWater: False IsWater: False
Color: 255,208,192,160 Color: 255,208,192,160
TargetTypes: Ground
TerrainType@Dune: TerrainType@Dune:
Type: Dune Type: Dune
AcceptsSmudgeType: AcceptsSmudgeType:
IsWater: False IsWater: False
Color: 255,239,222,140 Color: 255,239,222,140
TargetTypes: Ground
TerrainType@Spice: TerrainType@Spice:
Type: Spice Type: Spice
AcceptsSmudgeType: AcceptsSmudgeType:
IsWater: False IsWater: False
Color: 255,239,148,74 Color: 255,239,148,74
TargetTypes: Ground
TerrainType@Ice: TerrainType@Ice:
Type: Ice Type: Ice
AcceptsSmudgeType: AcceptsSmudgeType:
IsWater: True IsWater: True
Color: 255,255,255,255 Color: 255,255,255,255
TargetTypes: Ground
Templates: Templates:
Template@0: Template@0:

2
mods/ra/chrome/cheats.yaml
View File

@@ -81,7 +81,7 @@ Background@CHEATS_PANEL:
Width:PARENT_RIGHT - 30 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Show A* Cost Text:Show A* Cost
Checkbox@SHOW_MUZZLES: Checkbox@SHOW_COMBATOVERLAY:
X:30 X:30
Y:350 Y:350
Height:20 Height:20

8
mods/ra/rules/civilian.yaml
View File

@@ -416,7 +416,7 @@ BRIDGE2:
SpawnOffset: 2,1 SpawnOffset: 2,1
SBRIDGE1: SBRIDGE1:
Inherits: ^SVBridge Inherits: ^Bridge
Bridge: Bridge:
Template: 520 Template: 520
DamagedTemplate: 521 DamagedTemplate: 521
@@ -432,7 +432,7 @@ SBRIDGE1:
SpawnOffset: 1,1 SpawnOffset: 1,1
SBRIDGE2: SBRIDGE2:
Inherits: ^SHBridge Inherits: ^Bridge
Bridge: Bridge:
Template: 531 Template: 531
DamagedTemplate: 532 DamagedTemplate: 532
@@ -448,7 +448,7 @@ SBRIDGE2:
SpawnOffset: 1,1 SpawnOffset: 1,1
SBRIDGE3: SBRIDGE3:
Inherits: ^STDBridge Inherits: ^Bridge
Bridge: Bridge:
Template: 523 Template: 523
DamagedTemplate: 524 DamagedTemplate: 524
@@ -464,7 +464,7 @@ SBRIDGE3:
SpawnOffset: 0,1 SpawnOffset: 0,1
SBRIDGE4: SBRIDGE4:
Inherits: ^STDBridge Inherits: ^Bridge
Bridge: Bridge:
Template: 527 Template: 527
DamagedTemplate: 528 DamagedTemplate: 528

56
mods/ra/rules/defaults.yaml
View File

@@ -6,6 +6,7 @@
Clear: 80 Clear: 80
Rough: 40 Rough: 40
Road: 100 Road: 100
Bridge: 100
Ore: 70 Ore: 70
Gems: 70 Gems: 70
Beach: 40 Beach: 40
@@ -53,6 +54,7 @@
Clear: 80 Clear: 80
Rough: 70 Rough: 70
Road: 100 Road: 100
Bridge: 100
Ore: 70 Ore: 70
Gems: 70 Gems: 70
Beach: 70 Beach: 70
@@ -107,6 +109,7 @@
Clear: 90 Clear: 90
Rough: 80 Rough: 80
Road: 100 Road: 100
Bridge: 100
Ore: 80 Ore: 80
Gems: 80 Gems: 80
Beach: 80 Beach: 80
@@ -459,57 +462,8 @@
HP: 1000 HP: 1000
ProximityCaptor: ProximityCaptor:
Types: Bridge Types: Bridge
AutoTargetIgnore: Armor:
BodyOrientation: Type: Concrete
LuaScriptEvents:
^SVBridge:
Tooltip:
Name: Small Bridge
BelowUnits:
TargetableBuilding:
TargetTypes: Ground, Water
Building:
Footprint: ___ ___
Dimensions: 3,2
Health:
HP: 750
ProximityCaptor:
Types: Bridge
AutoTargetIgnore:
BodyOrientation:
LuaScriptEvents:
^SHBridge:
Tooltip:
Name: Small Bridge
BelowUnits:
TargetableBuilding:
TargetTypes: Ground, Water
Building:
Footprint: __ __ __
Dimensions: 2,3
Health:
HP: 750
ProximityCaptor:
Types: Bridge
AutoTargetIgnore:
BodyOrientation:
LuaScriptEvents:
^STDBridge:
Tooltip:
Name: Small Bridge
BelowUnits:
TargetableBuilding:
TargetTypes: Ground, Water
Building:
Footprint: ____ ____
Dimensions: 4,2
Health:
HP: 750
ProximityCaptor:
Types: Bridge
AutoTargetIgnore: AutoTargetIgnore:
BodyOrientation: BodyOrientation:
LuaScriptEvents: LuaScriptEvents:

82
mods/ra/tilesets/desert.yaml
View File

@@ -13,61 +13,78 @@ Terrain:
Buildable: True Buildable: True
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 134, 95, 69 Color: 134, 95, 69
TargetTypes: Ground
TerrainType@Water: TerrainType@Water:
Type: Water Type: Water
IsWater: true IsWater: true
Buildable: False Buildable: False
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 93, 165, 206 Color: 93, 165, 206
TargetTypes: Water
TerrainType@Road: TerrainType@Road:
Type: Road Type: Road
Buildable: True Buildable: True
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 168, 123, 83 Color: 168, 123, 83
TargetTypes: Ground
TerrainType@Bridge:
Type: Bridge
AcceptsSmudgeType: Crater, Scorch
Color: 96, 96, 96
TargetTypes: Ground, Bridge
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
Buildable: False Buildable: False
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 116, 90, 63 Color: 116, 90, 63
TargetTypes: Ground
TerrainType@Tree: TerrainType@Tree:
Type: Tree Type: Tree
Buildable: False Buildable: False
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@Brush: TerrainType@Brush:
Type: Brush Type: Brush
Buildable: False Buildable: False
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@River: TerrainType@River:
Type: River Type: River
Buildable: False Buildable: False
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 111, 132, 139 Color: 111, 132, 139
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
Buildable: False Buildable: False
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
Buildable: False Buildable: False
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Beach: TerrainType@Beach:
Type: Beach Type: Beach
Buildable: False Buildable: False
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 176, 156, 120
TargetTypes: Ground
TerrainType@Ore: TerrainType@Ore:
Type: Ore Type: Ore
Buildable: False Buildable: False
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 148, 128, 96 Color: 148, 128, 96
TargetTypes: Ground
TerrainType@Gems: TerrainType@Gems:
Type: Gems Type: Gems
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 132, 112, 255 Color: 132, 112, 255
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:
@@ -2816,11 +2833,11 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
4: Road 4: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@621: Template@621:
@@ -2830,11 +2847,11 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
4: Road 4: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@622: Template@622:
@@ -2879,13 +2896,13 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
4: Rock 4: Rock
5: Rock 5: Rock
6: Road 6: Bridge
7: Road 7: Bridge
Template@625: Template@625:
Id: 625 Id: 625
Image: bridge2h Image: bridge2h
@@ -2893,13 +2910,13 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
4: Rock 4: Rock
5: Rock 5: Rock
6: Road 6: Bridge
7: Road 7: Bridge
Template@626: Template@626:
Id: 626 Id: 626
Image: bridge2d Image: bridge2d
@@ -2942,10 +2959,10 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
5: Road 5: Bridge
6: Rock 6: Rock
7: River 7: River
Template@236: Template@236:
@@ -2955,10 +2972,10 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
5: Road 5: Bridge
6: Rock 6: Rock
7: River 7: River
Template@237: Template@237:
@@ -2981,9 +2998,9 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
4: Road 4: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@239: Template@239:
@@ -2993,9 +3010,9 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
4: Road 4: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@240: Template@240:
@@ -3017,8 +3034,8 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@242: Template@242:
@@ -3028,8 +3045,8 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@243: Template@243:
@@ -3101,3 +3118,4 @@ Templates:
12: Rock 12: Rock
13: Rock 13: Rock
14: Rock 14: Rock

34
mods/ra/tilesets/interior.yaml
View File

@@ -9,47 +9,27 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 0, 0, 0 Color: 0, 0, 0
TerrainType@Water: TargetTypes: Ground
Type: Water TerrainType@Tree: # and Boxes
IsWater: true
AcceptsSmudgeType:
Color: 92, 116, 164
TerrainType@Road:
Type: Road
AcceptsSmudgeType: Crater, Scorch
Color: 88, 116, 116
TerrainType@Rock:
Type: Rock
AcceptsSmudgeType:
Color: 68, 68, 60
TerrainType@Tree:
Type: Tree Type: Tree
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TerrainType@River: TargetTypes: Ground
Type: River
AcceptsSmudgeType:
Color: 92, 140, 180
TerrainType@Rough:
Type: Rough
AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160
TerrainType@Beach:
Type: Beach
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Ore: TerrainType@Ore:
Type: Ore Type: Ore
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 148, 128, 96 Color: 148, 128, 96
TargetTypes: Ground
TerrainType@Gems: TerrainType@Gems:
Type: Gems Type: Gems
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 132, 112, 255 Color: 132, 112, 255
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:

57
mods/ra/tilesets/snow.yaml
View File

@@ -10,47 +10,63 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 196, 196, 196 Color: 196, 196, 196
TargetTypes: Ground
TerrainType@Water: TerrainType@Water:
Type: Water Type: Water
IsWater: true IsWater: true
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 116, 164 Color: 92, 116, 164
TargetTypes: Water
TerrainType@Road: TerrainType@Road:
Type: Road Type: Road
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 88, 116, 116 Color: 88, 116, 116
TargetTypes: Ground
TerrainType@Bridge:
Type: Bridge
AcceptsSmudgeType: Crater, Scorch
Color: 96, 96, 96
TargetTypes: Ground, Bridge
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Tree: TerrainType@Tree:
Type: Tree Type: Tree
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@River: TerrainType@River:
Type: River Type: River
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 140, 180 Color: 92, 140, 180
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Beach: TerrainType@Beach:
Type: Beach Type: Beach
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 176, 156, 120
TargetTypes: Ground
TerrainType@Ore: TerrainType@Ore:
Type: Ore Type: Ore
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 148, 128, 96 Color: 148, 128, 96
TargetTypes: Ground
TerrainType@Gems: TerrainType@Gems:
Type: Gems Type: Gems
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 132, 112, 255 Color: 132, 112, 255
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:
@@ -2487,12 +2503,12 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
1: Rock 1: Rock
2: Road 2: Bridge
4: Rock 4: Rock
5: Road 5: Bridge
6: Road 6: Bridge
7: Rock 7: Rock
9: Road 9: Bridge
10: Rock 10: Rock
11: Rock 11: Rock
Template@236: Template@236:
@@ -2532,13 +2548,13 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
1: Rock 1: Rock
2: Road 2: Bridge
5: Rock 5: Rock
6: Road 6: Bridge
7: Road 7: Bridge
8: Rock 8: Rock
9: Rock 9: Rock
11: Road 11: Bridge
12: Rock 12: Rock
13: Rock 13: Rock
Template@239: Template@239:
@@ -2580,8 +2596,8 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@242: Template@242:
@@ -2591,8 +2607,8 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@243: Template@243:
@@ -2665,12 +2681,12 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
1: Rock 1: Rock
2: Road 2: Bridge
3: Road 3: Bridge
4: Rock 4: Rock
5: Rock 5: Rock
6: Road 6: Bridge
7: Road 7: Bridge
8: Rock 8: Rock
9: Rock 9: Rock
12: Rock 12: Rock
@@ -2727,13 +2743,13 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
5: Rock 5: Rock
6: Rock 6: Rock
7: Road 7: Bridge
8: Road 8: Bridge
9: Rock 9: Rock
Template@134: Template@134:
Id: 134 Id: 134
@@ -3137,3 +3153,4 @@ Templates:
Tiles: Tiles:
0: Rock 0: Rock
1: Rock 1: Rock

99
mods/ra/tilesets/temperat.yaml
View File

@@ -10,47 +10,63 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 40, 68, 40 Color: 40, 68, 40
TargetTypes: Ground
TerrainType@Water: TerrainType@Water:
Type: Water Type: Water
IsWater: true IsWater: true
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 116, 164 Color: 92, 116, 164
TargetTypes: Water
TerrainType@Road: TerrainType@Road:
Type: Road Type: Road
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 88, 116, 116 Color: 94, 67, 13
TargetTypes: Ground
TerrainType@Bridge:
Type: Bridge
AcceptsSmudgeType: Crater, Scorch
Color: 96, 96, 96
TargetTypes: Ground, Bridge
TerrainType@Rock: TerrainType@Rock:
Type: Rock Type: Rock
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Tree: TerrainType@Tree:
Type: Tree Type: Tree
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 28, 32, 36 Color: 28, 32, 36
TargetTypes: Ground
TerrainType@River: TerrainType@River:
Type: River Type: River
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 92, 140, 180 Color: 92, 140, 180
TargetTypes: Ground
TerrainType@Rough: TerrainType@Rough:
Type: Rough Type: Rough
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 68, 68, 60 Color: 68, 68, 60
TargetTypes: Ground
TerrainType@Wall: TerrainType@Wall:
Type: Wall Type: Wall
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 208, 192, 160 Color: 208, 192, 160
TargetTypes: Ground
TerrainType@Beach: TerrainType@Beach:
Type: Beach Type: Beach
AcceptsSmudgeType: AcceptsSmudgeType:
Color: 176, 156, 120 Color: 176, 156, 120
TargetTypes: Ground
TerrainType@Ore: TerrainType@Ore:
Type: Ore Type: Ore
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 148, 128, 96 Color: 148, 128, 96
TargetTypes: Ground
TerrainType@Gems: TerrainType@Gems:
Type: Gems Type: Gems
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 132, 112, 255 Color: 132, 112, 255
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:
@@ -2489,12 +2505,12 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
1: Rock 1: Rock
2: Road 2: Bridge
4: Rock 4: Rock
5: Road 5: Bridge
6: Road 6: Bridge
7: Rock 7: Rock
9: Road 9: Bridge
10: Rock 10: Rock
11: Rock 11: Rock
Template@236: Template@236:
@@ -2534,13 +2550,13 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
1: Rock 1: Rock
2: Road 2: Bridge
5: Rock 5: Rock
6: Road 6: Bridge
7: Road 7: Bridge
8: Rock 8: Rock
9: Rock 9: Rock
11: Road 11: Bridge
12: Rock 12: Rock
13: Rock 13: Rock
Template@239: Template@239:
@@ -2582,8 +2598,8 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@242: Template@242:
@@ -2593,8 +2609,8 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
5: Road 5: Bridge
6: Rock 6: Rock
7: Rock 7: Rock
Template@243: Template@243:
@@ -2667,12 +2683,12 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
1: Rock 1: Rock
2: Road 2: Bridge
3: Road 3: Bridge
4: Rock 4: Rock
5: Rock 5: Rock
6: Road 6: Bridge
7: Road 7: Bridge
8: Rock 8: Rock
9: Rock 9: Rock
12: Rock 12: Rock
@@ -2715,11 +2731,11 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
2: Clear 2: Clear
3: Road 3: Bridge
4: Road 4: Bridge
5: Rock 5: Rock
15: Road 15: Bridge
16: Road 16: Bridge
18: Rock 18: Rock
19: Rock 19: Rock
Template@133: Template@133:
@@ -2729,13 +2745,13 @@ Templates:
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Rock 0: Rock
1: Road 1: Bridge
2: Road 2: Bridge
3: Rock 3: Rock
5: Rock 5: Rock
6: Rock 6: Rock
7: Road 7: Bridge
8: Road 8: Bridge
9: Rock 9: Rock
Template@134: Template@134:
Id: 134 Id: 134
@@ -2773,8 +2789,8 @@ Templates:
Size: 5,5 Size: 5,5
Category: Bridge Category: Bridge
Tiles: Tiles:
0: Road 0: Bridge
1: Road 1: Bridge
2: Rough 2: Rough
3: Clear 3: Clear
4: Rough 4: Rough
@@ -2782,10 +2798,10 @@ Templates:
15: Rock 15: Rock
16: Rock 16: Rock
17: Rough 17: Rough
18: Road 18: Bridge
19: Road 19: Bridge
23: Road 23: Bridge
24: Road 24: Bridge
Template@247: Template@247:
Id: 247 Id: 247
Image: f01 Image: f01
@@ -3221,7 +3237,7 @@ Templates:
0: River 0: River
1: Road 1: Road
2: River 2: River
3: River 3: River
4: Road 4: Road
5: River 5: River
Category: Bridge Category: Bridge
@@ -3233,7 +3249,7 @@ Templates:
0: River 0: River
1: Road 1: Road
2: River 2: River
3: River 3: River
4: Road 4: Road
5: River 5: River
Category: Bridge Category: Bridge
@@ -3245,7 +3261,7 @@ Templates:
0: River 0: River
1: Rock 1: Rock
2: River 2: River
3: River 3: River
4: Rock 4: Rock
5: River 5: River
Category: Bridge Category: Bridge
@@ -3341,7 +3357,7 @@ Templates:
6: Rock 6: Rock
7: Rock 7: Rock
Category: Bridge Category: Bridge
Template@530 Template@530:
Id: 530 Id: 530
Image: sbridge4x Image: sbridge4x
Size: 5,5 Size: 5,5
@@ -3361,7 +3377,7 @@ Templates:
23: Clear 23: Clear
24: Road 24: Road
Category: Bridge Category: Bridge
Template@531 Template@531:
Id: 531 Id: 531
Image: sbridge2 Image: sbridge2
Size: 2,3 Size: 2,3
@@ -3373,7 +3389,7 @@ Templates:
4: Rock 4: Rock
5: Rock 5: Rock
Category: Bridge Category: Bridge
Template@532 Template@532:
Id: 532 Id: 532
Image: sbridge2h Image: sbridge2h
Size: 2,3 Size: 2,3
@@ -3385,7 +3401,7 @@ Templates:
4: Rock 4: Rock
5: Rock 5: Rock
Category: Bridge Category: Bridge
Template@533 Template@533:
Id: 533 Id: 533
Image: sbridge2d Image: sbridge2d
Size: 2,3 Size: 2,3
@@ -3397,7 +3413,7 @@ Templates:
4: River 4: River
5: River 5: River
Category: Bridge Category: Bridge
Template@534 Template@534:
Id: 534 Id: 534
Image: sbridge2x Image: sbridge2x
Size: 4,4 Size: 4,4
@@ -3529,7 +3545,7 @@ Templates:
Size: 1,1 Size: 1,1
Tiles: Tiles:
0: Rough 0: Rough
Category: Debris Category: Debris
Template@583: Template@583:
Id: 583 Id: 583
Image: decc Image: decc
@@ -3599,4 +3615,5 @@ Templates:
3: Rough 3: Rough
4: Rough 4: Rough
5: Clear 5: Clear
Category: Debris Category: Debris

26
mods/ra/weapons.yaml
View File

@@ -120,7 +120,7 @@ Maverick:
Report: MISSILE7.AUD Report: MISSILE7.AUD
Burst: 2 Burst: 2
BurstDelay: 7 BurstDelay: 7
ValidTargets: Ground ValidTargets: Ground, Water
Projectile: Missile Projectile: Missile
Speed: 256 Speed: 256
Arm: 2 Arm: 2
@@ -277,7 +277,7 @@ Dragon:
ROF: 50 ROF: 50
Range: 5c0 Range: 5c0
Report: MISSILE6.AUD Report: MISSILE6.AUD
ValidTargets: Ground ValidTargets: Ground, Water
Projectile: Missile Projectile: Missile
Speed: 213 Speed: 213
Arm: 2 Arm: 2
@@ -310,7 +310,7 @@ HellfireAG:
Report: MISSILE6.AUD Report: MISSILE6.AUD
Burst: 2 Burst: 2
BurstDelay: 10 BurstDelay: 10
ValidTargets: Ground ValidTargets: Ground, Water
Projectile: Missile Projectile: Missile
Speed: 256 Speed: 256
Arm: 2 Arm: 2
@@ -508,7 +508,7 @@ MammothTusk:
Range: 8c0 Range: 8c0
Report: MISSILE6.AUD Report: MISSILE6.AUD
Burst: 2 Burst: 2
ValidTargets: Ground, Air ValidTargets: Air, Ground, Water
Projectile: Missile Projectile: Missile
Speed: 341 Speed: 341
Arm: 2 Arm: 2
@@ -789,7 +789,7 @@ Stinger:
Report: MISSILE6.AUD Report: MISSILE6.AUD
Burst: 2 Burst: 2
BurstDelay: 0 BurstDelay: 0
ValidTargets: Ground, Air ValidTargets: Air, Ground, Water
Projectile: Missile Projectile: Missile
Arm: 3 Arm: 3
High: true High: true
@@ -819,8 +819,8 @@ TorpTube:
ROF: 100 ROF: 100
Range: 9c0 Range: 9c0
Report: TORPEDO1.AUD Report: TORPEDO1.AUD
ValidTargets: Water, Underwater ValidTargets: Water, Underwater, Bridge
Underwater: yes Palette: shadow
Burst: 2 Burst: 2
BurstDelay: 20 BurstDelay: 20
Projectile: Missile Projectile: Missile
@@ -830,15 +830,18 @@ TorpTube:
Trail: bubbles Trail: bubbles
ROT: 1 ROT: 1
RangeLimit: 160 RangeLimit: 160
BoundToTerrainType: Water
Warhead: Warhead:
Spread: 128 Spread: 426
Versus: Versus:
None: 30% None: 30%
Wood: 75% Wood: 75%
Light: 75% Light: 75%
Concrete: 50% Concrete: 500%
WaterExplosion: large_splash WaterExplosion: large_splash
WaterImpactSound: splash9.aud WaterImpactSound: splash9.aud
Explosion: large_explosion
ImpactSound: kaboom12.aud
InfDeath: 4 InfDeath: 4
SmudgeType: Crater SmudgeType: Crater
Damage: 180 Damage: 180
@@ -1207,7 +1210,7 @@ FLAK-23:
ROF: 10 ROF: 10
Range: 8c0 Range: 8c0
Report: AACANON3.AUD Report: AACANON3.AUD
ValidTargets: Air,Ground ValidTargets: Air, Ground, Water
Projectile: Bullet Projectile: Bullet
Speed: 1c682 Speed: 1c682
High: true High: true
@@ -1220,6 +1223,7 @@ FLAK-23:
Heavy: 10% Heavy: 10%
Concrete: 20% Concrete: 20%
Explosion: small_explosion_air Explosion: small_explosion_air
WaterExplosion: small_splash
Damage: 20 Damage: 20
Sniper: Sniper:
@@ -1243,7 +1247,7 @@ ChronoTusk:
ROF: 60 ROF: 60
Range: 6c0 Range: 6c0
Report: MISSILE6.AUD Report: MISSILE6.AUD
ValidTargets: Ground ValidTargets: Ground, Water
Projectile: Missile Projectile: Missile
Speed: 298 Speed: 298
Arm: 2 Arm: 2

2
mods/ts/tilesets/interior.yaml
View File

@@ -9,6 +9,7 @@ Terrain:
Type: Clear Type: Clear
AcceptsSmudgeType: Crater, Scorch AcceptsSmudgeType: Crater, Scorch
Color: 0, 0, 0 Color: 0, 0, 0
TargetTypes: Ground
Templates: Templates:
Template@255: Template@255:
@@ -17,3 +18,4 @@ Templates:
Size: 1,1 Size: 1,1
Tiles: Tiles:
0: Clear 0: Clear