summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJapa Illo2012-03-15 14:08:20 +0100
committerJapa Illo2012-03-15 14:08:20 +0100
commitbb7bcc00c4eb2e46e5d7141fb2d0ce8a30386568 (patch)
tree584a0ff1e4c7df2fde5146270781793c80b8bb21
parent1bd9b2a540e52795cd3a9fbc402a1ee9736e1b70 (diff)
downloadstonesense-bb7bcc00c4eb2e46e5d7141fb2d0ce8a30386568.tar.gz
stonesense-bb7bcc00c4eb2e46e5d7141fb2d0ce8a30386568.tar.bz2
stonesense-bb7bcc00c4eb2e46e5d7141fb2d0ce8a30386568.tar.xz
Fixed building neighbor detection
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
-rw-r--r--BlockCondition.cpp15
-rw-r--r--resources/buildings/HorizontalAxle.xml24
-rw-r--r--resources/buildings/WindowGem.xml176
-rw-r--r--resources/buildings/WindowGlass.xml176
4 files changed, 195 insertions, 196 deletions
diff --git a/BlockCondition.cpp b/BlockCondition.cpp
index 8932de1..022b32b 100644
--- a/BlockCondition.cpp
+++ b/BlockCondition.cpp
@@ -32,14 +32,13 @@ int getDirectionFromString(const char* strDir)
int getBuildingFromString(const char* strType)
{
- /*
- for (uint32_t i=0; i<contentLoader->classIdStrings.size(); i++){
- if (contentLoader->classIdStrings[i].compare(strType) == 0)
- {
- return i;
- }
- }
- */
+ FOR_ENUM_ITEMS(building_type,i)
+ {
+ if (strcmp(strType,ENUM_KEY_STR(building_type,i)) == 0)
+ {
+ return i;
+ }
+ }
return INVALID_INDEX;
}
diff --git a/resources/buildings/HorizontalAxle.xml b/resources/buildings/HorizontalAxle.xml
index dbc8526..4a25673 100644
--- a/resources/buildings/HorizontalAxle.xml
+++ b/resources/buildings/HorizontalAxle.xml
@@ -30,8 +30,8 @@
<!-- look for gears preferentially -->
<else>
<or>
- <NeighbourOfType dir="East" value="building_gear_assembly"/>
- <NeighbourOfType dir="West" value="building_gear_assembly"/>
+ <NeighbourOfType dir="East" value="GearAssembly"/>
+ <NeighbourOfType dir="West" value="GearAssembly"/>
</or>
<sprite index = 6 frame="024" color = "building" />
<sprite index = 7 frame="135" color = "building" />
@@ -40,8 +40,8 @@
</else>
<else>
<or>
- <NeighbourOfType dir="North" value="building_gear_assembly"/>
- <NeighbourOfType dir="South" value="building_gear_assembly"/>
+ <NeighbourOfType dir="North" value="GearAssembly"/>
+ <NeighbourOfType dir="South" value="GearAssembly"/>
</or>
<sprite index = 4 frame="024" color = "building" />
<sprite index = 5 frame="135" color = "building" />
@@ -51,14 +51,14 @@
<!-- any other hints -->
<else>
<or>
- <NeighbourOfType dir="East" value="building_water_wheel"/>
- <NeighbourOfType dir="West" value="building_water_wheel"/>
- <NeighbourOfType dir="East" value="building_screw_pump"/>
- <NeighbourOfType dir="West" value="building_screw_pump"/>
- <NeighbourOfType dir="East" value="building_millstone"/>
- <NeighbourOfType dir="West" value="building_millstone"/>
- <NeighbourOfType dir="East" value="building_axle_horizontal"/>
- <NeighbourOfType dir="West" value="building_axle_horizontal"/>
+ <NeighbourOfType dir="East" value="WaterWheel"/>
+ <NeighbourOfType dir="West" value="WaterWheel"/>
+ <NeighbourOfType dir="East" value="ScrewPump"/>
+ <NeighbourOfType dir="West" value="ScrewPump"/>
+ <NeighbourOfType dir="East" value="Millstone"/>
+ <NeighbourOfType dir="West" value="Millstone"/>
+ <NeighbourOfType dir="East" value="AxleHorizontal"/>
+ <NeighbourOfType dir="West" value="AxleHorizontal"/>
</or>
<sprite index = 6 frame="024" color = "building" />
<sprite index = 7 frame="135" color = "building" />
diff --git a/resources/buildings/WindowGem.xml b/resources/buildings/WindowGem.xml
index b8ad757..802dfca 100644
--- a/resources/buildings/WindowGem.xml
+++ b/resources/buildings/WindowGem.xml
@@ -10,10 +10,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
</or>
@@ -21,10 +21,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="West" />
</or>
@@ -38,10 +38,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="West" />
</or>
@@ -49,10 +49,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
</or>
@@ -67,26 +67,26 @@
<and>
<or>
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="East" />
</or>
<or>
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="West" />
</or>
<or>
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="North" />
</or>
<or>
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="South" />
</or>
</and>
@@ -100,10 +100,10 @@
<or>
<NeighbourSameType dir="South" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="South" />
<NeighbourWall dir="East" />
</or>
@@ -111,10 +111,10 @@
<or>
<NeighbourSameType dir="West" />
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="West" />
<NeighbourWall dir="North" />
</or>
@@ -128,10 +128,10 @@
<or>
<NeighbourSameType dir="South" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="South" />
<NeighbourWall dir="West" />
</or>
@@ -139,10 +139,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="North" />
</or>
@@ -156,10 +156,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="West" />
</or>
@@ -167,10 +167,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="South" />
</or>
@@ -184,10 +184,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="East" />
</or>
@@ -195,10 +195,10 @@
<or>
<NeighbourSameType dir="West" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="West" />
<NeighbourWall dir="South" />
</or>
@@ -216,12 +216,12 @@
<NeighbourSameType dir="South" />
<NeighbourSameType dir="West" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="South" />
<NeighbourWall dir="West" />
<NeighbourWall dir="East" />
@@ -229,8 +229,8 @@
<not>
<or>
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="North" />
</or>
</not>
@@ -244,12 +244,12 @@
<NeighbourSameType dir="North" />
<NeighbourSameType dir="West" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="West" />
<NeighbourWall dir="East" />
@@ -257,8 +257,8 @@
<not>
<or>
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="South" />
</or>
</not>
@@ -272,12 +272,12 @@
<NeighbourSameType dir="North" />
<NeighbourSameType dir="East" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="East" />
<NeighbourWall dir="South" />
@@ -285,8 +285,8 @@
<not>
<or>
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="West" />
</or>
</not>
@@ -300,12 +300,12 @@
<NeighbourSameType dir="West" />
<NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="West" value="building_window_glassst"/>
- <NeighbourOfType dir="North" value="building_window_glassst"/>
- <NeighbourOfType dir="South" value="building_window_glassst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGlass"/>
+ <NeighbourOfType dir="North" value="WindowGlass"/>
+ <NeighbourOfType dir="South" value="WindowGlass"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="West" />
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
@@ -313,8 +313,8 @@
<not>
<or>
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="East" value="building_window_glassst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGlass"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="East" />
</or>
</not>
diff --git a/resources/buildings/WindowGlass.xml b/resources/buildings/WindowGlass.xml
index 69b1485..7c2d6c5 100644
--- a/resources/buildings/WindowGlass.xml
+++ b/resources/buildings/WindowGlass.xml
@@ -11,10 +11,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
</or>
@@ -22,10 +22,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="West" />
</or>
@@ -48,10 +48,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="West" />
</or>
@@ -59,10 +59,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
</or>
@@ -86,26 +86,26 @@
<and>
<or>
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="East" />
</or>
<or>
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="West" />
</or>
<or>
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="North" />
</or>
<or>
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="South" />
</or>
</and>
@@ -128,10 +128,10 @@
<or>
<NeighbourSameType dir="South" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="South" />
<NeighbourWall dir="East" />
</or>
@@ -139,10 +139,10 @@
<or>
<NeighbourSameType dir="West" />
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="West" />
<NeighbourWall dir="North" />
</or>
@@ -165,10 +165,10 @@
<or>
<NeighbourSameType dir="South" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="South" />
<NeighbourWall dir="West" />
</or>
@@ -176,10 +176,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="North" />
</or>
@@ -202,10 +202,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="West" />
</or>
@@ -213,10 +213,10 @@
<or>
<NeighbourSameType dir="East" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="East" />
<NeighbourWall dir="South" />
</or>
@@ -239,10 +239,10 @@
<or>
<NeighbourSameType dir="North" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="East" />
</or>
@@ -250,10 +250,10 @@
<or>
<NeighbourSameType dir="West" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="West" />
<NeighbourWall dir="South" />
</or>
@@ -279,12 +279,12 @@
<NeighbourSameType dir="South" />
<NeighbourSameType dir="West" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="South" />
<NeighbourWall dir="West" />
<NeighbourWall dir="East" />
@@ -292,8 +292,8 @@
<not>
<or>
<NeighbourSameType dir="North" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
<NeighbourWall dir="North" />
</or>
</not>
@@ -316,12 +316,12 @@
<NeighbourSameType dir="North" />
<NeighbourSameType dir="West" />
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="West" />
<NeighbourWall dir="East" />
@@ -329,8 +329,8 @@
<not>
<or>
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="South" />
</or>
</not>
@@ -353,12 +353,12 @@
<NeighbourSameType dir="North" />
<NeighbourSameType dir="East" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="East" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="North" />
<NeighbourWall dir="East" />
<NeighbourWall dir="South" />
@@ -366,8 +366,8 @@
<not>
<or>
<NeighbourSameType dir="West" />
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="Door"/>
<NeighbourWall dir="West" />
</or>
</not>
@@ -390,12 +390,12 @@
<NeighbourSameType dir="West" />
<NeighbourSameType dir="North" />
<NeighbourSameType dir="South" />
- <NeighbourOfType dir="West" value="building_window_gemst"/>
- <NeighbourOfType dir="North" value="building_window_gemst"/>
- <NeighbourOfType dir="South" value="building_window_gemst"/>
- <NeighbourOfType dir="West" value="building_doorst"/>
- <NeighbourOfType dir="North" value="building_doorst"/>
- <NeighbourOfType dir="South" value="building_doorst"/>
+ <NeighbourOfType dir="West" value="WindowGem"/>
+ <NeighbourOfType dir="North" value="WindowGem"/>
+ <NeighbourOfType dir="South" value="WindowGem"/>
+ <NeighbourOfType dir="West" value="Door"/>
+ <NeighbourOfType dir="North" value="Door"/>
+ <NeighbourOfType dir="South" value="Door"/>
<NeighbourWall dir="West" />
<NeighbourWall dir="North" />
<NeighbourWall dir="South" />
@@ -403,8 +403,8 @@
<not>
<or>
<NeighbourSameType dir="East" />
- <NeighbourOfType dir="East" value="building_window_gemst"/>
- <NeighbourOfType dir="East" value="building_doorst"/>
+ <NeighbourOfType dir="East" value="WindowGem"/>
+ <NeighbourOfType dir="East" value="Door"/>
<NeighbourWall dir="East" />
</or>
</not>