diff options
| author | 8Z | 2012-05-27 22:20:13 +0500 |
|---|---|---|
| committer | 8Z | 2012-05-27 22:20:13 +0500 |
| commit | 482329b1f2529e0174388245e523574c4cb07583 (patch) | |
| tree | e297f6a9c00c1b4b89b554e02f9dac9901f3b124 | |
| parent | 44a43fb004ff045884fbc5a67730302e3165e676 (diff) | |
| download | stonesense-482329b1f2529e0174388245e523574c4cb07583.tar.gz stonesense-482329b1f2529e0174388245e523574c4cb07583.tar.bz2 stonesense-482329b1f2529e0174388245e523574c4cb07583.tar.xz | |
Objects.png tweaking:
Some sprites were mispositioned (cut-off pixels and such).
Grayscaled cage, wall grates, and archery target.
Type-based trap variants + animal trap.
| -rw-r--r-- | resources/buildings/AnimalTrap.xml | 5 | ||||
| -rw-r--r-- | resources/buildings/Cage.xml | 23 | ||||
| -rw-r--r-- | resources/buildings/CageTrap.xml | 4 | ||||
| -rw-r--r-- | resources/buildings/DoorsAndFloodgates.png | bin | 15358 -> 15360 bytes | |||
| -rw-r--r-- | resources/buildings/Kennels.xml | 4 | ||||
| -rw-r--r-- | resources/buildings/Spikes.xml | 14 | ||||
| -rw-r--r-- | resources/buildings/StonefallTrap.xml | 4 | ||||
| -rw-r--r-- | resources/buildings/Target.xml | 46 | ||||
| -rw-r--r-- | resources/buildings/WallGrate.xml | 6 | ||||
| -rw-r--r-- | resources/buildings/WeaponTrap.xml | 14 | ||||
| -rw-r--r-- | resources/buildings/index.txt | 1 | ||||
| -rw-r--r-- | resources/objects.png | bin | 43552 -> 44123 bytes |
12 files changed, 82 insertions, 39 deletions
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/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/DoorsAndFloodgates.png b/resources/buildings/DoorsAndFloodgates.png Binary files differindex 2d90c3c..047a70e 100644 --- a/resources/buildings/DoorsAndFloodgates.png +++ b/resources/buildings/DoorsAndFloodgates.png 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/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/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 05105f1..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
diff --git a/resources/objects.png b/resources/objects.png Binary files differindex 3c812bc..3c9c057 100644 --- a/resources/objects.png +++ b/resources/objects.png |
