diff --git a/mods/d2k/TODO b/mods/d2k/TODO index f6b7b6661d..5aa2e0c759 100644 --- a/mods/d2k/TODO +++ b/mods/d2k/TODO @@ -7,8 +7,7 @@ # welding animation (factories) missing # chimney animation (refinery) missing # 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 more spice tiles and make them fit # add game logic for concrete plates (use terrain overlay from bridges/ressources) # allow placing turrets on walls # support separate turret sequence with RenderBuildingTurreted diff --git a/mods/d2k/maps/test.oramap b/mods/d2k/maps/test.oramap index f2dc2e50a9..dc387a59ae 100644 Binary files a/mods/d2k/maps/test.oramap and b/mods/d2k/maps/test.oramap differ diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index fccac040a4..b5ab2127a7 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -126,7 +126,7 @@ World: Filename: d2k.pal PaletteFromFile@effect: Name: effect - Filename: d2k.pal + Filename: temperat.pal PaletteFromRGBA@shadow: Name: shadow R: 0 @@ -264,4 +264,23 @@ mpspawn: waypoint: Waypoint: - RenderEditorOnly: \ No newline at end of file + RenderEditorOnly: + +SPICEBLOOM: + RenderBuilding: + Palette: d2k + Building: + Footprint: x + Dimensions: 1,1 + AppearsOnRadar: + EditorAppearance: + RelativeToTopLeft: yes + ProximityCaptor: + Types:Tree + BelowUnits: + Tooltip: + Name: Spice Bloom + SeedsResource: + ResourceType: Spice + RadarColorFromTerrain: + Terrain: Spice \ No newline at end of file diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml index cd53a93baa..3ef0bea688 100644 --- a/mods/d2k/sequences.yaml +++ b/mods/d2k/sequences.yaml @@ -872,4 +872,14 @@ allyrepair: repair: Start: 0 Length: * - Tick: 160 \ No newline at end of file + Tick: 160 + +spicebloom: + make: + Start: 0 + Length: 3 + active: + Start: 2 + Length: 1 + idle: + Start: 2 \ No newline at end of file diff --git a/ripD2kGameFiles.sh b/ripD2kGameFiles.sh index 29ab3bc0c1..265c94d9b1 100755 --- a/ripD2kGameFiles.sh +++ b/ripD2kGameFiles.sh @@ -9,7 +9,7 @@ mono OpenRA.Utility.exe --shp overlay.png 32 #mono OpenRA.Utility.exe --shp shadow.png 32 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 --r8 $R8 $PAL 107 109 "spicebloom" mono OpenRA.Utility.exe --shp spicebloom.png 32 # stars, arrow-up mono OpenRA.Utility.exe --r8 $R8 $PAL 114 129 "rockcrater1" @@ -391,7 +391,7 @@ 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 +mono OpenRA.Utility.exe --r8 $R8 $PAL 748 749 "spice0" +mono OpenRA.Utility.exe --shp spice0.png 32 mv *.shp mods/d2k/bits \ No newline at end of file