From 676210422f7d92106c15168d2894898b26d504be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Tue, 5 Jun 2012 19:50:44 +0200
Subject: [PATCH] added spice bloom

indestructable, seeds ressources like mine or blossom tree
---
 mods/d2k/TODO              |   3 +--
 mods/d2k/maps/test.oramap  | Bin 1141 -> 1171 bytes
 mods/d2k/rules/system.yaml |  23 +++++++++++++++++++++--
 mods/d2k/sequences.yaml    |  12 +++++++++++-
 ripD2kGameFiles.sh         |   6 +++---
 5 files changed, 36 insertions(+), 8 deletions(-)

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 f2dc2e50a9760d694beca262489d3494f1edaa54..dc387a59ae17316f634916e56d101befbbde1405 100644
GIT binary patch
delta 498
zcmV<O0S*532$Km7P)h>@6aWAK2mmCU#jy=o0)L#vK$x7Bu#y1)0G9&*00;m80BvD#
zE_q>XY_(ELZreZ%U7M%S0kn|pG;Ou2>NG%+I4LBjS<?~|4=}&ZPzaLq^d`MnsgWB6
zX$*8zU<SkA<0Cn2NmIwT(^O^KFc827{kaPUxys%FY!xRLMFu#d*ahWTIa_5>8Lug0
z@qc6nJwQG1-i0dLAoE^f6hY}<KW$H8%%dri<gA;fzWCZEo>o0c?sEAdmkaRO4YrSB
zIL+mJ91p-vq&l{H(ppHW>>PEJBDarTkZWgu45_kj8Xqad3Ko;p&>aP`9eui@fdgvs
zEUwT9=wJ~2`oYFq7j%DUT_T)aJF`PZ%YV<t20MWv2U0!7zZo`zW>w4tlP>BQ_+qk)
z#Tnh9I9tZR%HH2t#qkwQgSK}@)GwBdB5|(+kv~RTzM?JvJMCnjY5&Ci+wA82)0FZ<
z)lhfr(*Gr)s50ZD#|JBrOV{DFa?4e|ET@m7Fb_IG%C{k9agvwC=@HOU*4V3#c0bys
z?q}Sp$WLBSJugjyt&YRqzX^lZ4E?>d4bTiay)DV=%0Nf?me4ypO5dGIrr%IY0Rl4s
o6aWAK2mmCU#ghXBGYp)?K$x7Bu#y1)0GE?O1T6*<1ONa40N+91ZU6uP

delta 468
zcmV;_0W1EK3H1mKP)h>@6aWAK2mmB|!m$ll0)KnLKs4+f^>hIM04W0i00;m80BvD#
zE_q>XY_(ELPQyS9UDv0`0kUWcRFD;+PzgZ+B?Z<dF?6K)G2;l8^KcU`hLaSE_(*J!
zW;FJ*pP$Dw6=|v&?=<DfGPDG+KtFfEAm_;*z*2D^qR0Tp6ziZoD`)d0D&sXJERn>Z
z2Y)D9Ub&Db3uIm?jAAJL`eGXjT^&u4q-If;#o1}q>s0DlYG;%ER5rkoYi$z+n5ME0
zx&?3@sfg8zv=)&(nWK)<<Z|tWIdk^0?K`{DxTX+u7!6iQ_Y}z1ba+862h<W7U7!)t
z1`z-9$;Mk3bhEj-WH>u><_;Mxe}E;{LVrUJq#BCf6&9^#HQovgzPMfDr^${+$8?Vp
ztQZ3;`*3X)$1gG^+Qu1iPb?Wl5}pMj|C?;~MK=3)*#Y0mzUTdIcH8>Hl+sPtP}J=D
z_v?*uo){lJK3SohyBdctH`z%i+3;`_wu9~|+0T@0yqjj@={FKorfnXi5rDGQ{UKSA
zd?vYKXWtTfXFKc0sUCU*P)h*<GXN9-000O8BzwY>Ap|oFd%{38>>c%V0RR9glVAib
K2J`~}0001tq{lk|

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