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

string AcceptsSmudgeType replaces boolean AcceptSmudge

Browse Source 
because Dune 2000 has different craters for rock and sand
This commit is contained in:
Matthias Mailänder
2012-06-25 21:16:31 +02:00
committed by Chris Forbes
parent b61e4a6083
commit d3915ad291
18 changed files with 135 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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:

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

@@ -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:

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

@@ -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:

4
mods/d2k/TODO
View File

@@ -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
# group number metrics are off, should use DrawText not pips SHP

12
mods/d2k/rules/system.yaml
View File

@@ -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:

6
mods/d2k/sequences.yaml
View File

@@ -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

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

@@ -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

22
mods/d2k/weapons.yaml
View File

@@ -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:

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

@@ -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:

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

@@ -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:

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

@@ -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: