From d3915ad2919b45e3f2e55eae7ea3b65047adcfa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 25 Jun 2012 21:16:31 +0200 Subject: [PATCH] string AcceptsSmudgeType replaces boolean AcceptSmudge because Dune 2000 has different craters for rock and sand --- OpenRA.FileFormats/Map/TileSet.cs | 2 +- OpenRA.Game/GameRules/WeaponInfo.cs | 2 +- OpenRA.Mods.RA/Combat.cs | 9 +++-- OpenRA.Mods.RA/World/SmudgeLayer.cs | 3 -- OpenRA.TilesetBuilder/defaults.yaml | 51 +++++++++++++++---------- doc/cnc extracted inirules link.txt | 1 + doc/progress.txt | 59 ----------------------------- mods/cnc/tilesets/desert.yaml | 22 +++++------ mods/cnc/tilesets/temperat.yaml | 22 +++++------ mods/cnc/tilesets/winter.yaml | 22 +++++------ mods/d2k/TODO | 4 +- mods/d2k/rules/system.yaml | 12 ++++-- mods/d2k/sequences.yaml | 6 +-- mods/d2k/tilesets/arrakis.yaml | 20 +++++----- mods/d2k/weapons.yaml | 22 +++++------ mods/ra/tilesets/interior.yaml | 20 +++++----- mods/ra/tilesets/snow.yaml | 20 +++++----- mods/ra/tilesets/temperat.yaml | 20 +++++----- 18 files changed, 135 insertions(+), 182 deletions(-) create mode 100644 doc/cnc extracted inirules link.txt delete mode 100644 doc/progress.txt diff --git a/OpenRA.FileFormats/Map/TileSet.cs b/OpenRA.FileFormats/Map/TileSet.cs index c4fd1b1d4c..4578605e2f 100644 --- a/OpenRA.FileFormats/Map/TileSet.cs +++ b/OpenRA.FileFormats/Map/TileSet.cs @@ -20,7 +20,7 @@ namespace OpenRA.FileFormats public class TerrainTypeInfo { public string Type; - public bool AcceptSmudge = true; + public string[] AcceptsSmudgeType = { }; public bool IsWater = false; public Color Color; diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index 5a331cde61..1bc07ecd42 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -24,7 +24,7 @@ namespace OpenRA.GameRules public readonly bool Ore = false; // can this damage ore? public readonly string Explosion = null; // explosion effect to use public readonly string WaterExplosion = null; // explosion effect on hitting water (usually a splash) - public readonly string SmudgeType = null; // type of smudge to apply + public readonly string[] SmudgeType = { }; // type of smudge to apply public readonly int[] Size = { 0, 0 }; // size of the explosion. provide 2 values for a ring effect (outer/inner) public readonly int InfDeath = 0; // infantry death animation to use public readonly string ImpactSound = null; // sound to play on impact diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs index bbb9922a30..2add8aeab5 100755 --- a/OpenRA.Mods.RA/Combat.cs +++ b/OpenRA.Mods.RA/Combat.cs @@ -48,12 +48,15 @@ namespace OpenRA.Mods.RA Sound.Play(GetImpactSound(warhead, isWater), args.dest); - if (warhead.SmudgeType != null) + var smudgeType = world.GetTerrainInfo(targetTile).AcceptsSmudgeType + .FirstOrDefault(t => warhead.SmudgeType.Contains(t)); + + if (smudgeType != null) { var smudgeLayer = world.WorldActor.TraitsImplementing() - .FirstOrDefault(x => x.Info.Type == warhead.SmudgeType); + .FirstOrDefault(x => x.Info.Type == smudgeType); if (smudgeLayer == null) - throw new NotImplementedException("Unknown smudge type `{0}`".F(warhead.SmudgeType)); + throw new NotImplementedException("Unknown smudge type `{0}`".F(smudgeType)); if (warhead.Size[0] > 0) { diff --git a/OpenRA.Mods.RA/World/SmudgeLayer.cs b/OpenRA.Mods.RA/World/SmudgeLayer.cs index 134eec097a..9dce0ce445 100755 --- a/OpenRA.Mods.RA/World/SmudgeLayer.cs +++ b/OpenRA.Mods.RA/World/SmudgeLayer.cs @@ -54,9 +54,6 @@ namespace OpenRA.Mods.RA public void AddSmudge(CPos loc) { - if (!world.GetTerrainInfo(loc).AcceptSmudge) - return; - if (Game.CosmeticRandom.Next(0,100) <= Info.SmokePercentage) world.AddFrameEndTask(w => w.Add(new Smoke(w, Traits.Util.CenterOfCell(loc), Info.SmokeType))); diff --git a/OpenRA.TilesetBuilder/defaults.yaml b/OpenRA.TilesetBuilder/defaults.yaml index 52dc516596..e40a479561 100644 --- a/OpenRA.TilesetBuilder/defaults.yaml +++ b/OpenRA.TilesetBuilder/defaults.yaml @@ -1,42 +1,51 @@ Terrain: TerrainType@Sand: Type: Sand - AcceptSmudge: True - Color: 208, 192, 160 + AcceptsSmudgeType: SandCrater + IsWater: False + Color: 255,208,192,160 TerrainType@Transition: Type: Transition - AcceptSmudge: True - Color: 207, 166, 100 + AcceptsSmudgeType: none + IsWater: False + Color: 255,207,166,100 TerrainType@Rock: Type: Rock - AcceptSmudge: True - Color: 206, 140, 66 + AcceptsSmudgeType: RockCrater + IsWater: False + Color: 255,206,140,66 TerrainType@Cliff: Type: Cliff - AcceptSmudge: False - Color: 74, 41, 16 + AcceptsSmudgeType: none + IsWater: False + Color: 255,74,41,16 TerrainType@Rough: Type: Rough - AcceptSmudge: True - Color: 88, 116, 116 + AcceptsSmudgeType: none + IsWater: False + Color: 255,88,116,116 TerrainType@Concrete: Type: Concrete - AcceptSmudge: False - Color: 208, 192, 160 + AcceptsSmudgeType: none + IsWater: False + Color: 255,208,192,160 TerrainType@Dune: Type: Dune - AcceptSmudge: True - Color: 239, 222, 140 + AcceptsSmudgeType: none + IsWater: False + Color: 255,239,222,140 TerrainType@Spice: Type: Spice - AcceptSmudge: False - Color: 239, 148, 74 + AcceptsSmudgeType: none + IsWater: False + Color: 255,239,148,74 TerrainType@SpiceBlobs: Type: SpiceBlobs - AcceptSmudge: False - Color: 206, 115, 66 + AcceptsSmudgeType: none + IsWater: False + Color: 255,206,115,66 TerrainType@Ice: Type: Ice - AcceptSmudge: False - Color: 255, 255, 255 - IsWater: True \ No newline at end of file + AcceptsSmudgeType: none + IsWater: True + Color: 255,255,255,255 \ No newline at end of file diff --git a/doc/cnc extracted inirules link.txt b/doc/cnc extracted inirules link.txt new file mode 100644 index 0000000000..84788a199d --- /dev/null +++ b/doc/cnc extracted inirules link.txt @@ -0,0 +1 @@ +http://nyerguds.arsaneus-design.com/cnc95upd/inirules/ diff --git a/doc/progress.txt b/doc/progress.txt deleted file mode 100644 index 435572f9a1..0000000000 --- a/doc/progress.txt +++ /dev/null @@ -1,59 +0,0 @@ - -Ground Units: - -All Infantry No idle animations -E1 Works -E2 Grenades are too accurate. -E3 Works -E4 Works -E6 Works -E7 Works -MEDI Works -SPY Infiltrate action missing -THF Works -C1,C2,Einstein,Kosygin Not implemented - -All tracked vehicles -1TNK Works -2TNK Works -3TNK Works -4TNK Works - -Light vehicles -V2RL Works -APC Works -MNLY Works -MGG Works -MRJ Works -JEEP Works -MCV Works -HARV Works -ARTY Works - -Helicopters -TRAN Works -HELI Works -HIND Works - -Planes - - Ammo/ROF are funky -YAK Works -MIG Works - - -Ships -CA Works -SS Works -DD depth charges don't work -PT depth charges don't work -LST Works - -Aftermath Units: -STNK Stealth effect looks wrong (turret alpha stacking) -CTNK Missile origins are wrong -TTNK Works -DTRK Attack doesn't work; Scorches wrong -QTNK No weapon -MSUB Works -SHOK Works -MECH Cannot enter transports \ No newline at end of file diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml index b8314c4b3b..880e59b9e4 100644 --- a/mods/cnc/tilesets/desert.yaml +++ b/mods/cnc/tilesets/desert.yaml @@ -7,48 +7,48 @@ General: Terrain: TerrainType@Clear: Type: Clear - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 134, 95, 69 TerrainType@Water: Type: Water IsWater: true - AcceptSmudge: False + AcceptsSmudgeType: Color: 93, 165, 206 TerrainType@Road: Type: Road - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 168, 123, 83 TerrainType@Rock: Type: Rock - AcceptSmudge: False + AcceptsSmudgeType: Color: 116, 90, 63 TerrainType@Tree: Type: Tree - AcceptSmudge: False + AcceptsSmudgeType: Color: 28, 32, 36 TerrainType@River: Type: River - AcceptSmudge: False + AcceptsSmudgeType: Color: 111, 132, 139 TerrainType@Rough: Type: Rough - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 TerrainType@Wall: Type: Wall - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 TerrainType@Beach: Type: Beach - AcceptSmudge: False + AcceptsSmudgeType: Color: 176, 156, 120 TerrainType@Tiberium: Type: Tiberium - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 161, 226, 28 TerrainType@BlueTiberium: Type: BlueTiberium - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 84, 252, 252 Templates: diff --git a/mods/cnc/tilesets/temperat.yaml b/mods/cnc/tilesets/temperat.yaml index d38917bdc3..217fac9d02 100644 --- a/mods/cnc/tilesets/temperat.yaml +++ b/mods/cnc/tilesets/temperat.yaml @@ -7,48 +7,48 @@ General: Terrain: TerrainType@Clear: Type: Clear - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 40, 68, 40 TerrainType@Water: Type: Water IsWater: true - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 116, 164 TerrainType@Road: Type: Road - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 TerrainType@Rock: Type: Rock - AcceptSmudge: False + AcceptsSmudgeType: Color: 68, 68, 60 TerrainType@Tree: Type: Tree - AcceptSmudge: False + AcceptsSmudgeType: Color: 28, 32, 36 TerrainType@River: Type: River - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 140, 180 TerrainType@Rough: Type: Rough - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 TerrainType@Wall: Type: Wall - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 TerrainType@Beach: Type: Beach - AcceptSmudge: False + AcceptsSmudgeType: Color: 176, 156, 120 TerrainType@Tiberium: Type: Tiberium - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 161, 226, 28 TerrainType@BlueTiberium: Type: BlueTiberium - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 84, 252, 252 Templates: diff --git a/mods/cnc/tilesets/winter.yaml b/mods/cnc/tilesets/winter.yaml index 233e65d54c..cc3d5b806d 100644 --- a/mods/cnc/tilesets/winter.yaml +++ b/mods/cnc/tilesets/winter.yaml @@ -7,48 +7,48 @@ General: Terrain: TerrainType@Clear: Type: Clear - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 40, 68, 40 TerrainType@Water: Type: Water IsWater: true - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 116, 164 TerrainType@Road: Type: Road - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 TerrainType@Rock: Type: Rock - AcceptSmudge: False + AcceptsSmudgeType: Color: 68, 68, 60 TerrainType@Tree: Type: Tree - AcceptSmudge: False + AcceptsSmudgeType: Color: 28, 32, 36 TerrainType@River: Type: River - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 140, 180 TerrainType@Rough: Type: Rough - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 TerrainType@Wall: Type: Wall - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 TerrainType@Beach: Type: Beach - AcceptSmudge: False + AcceptsSmudgeType: Color: 176, 156, 120 TerrainType@Tiberium: Type: Tiberium - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 161, 226, 28 TerrainType@BlueTiberium: Type: BlueTiberium - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 84, 252, 252 Templates: diff --git a/mods/d2k/TODO b/mods/d2k/TODO index f87ffe6e06..9dbbaa1234 100644 --- a/mods/d2k/TODO +++ b/mods/d2k/TODO @@ -28,11 +28,9 @@ # add sonic tank weapon (currently uses tesla) # make deviator change the allegiance of ememy units (currently shoots rockets) # starport prices should vary -# fix shroud, currently falls back to 24x24 shadow from RA (Dune's 32x32 tiles differ completely from RA/CnC) # black spots on buildings should be fading team colors # gamefile extraction (setup/setup.z) from CD fails # support patch 1.06 gamefiles: DATA.R8 has more frames and currently fails to extract, also featuring new terrain with white houses and new unit: grenade thrower # infantry-only areas (Rough) do not show the dark-green mouse cursor # put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI) -# group number metrics are off, should use DrawText not pips SHP -# AcceptSmudges should be a string and not a boolean or array to seperate SmudgeTypes \ No newline at end of file +# group number metrics are off, should use DrawText not pips SHP \ No newline at end of file diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index c4edbf2525..daf5fc9110 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -159,10 +159,14 @@ World: PipColor: Green AllowedTerrainTypes: Sand AllowUnderActors: false - SmudgeLayer@CRATER: - Type:Crater - Types:rockcrater1,rockcrater2,sandcrater1,sandcrater2 - Depths:15,15,15,15 + SmudgeLayer@rock: + Type:RockCrater + Types:rockcrater1,rockcrater2 + Depths:15,15 + SmudgeLayer@sand: + Type:SandCrater + Types:sandcrater1,sandcrater2 + Depths:15,15 SpawnMapActors: CreateMPPlayers: MPStartLocations: diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml index 4870c180c3..7705cc0334 100644 --- a/mods/d2k/sequences.yaml +++ b/mods/d2k/sequences.yaml @@ -914,20 +914,20 @@ pips: groups: numbers Start: 0 Length: 10 - tag-primary: greenuparrow + tag-primary: stars Start: 0 pip-empty: dots Start: 0 pip-green: dots Start: 1 -#falls back to RA, but look ok +#falls back to RA, but looks ok clock: idle: Start: 0 Length: * -#falls back to RA, but look ok +#falls back to RA, but looks ok powerdown: disabled: speed Start: 3 diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 06e20cc11b..355f682020 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -8,52 +8,52 @@ General: Terrain: TerrainType@Sand: Type: Sand - AcceptSmudge: True + AcceptsSmudgeType: SandCrater IsWater: False Color: 255,208,192,160 TerrainType@Transition: Type: Transition - AcceptSmudge: True + AcceptsSmudgeType: IsWater: False Color: 255,207,166,100 TerrainType@Rock: Type: Rock - AcceptSmudge: True + AcceptsSmudgeType: RockCrater IsWater: False Color: 255,206,140,66 TerrainType@Cliff: Type: Cliff - AcceptSmudge: False + AcceptsSmudgeType: IsWater: False Color: 255,74,41,16 TerrainType@Rough: Type: Rough - AcceptSmudge: True + AcceptsSmudgeType: IsWater: False Color: 255,88,116,116 TerrainType@Concrete: Type: Concrete - AcceptSmudge: False + AcceptsSmudgeType: IsWater: False Color: 255,208,192,160 TerrainType@Dune: Type: Dune - AcceptSmudge: True + AcceptsSmudgeType: IsWater: False Color: 255,239,222,140 TerrainType@Spice: Type: Spice - AcceptSmudge: False + AcceptsSmudgeType: IsWater: False Color: 255,239,148,74 TerrainType@SpiceBlobs: Type: SpiceBlobs - AcceptSmudge: False + AcceptsSmudgeType: IsWater: False Color: 255,206,115,66 TerrainType@Ice: Type: Ice - AcceptSmudge: False + AcceptsSmudgeType: IsWater: True Color: 255,255,255,255 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 3b80ad5936..a1ba692d4d 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -42,7 +42,7 @@ Dragon: Explosion: med_explosion WaterExplosion: med_splash InfDeath: 3 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 50 ImpactSound: kaboom12 @@ -75,7 +75,7 @@ QuadRockets: Explosion: med_explosion WaterExplosion: med_splash ImpactSound: kaboom12 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 35 TurretGun: @@ -95,7 +95,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 60 25mm: @@ -115,7 +115,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 16 90mm: @@ -135,7 +135,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 30 105mm: @@ -157,7 +157,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 40 120mm: @@ -178,7 +178,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 50 227mm: @@ -210,7 +210,7 @@ TurretGun: Explosion: med_explosion WaterExplosion: med_splash ImpactSound: kaboom12 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 25 #for rocket turret @@ -242,7 +242,7 @@ MammothTusk: Explosion: med_explosion WaterExplosion: med_splash InfDeath: 2 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 45 155mm: @@ -268,7 +268,7 @@ MammothTusk: Explosion: large_explosion WaterExplosion: med_splash InfDeath: 2 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 220 TTankZap: @@ -464,7 +464,7 @@ RedEye: Heavy: 25% Explosion: med_explosion InfDeath: 2 - SmudgeType: Crater + SmudgeType: SandCrater, RockCrater Damage: 40 Sniper: diff --git a/mods/ra/tilesets/interior.yaml b/mods/ra/tilesets/interior.yaml index 26f2c22f77..adcfb562da 100644 --- a/mods/ra/tilesets/interior.yaml +++ b/mods/ra/tilesets/interior.yaml @@ -7,44 +7,44 @@ General: Terrain: TerrainType@Clear: Type: Clear - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 40, 68, 40 TerrainType@Water: Type: Water IsWater: true - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 116, 164 TerrainType@Road: Type: Road - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 TerrainType@Rock: Type: Rock - AcceptSmudge: False + AcceptsSmudgeType: Color: 68, 68, 60 TerrainType@Tree: Type: Tree - AcceptSmudge: False + AcceptsSmudgeType: Color: 28, 32, 36 TerrainType@River: Type: River - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 140, 180 TerrainType@Rough: Type: Rough - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 TerrainType@Wall: Type: Wall - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 TerrainType@Beach: Type: Beach - AcceptSmudge: False + AcceptsSmudgeType: Color: 176, 156, 120 TerrainType@Ore: Type: Ore - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 148, 128, 96 Templates: diff --git a/mods/ra/tilesets/snow.yaml b/mods/ra/tilesets/snow.yaml index f5ab82e895..4af7038ec6 100644 --- a/mods/ra/tilesets/snow.yaml +++ b/mods/ra/tilesets/snow.yaml @@ -7,44 +7,44 @@ General: Terrain: TerrainType@Clear: Type: Clear - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 196, 196, 196 TerrainType@Water: Type: Water IsWater: true - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 116, 164 TerrainType@Road: Type: Road - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 TerrainType@Rock: Type: Rock - AcceptSmudge: False + AcceptsSmudgeType: Color: 68, 68, 60 TerrainType@Tree: Type: Tree - AcceptSmudge: False + AcceptsSmudgeType: Color: 28, 32, 36 TerrainType@River: Type: River - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 140, 180 TerrainType@Rough: Type: Rough - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 TerrainType@Wall: Type: Wall - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 TerrainType@Beach: Type: Beach - AcceptSmudge: False + AcceptsSmudgeType: Color: 176, 156, 120 TerrainType@Ore: Type: Ore - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 148, 128, 96 Templates: diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index 902b7b7971..209be406ff 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -7,44 +7,44 @@ General: Terrain: TerrainType@Clear: Type: Clear - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 40, 68, 40 TerrainType@Water: Type: Water IsWater: true - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 116, 164 TerrainType@Road: Type: Road - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 TerrainType@Rock: Type: Rock - AcceptSmudge: False + AcceptsSmudgeType: Color: 68, 68, 60 TerrainType@Tree: Type: Tree - AcceptSmudge: False + AcceptsSmudgeType: Color: 28, 32, 36 TerrainType@River: Type: River - AcceptSmudge: False + AcceptsSmudgeType: Color: 92, 140, 180 TerrainType@Rough: Type: Rough - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 TerrainType@Wall: Type: Wall - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 TerrainType@Beach: Type: Beach - AcceptSmudge: False + AcceptsSmudgeType: Color: 176, 156, 120 TerrainType@Ore: Type: Ore - AcceptSmudge: True + AcceptsSmudgeType: Crater, Scorch Color: 148, 128, 96 Templates: