Change: replace tile checks with badge checks

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "nml"]
-	path = nml
-	url = https://github.com/openttd/nml
+    path = nml
+    url = https://github.com/petern/nml
+    branch = newgrf-badges

item_template.py

@@ -32,6 +32,8 @@
         name: string(STR_STAT_${name_label});
         tile_flags: [""" + ",\n".join("bitmask(STAT_TILE_NOWIRE)" for i in range(8)) +
 """            ];
+        badges: [ "station/wins/left_yard",
+                  "station/wins/right_yard" ];
     } graphics {
         prepare_layout: sw_item_${name}_prepare();
         custom_spritesets: [s_fences_and_underlay];

src/yard.pnml

@@ -80,19 +80,45 @@ switch(FEAT_STATIONS, SELF, _sw_yard_type, track_type){
 
 const none_yard = FILLED(2);
 
+switch(FEAT_STATIONS, SELF, _sw_check_yard_p0n1, [
+    STORE_TEMP(badgetype("station/wins/right_yard"), 0x100),
+    STORE_TEMP(bitmask(4), 0x101),
+    var[0x79, 0, 0x1, 0xF0]]){return;}
+
+switch(FEAT_STATIONS, SELF, _sw_check_yard_n1p0, [
+    STORE_TEMP(badgetype("station/wins/right_yard"), 0x100),
+    STORE_TEMP(bitmask(4), 0x101),
+    var[0x79, 0, 0x1, 0x0F]]){return;}
+
+switch(FEAT_STATIONS, SELF, _sw_check_yard_n1n1, [
+    STORE_TEMP(badgetype("station/wins/right_yard"), 0x100),
+    STORE_TEMP(bitmask(4), 0x101),
+    var[0x79, 0, 0x1, 0xFF]]){return;}
+
+switch(FEAT_STATIONS, SELF, _sw_check_yard_p1p0, [
+    STORE_TEMP(badgetype("station/wins/right_yard"), 0x100),
+    STORE_TEMP(bitmask(4), 0x101),
+    var[0x79, 0, 0x1, 0x01]]){return;}
+
+switch(FEAT_STATIONS, SELF, _sw_check_yard_p1n1, [
+    STORE_TEMP(badgetype("station/wins/right_yard"), 0x100),
+    STORE_TEMP(bitmask(4), 0x101),
+    var[0x79, 0, 0x1, 0xF1]]){return;}
+
+
 //TODO: change to test badges instead of station presence
 // 0: front split, back split
 // 1: front merge, back split
 // 2: front split, back merge
 // 3: none
 switch(FEAT_STATIONS, SELF, _sw_yard_info_left,
-    !nearby_tile_is_station(0, -1) || !sw_tile_same_height_left() ? none_yard :
+    !_sw_check_yard_p0n1() || !sw_tile_same_height_left() ? none_yard :
     (
         (
             !(
                 (
-                    nearby_tile_is_station(-1,  0) && // replace with badge test
-                    nearby_tile_is_station(-1, -1) && // replace with badge test
+                    _sw_check_yard_n1p0() && // replace with badge test
+                    _sw_check_yard_n1n1() && // replace with badge test
                     hasbit(rail_continuation, 1)
                 ) ||
                 (
@@ -104,8 +130,8 @@ switch(FEAT_STATIONS, SELF, _sw_yard_info_left,
         (
             !(
                 (
-                    nearby_tile_is_station( 1,  0) && // replace with badge test
-                    nearby_tile_is_station( 1, -1) && // replace with badge test
+                    _sw_check_yard_p1p0() && // replace with badge test
+                    _sw_check_yard_p1n1() && // replace with badge test
                     hasbit(rail_continuation, 0)
                 ) ||
                 (

wins.pnml

@@ -2,6 +2,11 @@
 #include "src/header.pnml"
 #include "src/utility.pnml"
 
+badgetable {
+    "station/wins/left_yard",
+    "station/wins/right_yard",
+}
+
 #include "src/spritesets.pnml"
 #include "src/fences.pnml"
 #include "src/yard.pnml"