Merge branch 'master' into mkxp-z

Data/Scripts/021_Debug/002_Debug_Actions.rb

@@ -82,9 +82,16 @@ class SpriteWindow_DebugVariables < Window_DrawableCommand
       name = $data_system.switches[index+1]
       codeswitch = (name[/^s\:/])
       val = (codeswitch) ? (eval($~.post_match) rescue nil) : $game_switches[index+1]
-      if val==nil; status = "[-]"; colors = 0; codeswitch = true
-      elsif val;   status = "[ON]"; colors = 2
-      else;        status = "[OFF]"; colors = 1
+      if val==nil
+        status = "[-]"
+        colors = 0
+        codeswitch = true
+      elsif val
+        status = "[ON]"
+        colors = 2
+      else
+        status = "[OFF]"
+        colors = 1
       end
     else
       name = $data_system.variables[index+1]
@@ -791,6 +798,76 @@ def pbImportAllAnimations
   end
 end
 
+#===============================================================================
+# Properly erases all non-existent tiles in maps (including event graphics)
+#===============================================================================
+def pbDebugFixInvalidTiles
+  num_errors = 0
+  num_error_maps = 0
+  @tilesets = pbLoadRxData("Data/Tilesets")
+  mapData = MapData.new
+  t = Time.now.to_i
+  Graphics.update
+  for id in mapData.mapinfos.keys.sort
+    if Time.now.to_i - t >= 5
+      Graphics.update
+      t = Time.now.to_i
+    end
+    changed = false
+    map = mapData.getMap(id)
+    next if !map || !mapData.mapinfos[id]
+    Win32API.SetWindowText(_INTL("Processing map {1} ({2})", id, mapData.mapinfos[id].name))
+    passages = mapData.getTilesetPassages(map, id)
+    # Check all tiles in map for non-existent tiles
+    for x in 0...map.data.xsize
+      for y in 0...map.data.ysize
+        for i in 0...map.data.zsize
+          tile_id = map.data[x, y, i]
+          next if pbCheckTileValidity(tile_id, map, @tilesets, passages)
+          map.data[x, y, i] = 0
+          changed = true
+          num_errors += 1
+        end
+      end
+    end
+    # Check all events in map for page graphics using a non-existent tile
+    for key in map.events.keys
+      event = map.events[key]
+      for page in event.pages
+        next if page.graphic.tile_id <= 0
+        next if pbCheckTileValidity(page.graphic.tile_id, map, @tilesets, passages)
+        page.graphic.tile_id = 0
+        changed = true
+        num_errors += 1
+      end
+    end
+    next if !changed
+    # Map was changed; save it
+    num_error_maps += 1
+    mapData.saveMap(id)
+  end
+  if num_error_maps == 0
+    pbMessage(_INTL("No invalid tiles were found."))
+  else
+    pbMessage(_INTL("{1} error(s) were found across {2} map(s) and fixed.", num_errors, num_error_maps))
+    pbMessage(_INTL("Close RPG Maker XP to ensure the changes are applied properly."))
+  end
+end
+
+def pbCheckTileValidity(tile_id, map, tilesets, passages)
+  return false if !tile_id
+  if tile_id > 0 && tile_id < 384
+    # Check for defined autotile
+    autotile_id = tile_id / 48 - 1
+    autotile_name = tilesets[map.tileset_id].autotile_names[autotile_id]
+    return true if autotile_name && autotile_name != ""
+  else
+    # Check for tileset data
+    return true if passages[tile_id]
+  end
+  return false
+end
+
 
 
 #===============================================================================