diff options
31 files changed, 486 insertions, 148 deletions
diff --git a/resources/Fluids/Fluids.xml b/resources/Fluids/Fluids.xml index 0aeee64..c61b8bd 100644 --- a/resources/Fluids/Fluids.xml +++ b/resources/Fluids/Fluids.xml @@ -1,35 +1,53 @@ <fluids>
- <fluid type="water" level = "1" sheetIndex = "127" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "127" color = "blood"/>
+ <fluid type="water" level = "1" sheetIndex = "127" halftile="both" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "127" color = "blood" halftile="both"/>
</fluid>
- <fluid type="water" level = "2" sheetIndex = "128" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "128" color = "blood"/>
+ <fluid type="water" level = "2" sheetIndex = "128" halftile="both" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "128" color = "blood" halftile="both"/>
</fluid>
- <fluid type="water" level = "3" sheetIndex = "129" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "129" color = "blood"/>
+ <fluid type="water" level = "3" sheetIndex = "129" halftile="both" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "129" color = "blood" halftile="both"/>
</fluid>
- <fluid type="water" level = "4" sheetIndex = "130" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "130" color = "blood"/>
+ <fluid type="water" level = "4" sheetIndex = "130" halftile="both" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "130" color = "blood" halftile="both"/>
</fluid>
- <fluid type="water" level = "5" sheetIndex = "131" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "131" color = "blood"/>
+ <fluid type="water" level = "5" sheetIndex = "131" halftile="no" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "131" halftile="no" color = "blood"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "xml" red = "150" green = "237" blue = "224"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "blood"/>
</fluid>
- <fluid type="water" level = "6" sheetIndex = "132" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "132" color = "blood"/>
+ <fluid type="water" level = "6" sheetIndex = "132" halftile="no" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "132" halftile="no" color = "blood"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "xml" red = "150" green = "237" blue = "224"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "blood"/>
</fluid>
- <fluid type="water" level = "7" sheetIndex = "133" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "133" color = "blood"/>
+ <fluid type="water" level = "7" sheetIndex = "133" halftile="no" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "133" halftile="no" color = "blood"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "xml" red = "150" green = "237" blue = "224"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "blood"/>
</fluid>
- <fluid type="water" level = "8" sheetIndex = "134" color = "xml" red = "150" green = "237" blue = "224">
- <subsprite sheetIndex = "134" color = "blood"/>
+ <fluid type="water" level = "8" sheetIndex = "134" halftile="no" color = "xml" red = "150" green = "237" blue = "224">
+ <subsprite sheetIndex = "134" halftile="no" color = "blood"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "xml" red = "150" green = "237" blue = "224"/>
+ <subsprite sheetIndex = "130" halftile="yes" color = "blood"/>
</fluid>
- <fluid type="lava" level = "1" sheetIndex = "120"/>
- <fluid type="lava" level = "2" sheetIndex = "121"/>
- <fluid type="lava" level = "3" sheetIndex = "122"/>
- <fluid type="lava" level = "4" sheetIndex = "123"/>
- <fluid type="lava" level = "5" sheetIndex = "124"/>
- <fluid type="lava" level = "6" sheetIndex = "125"/>
- <fluid type="lava" level = "7" sheetIndex = "126"/>
-
+ <fluid type="lava" level = "1" sheetIndex = "120" halftile="both">
+ </fluid>
+ <fluid type="lava" level = "2" sheetIndex = "121" halftile="both">
+ </fluid>
+ <fluid type="lava" level = "3" sheetIndex = "122" halftile="both">
+ </fluid>
+ <fluid type="lava" level = "4" sheetIndex = "123" halftile="no">
+ <subsprite sheetIndex = "122" halftile="yes"/>
+ </fluid>
+ <fluid type="lava" level = "5" sheetIndex = "124" halftile="no">
+ <subsprite sheetIndex = "122" halftile="yes"/>
+ </fluid>
+ <fluid type="lava" level = "6" sheetIndex = "125" halftile="no">
+ <subsprite sheetIndex = "122" halftile="yes"/>
+ </fluid>
+ <fluid type="lava" level = "7" sheetIndex = "126" halftile="no">
+ <subsprite sheetIndex = "122" halftile="yes"/>
+ </fluid>
</fluids>
\ No newline at end of file diff --git a/resources/buildings/AnimalTrap.xml b/resources/buildings/AnimalTrap.xml new file mode 100644 index 0000000..b93d765 --- /dev/null +++ b/resources/buildings/AnimalTrap.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" ?>
+
+<building name="Animal trap" game_type="AnimalTrap" >
+ <sprite index="354" color="building" />
+</building>
diff --git a/resources/buildings/Cabinet.xml b/resources/buildings/Cabinet.xml index b0c637f..cc90a69 100644 --- a/resources/buildings/Cabinet.xml +++ b/resources/buildings/Cabinet.xml @@ -1,9 +1,21 @@ <?xml version="1.0"?>
+
<building name="Cabinet" game_type="Cabinet" >
<if>
<MaterialType value="Wood" />
<sprite index="88" color="building" />
</if>
+ <else><!-- GreenGlass -->
+ <MaterialType value="GreenGlass" />
+ <sprite index="67" />
+ </else>
+ <else><!-- ClearGlass or CrystalGlass -->
+ <or>
+ <MaterialType value="ClearGlass" />
+ <MaterialType value="CrystalGlass" />
+ </or>
+ <sprite index="68" />
+ </else>
<else>
<sprite index="87" color="building" />
</else>
diff --git a/resources/buildings/Cage.xml b/resources/buildings/Cage.xml index 5b99131..200c50a 100644 --- a/resources/buildings/Cage.xml +++ b/resources/buildings/Cage.xml @@ -1,26 +1,23 @@ <?xml version="1.0" ?>
-
-
-<building name="Cage" game_type="Cage" >
+<building name="Cage" game_type="Cage">
<if>
<MaterialType value="Wood" />
- <sprite index = 313 />
+ <sprite index="313" />
</if>
<else>
<MaterialType value="GreenGlass"/>
- <sprite index = 314 />
+ <sprite index="314" />
</else>
<else>
- <MaterialType value="ClearGlass"/>
- <sprite index = 294 />
+ <or>
+ <MaterialType value="ClearGlass"/>
+ <MaterialType value="CrystalGlass"/>
+ </or>
+ <sprite index="294" />
</else>
<else>
- <MaterialType value="CrystalGlass"/>
- <sprite index = 294 />
+ <sprite index="312" color="building" />
</else>
- <else>
- <sprite index = 312 />
- </else>
-
+
</building>
diff --git a/resources/buildings/CageTrap.xml b/resources/buildings/CageTrap.xml index bd6e06a..123b0c9 100644 --- a/resources/buildings/CageTrap.xml +++ b/resources/buildings/CageTrap.xml @@ -1,7 +1,5 @@ <?xml version="1.0" ?>
-
-
<building name="Trap" game_type="Trap" game_subtype="CageTrap">
- <sprite index = 355 />
+ <sprite index="357" />
</building>
diff --git a/resources/buildings/Chair.xml b/resources/buildings/Chair.xml index 223bba1..4f44f45 100644 --- a/resources/buildings/Chair.xml +++ b/resources/buildings/Chair.xml @@ -1,9 +1,21 @@ <?xml version="1.0"?>
+
<building name="Chair" game_type="Chair" >
<if>
<MaterialType value="Wood" />
<sprite index="84" color="building" />
</if>
+ <else><!-- GreenGlass -->
+ <MaterialType value="GreenGlass" />
+ <sprite index="64" />
+ </else>
+ <else><!-- ClearGlass or CrystalGlass -->
+ <or>
+ <MaterialType value="ClearGlass" />
+ <MaterialType value="CrystalGlass" />
+ </or>
+ <sprite index="65" />
+ </else>
<else>
<sprite index="85" color="building" />
</else>
diff --git a/resources/buildings/Chest.xml b/resources/buildings/Chest.xml index 159b734..9eee60b 100644 --- a/resources/buildings/Chest.xml +++ b/resources/buildings/Chest.xml @@ -1,26 +1,30 @@ <?xml version="1.0"?>
+
<building name="Chest" game_type="Box" >
<if>
<MaterialType value="GreenGlass" />
- <sprite index="92" />
+ <sprite index="69" />
</if>
- <else>
- <MaterialType value="Leather" />
- <sprite index="91" />
- </else>
- <else>
- <MaterialType value="Silk" />
- <sprite index="91" />
+ <else><!-- ClearGlass or CrystalGlass -->
+ <or>
+ <MaterialType value="ClearGlass" />
+ <MaterialType value="CrystalGlass" />
+ </or>
+ <sprite index="70" />
</else>
<else>
- <MaterialType value="PlantCloth" />
- <sprite index="91" />
+ <or>
+ <MaterialType value="Leather" />
+ <MaterialType value="Silk" />
+ <MaterialType value="PlantCloth" />
+ </or>
+ <sprite index="91" />
</else>
<else>
- <MaterialType value="Wood" />
- <sprite index="89" color="building" />
+ <MaterialType value="Wood" />
+ <sprite index="89" color="building" />
</else>
<else>
- <sprite index="90" color="building" />
+ <sprite index="90" color="building" />
</else>
</building>
diff --git a/resources/buildings/Craftdwarfs.xml b/resources/buildings/Craftsdwarfs.xml index ac04353..d9c5adc 100644 --- a/resources/buildings/Craftdwarfs.xml +++ b/resources/buildings/Craftsdwarfs.xml @@ -1,5 +1,5 @@ <?xml version="1.0" ?>
-<building name="Craftdwarfs Workshop" game_type="Workshop" game_subtype="Craftdwarfs" file="workshop.png">
+<building name="Craftsdwarfs Workshop" game_type="Workshop" game_subtype="Craftsdwarfs" file="workshop.png">
<!-- benches block -->
<if>
<!-- replace this with position index if required -->
diff --git a/resources/buildings/DoorsAndFloodgates.png b/resources/buildings/DoorsAndFloodgates.png Binary files differindex 2d90c3c..dfd15c9 100644 --- a/resources/buildings/DoorsAndFloodgates.png +++ b/resources/buildings/DoorsAndFloodgates.png diff --git a/resources/buildings/Hatch.xml b/resources/buildings/Hatch.xml index b984582..04d6662 100644 --- a/resources/buildings/Hatch.xml +++ b/resources/buildings/Hatch.xml @@ -1,7 +1,55 @@ <?xml version="1.0" ?>
-
-
-<building name="Floor Hatch" game_type="Hatch" >
- <sprite index = 276 />
+<building name="Floor Hatch" game_type="Hatch" file="DoorsAndFloodgates.png">
+ <if><!-- wooden -->
+ <MaterialType value="Wood" />
+ <sprite index="62" color="building" />
+ <sprite index="63" />
+ </if>
+ <else><!-- some kind of metall -->
+ <or>
+ <MaterialType value="Inorganic" subtype="IRON" />
+ <MaterialType value="Inorganic" subtype="GOLD" />
+ <MaterialType value="Inorganic" subtype="SILVER" />
+ <MaterialType value="Inorganic" subtype="COPPER" />
+ <MaterialType value="Inorganic" subtype="NICKEL" />
+ <MaterialType value="Inorganic" subtype="ZINC" />
+ <MaterialType value="Inorganic" subtype="BRONZE" />
+ <MaterialType value="Inorganic" subtype="BRASS" />
+ <MaterialType value="Inorganic" subtype="STEEL" />
+ <MaterialType value="Inorganic" subtype="PIG_IRON" />
+ <MaterialType value="Inorganic" subtype="PLATINUM" />
+ <MaterialType value="Inorganic" subtype="ELECTRUM" />
+ <MaterialType value="Inorganic" subtype="TIN" />
+ <MaterialType value="Inorganic" subtype="PEWTER_FINE" />
+ <MaterialType value="Inorganic" subtype="PEWTER_TRIFLE" />
+ <MaterialType value="Inorganic" subtype="PEWTER_LAY" />
+ <MaterialType value="Inorganic" subtype="LEAD" />
+ <MaterialType value="Inorganic" subtype="ALUMINUM" />
+ <MaterialType value="Inorganic" subtype="NICKEL_SILVER" />
+ <MaterialType value="Inorganic" subtype="BILLON" />
+ <MaterialType value="Inorganic" subtype="STERLING_SILVER" />
+ <MaterialType value="Inorganic" subtype="BLACK_BRONZE" />
+ <MaterialType value="Inorganic" subtype="ROSE_GOLD" />
+ <MaterialType value="Inorganic" subtype="BISMUTH" />
+ <MaterialType value="Inorganic" subtype="BISMUTH_BRONZE" />
+ <MaterialType value="Inorganic" subtype="ADAMANTINE" />
+ </or>
+ <sprite index="64" color="building" />
+ </else>
+ <else><!-- ClearGlass -->
+ <MaterialType value="ClearGlass" />
+ <sprite index="66" />
+ </else>
+ <else><!-- GreenGlass -->
+ <MaterialType value="GreenGlass" />
+ <sprite index="68" />
+ </else>
+ <else><!-- CrystalGlass -->
+ <MaterialType value="CrystalGlass" />
+ <sprite index="70" />
+ </else>
+ <else><!-- any other material (e.g. stone) -->
+ <sprite index="60" color="building" />
+ </else>
</building>
diff --git a/resources/buildings/Kennels.xml b/resources/buildings/Kennels.xml index 7c3563b..41b4624 100644 --- a/resources/buildings/Kennels.xml +++ b/resources/buildings/Kennels.xml @@ -1,7 +1,5 @@ <?xml version="1.0" ?>
-
-
<building name="Kennels" game_type="Workshop" game_subtype="Kennels" >
<include file="wsUpperBorder.xml"/>
@@ -24,7 +22,7 @@ <PositionIndex value= "16" />
<BuildingOccupancy value="2" />
</and>
- <sprite index = "312" />
+ <sprite index = "312" color="building" />
</else>
<else>
diff --git a/resources/buildings/Spikes.xml b/resources/buildings/Spikes.xml index d8b30a4..6df2b29 100644 --- a/resources/buildings/Spikes.xml +++ b/resources/buildings/Spikes.xml @@ -1,7 +1,13 @@ <?xml version="1.0" ?>
-
-
<building name="Trap" game_type="Trap" game_subtype="WeaponTrap">
- <sprite index = 356 />
-</building>
+ <sprite index="356" />
+ <!--if>
+ <NeighbourWall dir="West" />
+ <sprite index ="376" />
+ </if>
+ <if>
+ <NeighbourWall dir="North" />
+ <sprite index ="377" />
+ </if-->
+</building>
\ No newline at end of file diff --git a/resources/buildings/StonefallTrap.xml b/resources/buildings/StonefallTrap.xml index 0f9eecc..b2558d7 100644 --- a/resources/buildings/StonefallTrap.xml +++ b/resources/buildings/StonefallTrap.xml @@ -1,7 +1,5 @@ <?xml version="1.0" ?>
-
-
<building name="Trap" game_type="Trap" game_subtype="StoneFallTrap">
- <sprite index = 355 />
+ <sprite index="359" />
</building>
diff --git a/resources/buildings/Table.xml b/resources/buildings/Table.xml index a9a127f..ec1d1ab 100644 --- a/resources/buildings/Table.xml +++ b/resources/buildings/Table.xml @@ -1,8 +1,11 @@ <?xml version="1.0"?>
+
<building name="Table" game_type="Table">
<if>
<MaterialType value="Wood" />
- <sprite index="82" color="building" />
+ <sprite index="82" color="building" >
+ <subsprite sheetIndex = "102" bloodmin = "1" color = "blood" />
+ </sprite>
</if>
<else>
<or>
@@ -33,11 +36,28 @@ <MaterialType value="Metal" subtype="BISMUTH_BRONZE" />
<MaterialType value="Metal" subtype="ADAMANTINE" />
</or>
- <sprite index="63" color="building" />
+ <sprite index="103" color="building" >
+ <subsprite sheetIndex = "102" bloodmin = "1" color = "blood" />
+ </sprite>
+ </else>
+ <else><!-- GreenGlass -->
+ <MaterialType value="GreenGlass" />
+ <sprite index="62" >
+ <subsprite sheetIndex = "102" bloodmin = "1" color = "blood" />
+ </sprite>
+ </else>
+ <else><!-- ClearGlass or CrystalGlass -->
+ <or>
+ <MaterialType value="ClearGlass" />
+ <MaterialType value="CrystalGlass" />
+ </or>
+ <sprite index="63" >
+ <subsprite sheetIndex = "102" bloodmin = "1" color = "blood" />
+ </sprite>
</else>
<else>
<sprite index="83" color="building" >
- <subsprite sheetIndex = "62" bloodmin = "1" color = "blood" />
+ <subsprite sheetIndex = "102" bloodmin = "1" color = "blood" />
</sprite>
</else>
</building>
diff --git a/resources/buildings/Target.xml b/resources/buildings/Target.xml index 36bf791..27a79dc 100644 --- a/resources/buildings/Target.xml +++ b/resources/buildings/Target.xml @@ -1,7 +1,43 @@ -<?xml version="1.0" ?>
-
-
+<?xml version="1.0"?>
<building name="Target" game_type="ArcheryTarget" >
- <sprite index = 288 />
-</building>
+ <if>
+ <MaterialType value="Wood" />
+ <sprite index="289" color="building" />
+ </if>
+ <else>
+ <or>
+ <MaterialType value="Metal" subtype="IRON" />
+ <MaterialType value="Metal" subtype="GOLD" />
+ <MaterialType value="Metal" subtype="SILVER" />
+ <MaterialType value="Metal" subtype="COPPER" />
+ <MaterialType value="Metal" subtype="NICKEL" />
+ <MaterialType value="Metal" subtype="ZINC" />
+ <MaterialType value="Metal" subtype="BRONZE" />
+ <MaterialType value="Metal" subtype="BRASS" />
+ <MaterialType value="Metal" subtype="STEEL" />
+ <MaterialType value="Metal" subtype="PIG_IRON" />
+ <MaterialType value="Metal" subtype="PLATINUM" />
+ <MaterialType value="Metal" subtype="ELECTRUM" />
+ <MaterialType value="Metal" subtype="TIN" />
+ <MaterialType value="Metal" subtype="PEWTER_FINE" />
+ <MaterialType value="Metal" subtype="PEWTER_TRIFLE" />
+ <MaterialType value="Metal" subtype="PEWTER_LAY" />
+ <MaterialType value="Metal" subtype="LEAD" />
+ <MaterialType value="Metal" subtype="ALUMINUM" />
+ <MaterialType value="Metal" subtype="NICKEL_SILVER" />
+ <MaterialType value="Metal" subtype="BILLON" />
+ <MaterialType value="Metal" subtype="STERLING_SILVER" />
+ <MaterialType value="Metal" subtype="BLACK_BRONZE" />
+ <MaterialType value="Metal" subtype="ROSE_GOLD" />
+ <MaterialType value="Metal" subtype="BISMUTH" />
+ <MaterialType value="Metal" subtype="BISMUTH_BRONZE" />
+ <MaterialType value="Metal" subtype="ADAMANTINE" />
+ </or>
+ <sprite index="290" color="building" />
+ </else>
+ <else>
+ <sprite index="288" color="building" />
+ </else>
+ <sprite index="287" />
+</building>
diff --git a/resources/buildings/VerticalBars.png b/resources/buildings/VerticalBars.png Binary files differindex 5e7f536..b508a33 100644 --- a/resources/buildings/VerticalBars.png +++ b/resources/buildings/VerticalBars.png diff --git a/resources/buildings/VerticalBars.xml b/resources/buildings/VerticalBars.xml index fc58eed..380820b 100644 --- a/resources/buildings/VerticalBars.xml +++ b/resources/buildings/VerticalBars.xml @@ -1,7 +1,5 @@ <?xml version="1.0" ?>
-
-
<building name="Vertical Bars" game_type="BarsVertical" file="VerticalBars.png">
<!-- straight or end pieces -->
@@ -22,7 +20,7 @@ </or>
</not>
</and>
- <sprite index=0 />
+ <sprite index="0" color="building" />
</if>
<else>
<and>
@@ -41,7 +39,7 @@ </or>
</not>
</and>
- <sprite index=1 />
+ <sprite index="1" color="building" />
</else>
<!-- Center piece -->
@@ -64,7 +62,7 @@ <NeighbourWall dir="South" />
</or>
</and>
- <sprite index=2 />
+ <sprite index="2" color="building" />
</else>
<!-- Corners piece -->
@@ -85,7 +83,7 @@ </or>
</not>
</and>
- <sprite index=3 />
+ <sprite index="3" color="building" />
</else>
<else>
<and>
@@ -104,7 +102,7 @@ </or>
</not>
</and>
- <sprite index=4 />
+ <sprite index="4" color="building" />
</else>
<else>
<and>
@@ -123,7 +121,7 @@ </or>
</not>
</and>
- <sprite index=5 />
+ <sprite index="5" color="building" />
</else>
<else>
<and>
@@ -142,9 +140,9 @@ </or>
</not>
</and>
- <sprite index=6 />
+ <sprite index="6" color="building" />
</else>
- //T-Sections
+ <!-- T-Sections -->
<else>
<and>
<or>
@@ -162,7 +160,7 @@ </or>
</not>
</and>
- <sprite index=7 />
+ <sprite index="7" color="building" />
</else>
<else>
<and>
@@ -181,7 +179,7 @@ </or>
</not>
</and>
- <sprite index=8 />
+ <sprite index="8" color="building" />
</else>
<else>
<and>
@@ -200,7 +198,7 @@ </or>
</not>
</and>
- <sprite index=9 />
+ <sprite index="9" color="building" />
</else>
<else>
<and>
@@ -219,10 +217,10 @@ </or>
</not>
</and>
- <sprite index=10 />
+ <sprite index="10" color="building" />
</else>
<!-- default -->
<else>
- <sprite index=0 />
+ <sprite index="0" color="building" />
</else>
-</building>
+</building>
\ No newline at end of file diff --git a/resources/buildings/WallGrate.xml b/resources/buildings/WallGrate.xml index 3cf878f..c7d046c 100644 --- a/resources/buildings/WallGrate.xml +++ b/resources/buildings/WallGrate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" ?>
-
-
<building name="Grate" game_type="GrateWall" >
<if>
<or>
@@ -10,9 +8,9 @@ <NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
</or>
- <sprite index=352 />
+ <sprite index="352" color="building" />
</if>
<else>
- <sprite index = 351 />
+ <sprite index="351" color="building" />
</else>
</building>
diff --git a/resources/buildings/WeaponTrap.xml b/resources/buildings/WeaponTrap.xml index 4ac466a..bcd51cb 100644 --- a/resources/buildings/WeaponTrap.xml +++ b/resources/buildings/WeaponTrap.xml @@ -1,7 +1,13 @@ <?xml version="1.0" ?>
-
-
<building name="Trap" game_type="Trap" game_subtype="WeaponTrap">
- <sprite index = 355 />
-</building>
+ <sprite index="358" />
+ <!--if>
+ <NeighbourWall dir="West" />
+ <sprite index ="378" />
+ </if>
+ <if>
+ <NeighbourWall dir="North" />
+ <sprite index ="379" />
+ </if-->
+</building>
\ No newline at end of file diff --git a/resources/buildings/index.txt b/resources/buildings/index.txt index 8a61ec8..f3799dc 100644 --- a/resources/buildings/index.txt +++ b/resources/buildings/index.txt @@ -27,6 +27,7 @@ Well.xml Stockpile.xml
Zone.xml
+AnimalTrap.xml
WeaponTrap.xml
StonefallTrap.xml
CageTrap.xml
@@ -48,7 +49,7 @@ WoodFurnace.xml Forge.xml
MagmaForge.xml
Masons.xml
-Craftdwarfs.xml
+Craftsdwarfs.xml
Mechanics.xml
Butchers.xml
Loom.xml
diff --git a/resources/creatures.png b/resources/creatures.png Binary files differindex 82f1496..ec040e8 100644 --- a/resources/creatures.png +++ b/resources/creatures.png diff --git a/resources/creatures/Wildlife.xml b/resources/creatures/Wildlife.xml index fa1cd03..a28e1f7 100644 --- a/resources/creatures/Wildlife.xml +++ b/resources/creatures/Wildlife.xml @@ -1,50 +1,38 @@ <?xml version="1.0"?>
<creatures>
- <creature gameID="HUMAN" sheetIndex="100">
- <variant prof="WRESTLER" sheetIndex="80" />
- <variant prof="LASHER" sheetIndex="81" />
- <variant prof="AXEMAN" sheetIndex="82" />
- <variant prof="HAMMERMAN" sheetIndex="83" />
- <variant prof="SWORDSMAN" sheetIndex="84" />
- <variant prof="SPEARMAN" sheetIndex="85" />
- <variant prof="MACEMAN" sheetIndex="86" />
- <variant prof="CROSSBOWMAN" sheetIndex="87" />
- <variant prof="BOWMAN" sheetIndex="88" />
- <variant prof="PIKEMAN" sheetIndex="89" />
- <variant prof="TRADER" sex="M" sheetIndex="102" />
- <variant prof="MERCHANT" sex="M" sheetIndex="102" />
- <variant prof="TRADER" sex="F" sheetIndex="103" />
- <variant prof="MERCHANT" sex="F" sheetIndex="103" />
- <Profession name="CHILD" sex="M" sheetIndex="120" />
- <Profession name="CHILD" sex="F" sheetIndex="121" />
- <Profession name="BABY" sheetIndex="122" />
- <variant sex="F" sheetIndex="101" />
- </creature>
+
<creature gameID="CAT" sheetIndex="20" >
<variant prof="CHILD" sheetIndex="21" />
</creature>
+
<creature gameID="DOG" sheetIndex="22" >
<variant prof="CHILD" sheetIndex="23" />
</creature>
+
<creature gameID="MACAQUE_RHESUS" sheetIndex="2" />
<creature gameID="CAMEL_1_HUMP" sheetIndex="4" />
<creature gameID="CAMEL_2_HUMP" sheetIndex="4" />
<creature gameID="COW" sheetIndex="5" />
<creature gameID="HIPPO" sheetIndex="6" />
<creature gameID="GROUNDHOG" sheetIndex="7" />
- <creature gameID="TROLL" sheetIndex="16" />
- <creature gameID="NIGHTWING" sheetIndex="17" />
+
+ <creature gameID="HARPY" sheetIndex="11" />
+ <creature gameID="CYCLOPS" sheetIndex="12" offsety="-2"/>
+ <creature gameID="ETTIN" sheetIndex="13"offsety="-2" />
+ <creature gameID="GIANT" sheetIndex="14"offsety="-2" />
+ <creature gameID="MINOTAUR" sheetIndex="15" offsety="-2" />
+ <creature gameID="TROLL" sheetIndex="16" offsety="-2" />
+ <creature gameID="NIGHTWING" sheetIndex="17" />
<creature gameID="FISH_CONGER_EEL" sheetIndex="18" />
- <creature gameID="OGRE" sheetIndex="19" />
- <creature gameID="MULE" sheetIndex="24" color="bodypart"
- bodypart="hair" />
- <creature gameID="DONKEY" sheetIndex="24" color="bodypart"
- bodypart="hair" />
+ <creature gameID="OGRE" sheetIndex="19" offsety="-2"/>
+
+ <creature gameID="MULE" sheetIndex="24" color="bodypart" bodypart="hair" />
+ <creature gameID="DONKEY" sheetIndex="24" color="bodypart" bodypart="hair" />
<creature gameID="MUSKOX" sheetIndex="25" />
<creature gameID="HORSE" sheetIndex="26" />
<creature gameID="FISH_CARP" sheetIndex="29" />
+
<creature gameID="OLM_GIANT" sheetIndex="30" />
- <creature gameID="RATMAN" sheetIndex="31" />
<creature gameID="BEAK_DOG" sheetIndex="32" />
<creature gameID="KOBOLD" sheetIndex="33" />
<creature gameID="GOBLIN" sheetIndex="34" />
@@ -52,7 +40,20 @@ <creature gameID="SPIDER_CAVE_GIANT" sheetIndex="36" />
<creature gameID="SPIRIT_OF_FIRE" sheetIndex="38" />
<creature gameID="IMP_FIRE" sheetIndex="39" />
- <creature gameID="IMP_FIRE" sheetIndex="39" />
+
+ <creature gameID="RODENT MAN" sheetIndex="40" />
+ <creature gameID="AMPHIBIAN_MAN" sheetIndex="41" />
+ <creature gameID="REPTILE_MAN" sheetIndex="42" />
+
<creature gameID="FOX" sheetIndex="50" />
<creature gameID="TROGLODYTE" sheetIndex="52" />
+
+ <creature gameID="DRAGON">
+ <variant sheetIndex ="54" frames = "0"/>
+ <variant sheetIndex ="55" frames = "1"/>
+ <variant sheetIndex ="56" frames = "2"/>
+ <variant sheetIndex ="57" frames = "3"/>
+ <variant sheetIndex ="58" frames = "4"/>
+ <variant sheetIndex ="59" frames = "5"/>
+ </creature>
</creatures>
diff --git a/resources/creatures/caravan_animals.xml b/resources/creatures/caravan_animals.xml index 081aaf2..037dd72 100644 --- a/resources/creatures/caravan_animals.xml +++ b/resources/creatures/caravan_animals.xml @@ -61,7 +61,7 @@ </variant>
</creature>
- <creature gameID="BIRD_GEESE" file="caravan_animals.png" >
+ <creature gameID="BIRD_GOOSE" file="caravan_animals.png" >
<variant prof="CHILD" sheetIndex ="42" color = "bodypart" bodypart = "feathers" >
<subsprite sheetIndex = "43" />
</variant>
diff --git a/resources/creatures/humans.png b/resources/creatures/humans.png Binary files differnew file mode 100644 index 0000000..29e0746 --- /dev/null +++ b/resources/creatures/humans.png diff --git a/resources/creatures/humans.xml b/resources/creatures/humans.xml new file mode 100644 index 0000000..fe5598b --- /dev/null +++ b/resources/creatures/humans.xml @@ -0,0 +1,175 @@ +<?xml version="1.0" ?>
+
+<creatures>
+ <!-- default -->
+ <creature gameID="HUMAN" file="humans.png" sheetIndex="0" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="1" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="2" />
+ <subsprite sheetIndex="3" color="profession" />
+
+
+ <!-- military -->
+ <variant prof="RECRUIT" sheetIndex="0" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="40" />
+ </variant>
+
+ <variant prof="WRESTLER" sheetIndex="41" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="61" />
+ </variant>
+ <variant prof="MASTER_WRESTLER" sheetIndex="41" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="61" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="LASHER" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="62" />
+ </variant>
+ <variant prof="MASTER_LASHER" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="62" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="AXEMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="63" />
+ </variant>
+ <variant prof="MASTER_AXEMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="63" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="HAMMERMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="64" />
+ </variant>
+ <variant prof="MASTER_HAMMERMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="64" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="SWORDSMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="65" />
+ </variant>
+ <variant prof="MASTER_SWORDSMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="65" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="SPEARMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="66" />
+ </variant>
+ <variant prof="MASTER_SPEARMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="66" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="MACEMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="67" />
+ </variant>
+ <variant prof="MASTER_MACEMAN" sheetIndex="42" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="67" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+
+ <variant prof="CROSSBOWMAN" sheetIndex="48" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="68" />
+ </variant>
+ <variant prof="MASTER_CROSSBOWMAN" sheetIndex="48" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="68" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="BOWMAN" sheetIndex="48" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="69" />
+ </variant>
+ <variant prof="MASTER_BOWMAN" sheetIndex="48" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="69" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="BLOWGUNMAN" sheetIndex="48" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="70" />
+ </variant>
+ <variant prof="MASTER_BLOWGUNMAN" sheetIndex="48" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="70" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <variant prof="PIKEMAN" sheetIndex="51" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="71" />
+ </variant>
+ <variant prof="MASTER_PIKEMAN" sheetIndex="51" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="71" />
+ <subsprite sheetIndex="60" offsety="-2" />
+ </variant>
+
+ <!-- purple guys -->
+ <variant prof="CLERK" sex="M" sheetIndex="0" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="1" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="4" />
+ </variant>
+ <variant prof="CLERK" sex="F" sheetIndex="20" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="21" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="24" />
+ </variant>
+
+ <variant prof="ADMINISTRATOR" sex="M" sheetIndex="5" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="6" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="7" /><!-- need colors -->
+ </variant>
+ <variant prof="ADMINISTRATOR" sex="F" sheetIndex="25" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="26" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="27" /><!-- need colors -->
+ </variant>
+
+ <variant prof="TRADER" sex="M" sheetIndex="11" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="6" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="13" /><!-- need colors -->
+ </variant>
+ <variant prof="TRADER" sex="F" sheetIndex="31" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="32" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="33" /><!-- need colors -->
+ </variant>
+
+
+ <!-- non-playable -->
+ <variant prof="MERCHANT" sex="M" sheetIndex="9" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="6" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="10" />
+ </variant>
+ <variant prof="MERCHANT" sex="F" sheetIndex="29" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="26" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="30" />
+ </variant>
+
+ <!--variant prof="SHOPKEEPER" sex="M" sheetIndex="11" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="6" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="14" />
+ </variant>
+ <variant prof="SHOPKEEPER" sex="F" sheetIndex="31" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="32" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="34" />
+ </variant-->
+
+
+ <!-- children -->
+ <variant prof="CHILD" sex="M" sheetIndex="15" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="35" color="bodypart" bodypart="hair" /><!-- variations="2"-->
+ <subsprite sheetIndex="16" />
+ </variant>
+ <variant prof="CHILD" sex="F" sheetIndex="15" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="37" color="bodypart" bodypart="hair" /><!-- sheetIndex="36" variations="2"-->
+ <subsprite sheetIndex="17" />
+ </variant>
+ <variant prof="BABY" sheetIndex="18" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="39" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="19" />
+ </variant>
+
+ <!-- default female -->
+ <variant sex="F" sheetIndex="20" color="bodypart" bodypart="skin">
+ <subsprite sheetIndex="21" color="bodypart" bodypart="hair" />
+ <subsprite sheetIndex="22" />
+ <subsprite sheetIndex="23" color="profession" />
+ </variant>
+ </creature>
+</creatures>
\ No newline at end of file diff --git a/resources/creatures/humies.png b/resources/creatures/humies.png Binary files differdeleted file mode 100644 index 6558aed..0000000 --- a/resources/creatures/humies.png +++ /dev/null diff --git a/resources/creatures/humies.xml b/resources/creatures/humies.xml deleted file mode 100644 index 7f0102e..0000000 --- a/resources/creatures/humies.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?>
-<creatures>
- <creature gameID="HUMAN" sheetIndex="0" file="humies.png" color="bodypart" bodypart="skin">
- <subsprite sheetIndex="1" color="bodypart" bodypart="hair" />
- <subsprite sheetIndex="2" />
- <subsprite sheetIndex="3" color="profession" />
- <variant sex="F" sheetIndex="4" color="bodypart" bodypart="skin">
- <subsprite sheetIndex="5" color="bodypart" bodypart="hair" />
- <subsprite sheetIndex="6" />
- <subsprite sheetIndex="7" color="profession" />
- </variant>
- </creature>
-</creatures>
diff --git a/resources/creatures/index.txt b/resources/creatures/index.txt index b76a347..649142c 100644 --- a/resources/creatures/index.txt +++ b/resources/creatures/index.txt @@ -4,7 +4,7 @@ caravan_animals.xml beefmo_large_ocean.xml
beefmo_subterranean.xml
-humies.xml
+humans.xml
elfs.xml
wild_animals.xml
#goblins.xml
diff --git a/resources/objects.png b/resources/objects.png Binary files differindex 3c812bc..7557899 100644 --- a/resources/objects.png +++ b/resources/objects.png diff --git a/resources/terrain/Floors.xml b/resources/terrain/Floors.xml index 04ae837..ed977a3 100644 --- a/resources/terrain/Floors.xml +++ b/resources/terrain/Floors.xml @@ -2,10 +2,10 @@ <floors file="floors.png">
<!-- watery -->
<floor sheetIndex="4" color = "material">
- <!-- add some mud on top-->
- <subsprite sheetIndex="18"/>
<!-- pool -->
<terrain value="2" />
+ <!-- below pool ramp -->
+ <terrain value="3" />
<!-- waterfall -->
<terrain value="89" />
<!-- river src -->
@@ -19,6 +19,15 @@ <terrain value="370" />
<terrain value="371" />
<terrain value="372" />
+ <!-- below river ramp -->
+ <terrain value="469" />
+ <terrain value="470" />
+ <terrain value="471" />
+ <terrain value="472" />
+ <terrain value="473" />
+ <terrain value="474" />
+ <terrain value="475" />
+ <terrain value="476" />
<!-- stream -->
<terrain value="373" />
<terrain value="374" />
diff --git a/resources/terrain/Walls.xml b/resources/terrain/Walls.xml index f3cac3d..c8a53a2 100644 --- a/resources/terrain/Walls.xml +++ b/resources/terrain/Walls.xml @@ -30,9 +30,20 @@ <terrain value="234" />
<subsprite sheetIndex="9" file="ramps.png" />
</block>
- <block sheetIndex="8" file="ramps.png" color = "material">
+ <block sheetIndex="8" file="ramps.png" color = "material">
<!-- soil -->
<terrain value="241" />
+ <!-- murky pool -->
+ <terrain value="3" />
+ <!-- river -->
+ <terrain value="469" />
+ <terrain value="470" />
+ <terrain value="471" />
+ <terrain value="472" />
+ <terrain value="473" />
+ <terrain value="474" />
+ <terrain value="475" />
+ <terrain value="476" />
</block>
<!-- stone -->
|
