Skip to content

Commit

Permalink
Added in some building fixes by AO.
Browse files Browse the repository at this point in the history
  • Loading branch information
@RosaryMala
RosaryMala committed Mar 29, 2011
1 parent cb2648b commit e3dbd77
Show file tree
Hide file tree
Showing 12 changed files with 1,146 additions and 106 deletions.
198 changes: 182 additions & 16 deletions buildings/Door.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,195 @@
<?xml version="1.0"?>
<building name="Door" gameID="building_doorst">
<if>
<building name="Door" gameID="building_doorst" file="DoorsAndFloodgates.png">
<if><!-- if there is wall at north or south -->
<or>
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
</or>
<if>
<if><!-- material is wood -->
<MaterialType value="Wood" />
<sprite index="3" file="doorsAndWindows.png"
color="building" />
<sprite index="23" file="doorsAndWindows.png" />
<sprite index="3" color="building" />
<if><!-- at south is other door then need to turn a handle -->
<NeighbourSameType dir="South" />
<sprite index="43" />
</if>
<else>
<sprite index="23" />
</else>
</if>
<else>
<sprite index="1" file="doorsAndWindows.png"
color="building" />
<else><!-- material is any 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="5" color="building" />
<if><!-- if at south is other door then need to turn a handle -->
<NeighbourSameType dir="South" />
<sprite index="45" color="building" />
</if>
<else>
<sprite index="25" color="building" />
</else>

</else>
<else><!-- material is clear glass -->
<MaterialType value="ClearGlass" />
<sprite index="7" />
<if><!-- at south is other door then need to turn a handle -->
<NeighbourSameType dir="South" />
<sprite index="47" />
</if>
<else>
<sprite index="27" />
</else>
</else>
<else><!-- material is green glass -->
<MaterialType value="GreenGlass" />
<sprite index="9" />
<if><!-- at south is other door then need to turn a handle -->
<NeighbourSameType dir="South" />
<sprite index="49" />
</if>
<else>
<sprite index="29" />
</else>
</else>
<else><!-- material is crystal glass -->
<MaterialType value="CrystalGlass" />
<sprite index="11" />
<if><!-- at south is other door then need to turn a handle -->
<NeighbourSameType dir="South" />
<sprite index="51" />
</if>
<else>
<sprite index="31" />
</else>
</else>
<else><!-- material isn't wood, any kind of metall or glass -->
<sprite index="1" color="building" />
<if><!-- at south is other door then still need to turn a handle -->
<NeighbourSameType dir="South" />
<sprite index="41" />
</if>
<else>
<sprite index="21" />
</else>
</else>
</if>
<else>
<!-- if there is no wall at north or south -->
<else><!-- material is wood -->
<MaterialType value="Wood" />
<sprite index="2" file="doorsAndWindows.png"
color="building" />
<sprite index="22" file="doorsAndWindows.png" />
<sprite index="2" color="building" />
<if><!-- at west is other door then need to turn a handle -->
<NeighbourSameType dir="West" />
<sprite index="42" />
</if>
<else>
<sprite index="22" />
</else>
</else>
<else><!-- material is any 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="4" color="building" />
<if><!-- at west is other door then need to turn a handle -->
<NeighbourSameType dir="West" />
<sprite index="44" color="building" />
</if>
<else>
<sprite index="24" color="building" />
</else>
</else>
<else><!-- material is clear glass -->
<MaterialType value="ClearGlass" />
<sprite index="6" />
<if><!-- at west is other door then need to turn a handle -->
<NeighbourSameType dir="West" />
<sprite index="46" />
</if>
<else>
<sprite index="26" />
</else>
</else>
<else><!-- material is green glass -->
<MaterialType value="GreenGlass" />
<sprite index="8" />
<if><!-- at west is other door then need to turn a handle -->
<NeighbourSameType dir="West" />
<sprite index="48" />
</if>
<else>
<sprite index="28" />
</else>
</else>
<else><!-- material is crystal glass -->
<MaterialType value="CrystalGlass" />
<sprite index="10" />
<if><!-- at west is other door then need to turn a handle -->
<NeighbourSameType dir="West" />
<sprite index="50" />
</if>
<else>
<sprite index="30" />
</else>
</else>
<else>
<sprite index="0" file="doorsAndWindows.png"
color="building" />
<else><!-- material isn't wood, any kind of metall or glass -->
<sprite index="0" color="building" />
<if><!-- at west is other door then still need to turn a handle -->
<NeighbourSameType dir="West" />
<sprite index="40" color="building" />
</if>
<else>
<sprite index="20" color="building" />
</else>
</else>
</building>
Binary file added buildings/DoorsAndFloodgates.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
107 changes: 75 additions & 32 deletions buildings/Floodgate.xml
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,90 @@
<?xml version="1.0" ?>

<building name="Floodgate" gameID="building_floodgatest" file="DoorsAndFloodgates.png">


<building name="Floodgate" gameID="building_floodgatest" file="doorsAndWindows.png">

<if>
<BuildingOccupancy value="2" />
<empty/>
<if><!-- wooden -->
<MaterialType value="Wood" />
<if><!-- wooden & opened -->
<BuildingOccupancy value="2" />
<sprite index="33" color="building" />
</if>
<else>
<sprite index="13" color="building" />
<sprite index="53" />
</else>
</if>
<else>
<else><!-- some kind of metall -->
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
<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>
<if>
<MaterialType value="Wood" />
<sprite index=3 color="building" />
<sprite index=23 />
<if><!-- some kind of metall & opened -->
<BuildingOccupancy value="2" />
<sprite index="34" color="building" />
</if>
<else>
<sprite index=1 color="building" />
</else>
<sprite index="14" color="building" />
</else>
</else>
<else><!-- GreenGlass -->
<MaterialType value="GreenGlass" />
<if><!-- GreenGlass & opened -->
<BuildingOccupancy value="2" />
<sprite index="36" />
</if>
<else>
<sprite index="55" /><!-- frame -->
<sprite index="16" /><!-- green glass block -->
<sprite index="56" /><!-- frame -->
</else>
</else>
<else>
<else><!-- ClearGlass or CrystalGlass -->
<or>
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
<MaterialType value="ClearGlass" />
<MaterialType value="CrystalGlass" />
</or>
<if>
<MaterialType value="Wood" />
<sprite index=3 color="building" />
<sprite index=23 />
<if><!-- ClearGlass or CrystalGlass & opened -->
<BuildingOccupancy value="2" />
<sprite index="35" color="building" /><!-- glass block -->
<sprite index="57" /><!-- frame -->
</if>
<else>
<sprite index=1 color="building" />
</else>
</else>
<else>
<MaterialType value="Wood" />
<sprite index = 2 color="building" />
<sprite index=22 />
<sprite index="55" /><!-- frame -->
<sprite index="15" color="building" /><!-- glass block -->
<sprite index="56" /><!-- frame -->
</else>
</else>
<else>
<sprite index = 0 color="building" />
<else><!-- any other material (e.g. stone) -->
<if><!-- any other material & opened -->
<BuildingOccupancy value="2" />
<sprite index="32" color="building" />
</if>
<else>
<sprite index="12" color="building" />
</else>
</else>
</building>
</building>
31 changes: 31 additions & 0 deletions buildings/Table.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,37 @@
<MaterialType value="Wood" />
<sprite index="82" 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="63" color="building" />
</else>
<else>
<sprite index="83" color="building" >
<subsprite sheetIndex = "62" bloodmin = "1" color = "blood" />
Expand Down
Loading

0 comments on commit e3dbd77

Please sign in to comment.