From 749301899ec63805ec6813922862ed564da37774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 5 Jun 2012 18:14:17 +0200 Subject: [PATCH] added smudge palette problems and engine does not care for terrain type --- .../Widgets/Logic/D2kInstallFromCDLogic.cs | 1 + mods/d2k/TODO | 10 ++++++---- mods/d2k/rules/system.yaml | 13 ++++-------- mods/d2k/weapons.yaml | 20 +++++++++---------- ripD2kGameFiles.sh | 14 ++++++++++--- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs index 666d18e9bb..7054b8f856 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kInstallFromCDLogic.cs @@ -48,6 +48,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic { var files = new string[][] { new [] { diskRoot, "music", "ambush.aud" }, + new [] { diskRoot, "setup", "setup.z" }, }; return files.All(f => File.Exists(f.Aggregate(Path.Combine))); diff --git a/mods/d2k/TODO b/mods/d2k/TODO index 32c7c0a3b1..f6b7b6661d 100644 --- a/mods/d2k/TODO +++ b/mods/d2k/TODO @@ -6,10 +6,9 @@ # construction yard crane animations missing # welding animation (factories) missing # chimney animation (refinery) missing -# create a tileset extractor for gamefiles to remove copyrighted content from distribution +# create a tileset extractor for gamefiles to remove copyrighted content from distribution (convert BLOX*.R8 to TMP files) # replace mines with spice blooms # spice tiles do not fit -# add Smudge Types (stored in SHPs not in tileset) # add game logic for concrete plates (use terrain overlay from bridges/ressources) # allow placing turrets on walls # support separate turret sequence with RenderBuildingTurreted @@ -34,7 +33,10 @@ # add install rules to makefile (once more polished) # add sonic tank weapon (currently uses tesla) # make deviator change the allegiance of ememy units (currently shoots rockets) -# complete Arrakis tileset (blocked by issue #2178) +# complete Arrakis tileset (blocked by TilesetBuilder crashing on export) # allow frigate to deliver 5 units at once to starport # starport prices should vary -# add shroud (Dune's 32x32 tiles differ completely from RA/CnC) \ No newline at end of file +# reinforcements have arrived is played twice when ordering via starport +# add shroud (Dune's 32x32 tiles differ completely from RA/CnC) +# black spots on buildings should be transparent +# gamefile extraction (setup/setup.z) from CD fails \ No newline at end of file diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index 66e5a89148..fccac040a4 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -183,15 +183,10 @@ World: PipColor: Yellow AllowedTerrainTypes: Clear AllowUnderActors: false -# SmudgeLayer@SCORCH: -# Type:Scorch -# SmokePercentage:50 -# Types:sc1,sc2,sc3,sc4,sc5,sc6 -# Depths:1,1,1,1,1,1 -# SmudgeLayer@CRATER: -# Type:Crater -# Types:cr1,cr2,cr3,cr4,cr5,cr6 -# Depths:5,5,5,5,5,5 + SmudgeLayer@CRATER: + Type:Crater + Types:rockcrater1,rockcrater2,sandcrater1,sandcrater2 + Depths:15,15,15,15 SpawnMapActors: CreateMPPlayers: MPStartLocations: diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 24a4525852..7332824180 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: Crater Damage: 50 ImpactSound: kaboom12 @@ -75,7 +75,7 @@ QuadRockets: Explosion: med_explosion WaterExplosion: med_splash ImpactSound: kaboom12 -# SmudgeType: Crater + SmudgeType: Crater Damage: 35 TurretGun: @@ -95,7 +95,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 -# SmudgeType: Crater + SmudgeType: Crater Damage: 60 25mm: @@ -115,7 +115,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 -# SmudgeType: Crater + SmudgeType: Crater Damage: 16 90mm: @@ -135,7 +135,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 -# SmudgeType: Crater + SmudgeType: Crater Damage: 30 105mm: @@ -157,7 +157,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 -# SmudgeType: Crater + SmudgeType: Crater Damage: 40 120mm: @@ -178,7 +178,7 @@ TurretGun: Explosion: small_explosion WaterExplosion: small_splash InfDeath: 3 -# SmudgeType: Crater + SmudgeType: Crater Damage: 50 227mm: @@ -210,7 +210,7 @@ TurretGun: Explosion: med_explosion WaterExplosion: med_splash ImpactSound: kaboom12 -# SmudgeType: Crater + SmudgeType: Crater Damage: 25 #for rocket turret @@ -242,7 +242,7 @@ MammothTusk: Explosion: med_explosion WaterExplosion: med_splash InfDeath: 2 -# SmudgeType: Crater + SmudgeType: Crater Damage: 45 155mm: @@ -268,7 +268,7 @@ MammothTusk: Explosion: large_explosion WaterExplosion: med_splash InfDeath: 2 -# SmudgeType: Crater + SmudgeType: Crater Damage: 220 TTankZap: diff --git a/ripD2kGameFiles.sh b/ripD2kGameFiles.sh index 631fbb4ca0..29ab3bc0c1 100755 --- a/ripD2kGameFiles.sh +++ b/ripD2kGameFiles.sh @@ -11,10 +11,16 @@ mono OpenRA.Utility.exe --r8 $R8 $PAL 102 105 "crates" mono OpenRA.Utility.exe --shp crates.png 32 mono OpenRA.Utility.exe --r8 $R8 $PAL 106 109 "spicebloom" mono OpenRA.Utility.exe --shp spicebloom.png 32 +# stars, arrow-up +mono OpenRA.Utility.exe --r8 $R8 $PAL 114 129 "rockcrater1" +mono OpenRA.Utility.exe --shp rockcrater1.png 32 +mono OpenRA.Utility.exe --r8 $R8 $PAL 130 145 "rockcrater2" +mono OpenRA.Utility.exe --shp rockcrater2.png 32 +mono OpenRA.Utility.exe --r8 $R8 $PAL 146 161 "sandcrater1" +mono OpenRA.Utility.exe --shp sandcrater1.png 32 +mono OpenRA.Utility.exe --r8 $R8 $PAL 162 177 "sandcrater2" +mono OpenRA.Utility.exe --shp sandcrater2.png 32 - -#mono OpenRA.Utility.exe --r8 $R8 $PAL 194 205 "spice" -#mono OpenRA.Utility.exe --shp spice.png 48 mono OpenRA.Utility.exe --r8 $R8 $PAL 206 381 "rifle" --infantry mono OpenRA.Utility.exe --shp rifle.png 48 mono OpenRA.Utility.exe --r8 $R8 $PAL 382 457 "rifledeath" --infantrydeath @@ -383,6 +389,8 @@ mono OpenRA.Utility.exe --shp mouse.png 48 R8="$HOME/.openra/Content/d2k/BLOXBASE.R8" mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "BLOXBASE" +mono OpenRA.Utility.exe --r8 $R8 $PAL 0 0 "sand0" + #mono OpenRA.Utility.exe --r8 $R8 $PAL 748 757 "spice0" #mono OpenRA.Utility.exe --shp spice0.png 32