Rewrote the random dungeon generator code

Data/Scripts/021_Compiler/001_Compiler.rb

@@ -774,6 +774,8 @@ module Compiler
     compile_trainer_lists     # Depends on TrainerType
     compile_metadata          # Depends on TrainerType
     compile_map_metadata
+    compile_dungeon_tilesets
+    compile_dungeon_parameters
     compile_phone             # Depends on TrainerType
   end
 
@@ -805,6 +807,8 @@ module Compiler
       dataFiles = [
         "abilities.dat",
         "berry_plants.dat",
+        "dungeon_parameters.dat",
+        "dungeon_tilesets.dat",
         "encounters.dat",
         "items.dat",
         "map_connections.dat",
@@ -828,6 +832,8 @@ module Compiler
         "abilities.txt",
         "battle_facility_lists.txt",
         "berry_plants.txt",
+        "dungeon_parameters.txt",
+        "dungeon_tilesets.txt",
         "encounters.txt",
         "items.txt",
         "map_connections.txt",

Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb

@@ -1848,6 +1848,110 @@ module Compiler
     process_pbs_file_message_end
   end
 
+  #=============================================================================
+  # Compile dungeon tileset data
+  #=============================================================================
+  def compile_dungeon_tilesets(path = "PBS/dungeon_tilesets.txt")
+    compile_pbs_file_message_start(path)
+    GameData::DungeonTileset::DATA.clear
+    schema = GameData::DungeonTileset::SCHEMA
+    tileset_hash = nil
+    # Read each line of dungeon_tilesets.txt at a time and compile it as a tileset property
+    idx = 0
+    pbCompilerEachPreppedLine(path) { |line, line_no|
+      echo "." if idx % 50 == 0
+      idx += 1
+      Graphics.update if idx % 250 == 0
+      if line[/^\s*\[\s*(.+)\s*\]\s*$/]
+        # New section
+        # Add tileset's data to records
+        GameData::DungeonTileset.register(tileset_hash) if tileset_hash
+        # Construct tileset hash
+        tileset_hash = {
+          :id       => $~[1].to_i,
+          :tile     => [],
+          :autotile => []
+        }
+      elsif line[/^\s*(\w+)\s*=\s*(.*)$/]
+        # XXX=YYY lines
+        if !tileset_hash
+          raise _INTL("Expected a section at the beginning of the file.\r\n{1}", FileLineData.linereport)
+        end
+        property_name = $~[1]
+        line_schema = schema[property_name]
+        next if !line_schema
+        property_value = pbGetCsvRecord($~[2], line_no, line_schema)
+        # Record XXX=YYY setting
+        case property_name
+        when "Tile", "Autotile"
+          tileset_hash[line_schema[0]].push(property_value)
+        else
+          tileset_hash[line_schema[0]] = property_value
+        end
+      end
+    }
+    # Add last tileset's data to records
+    GameData::DungeonTileset.register(tileset_hash) if tileset_hash
+    # Save all data
+    GameData::DungeonTileset.save
+    process_pbs_file_message_end
+  end
+
+  #=============================================================================
+  # Compile dungeon parameters data
+  #=============================================================================
+  def compile_dungeon_parameters(path = "PBS/dungeon_parameters.txt")
+    compile_pbs_file_message_start(path)
+    GameData::DungeonParameters::DATA.clear
+    schema = GameData::DungeonParameters::SCHEMA
+    # Read from PBS file
+    File.open(path, "rb") { |f|
+      FileLineData.file = path   # For error reporting
+      # Read a whole section's lines at once, then run through this code.
+      # contents is a hash containing all the XXX=YYY lines in that section, where
+      # the keys are the XXX and the values are the YYY (as unprocessed strings).
+      idx = 0
+      pbEachFileSection(f) { |contents, section_name|
+        echo "." if idx % 50 == 0
+        idx += 1
+        Graphics.update if idx % 250 == 0
+        FileLineData.setSection(section_name, "header", nil)   # For error reporting
+        # Split section_name into an area and version number
+        split_section_name = section_name.split(/[-,\s]/)
+        if split_section_name.length == 0 || split_section_name.length > 2
+          raise _INTL("Section name {1} is invalid ({2}). Expected syntax like [XXX] or [XXX,Y] (XXX=area, Y=version).", section_name, path)
+        end
+        area_symbol = split_section_name[0].downcase.to_sym
+        version     = (split_section_name[1]) ? csvPosInt!(split_section_name[1]) : 0
+        # Construct parameters hash
+        area_version = (version > 0) ? sprintf("%s_%d", area_symbol.to_s, version).to_sym : area_symbol
+        parameters_hash = {
+          :id      => area_version,
+          :area    => area_symbol,
+          :version => version
+        }
+        # Go through schema hash of compilable data and compile this section
+        schema.each_key do |key|
+          # Skip empty properties (none are required)
+          if nil_or_empty?(contents[key])
+            contents[key] = nil
+            next
+          end
+          FileLineData.setSection(section_name, key, contents[key])   # For error reporting
+          # Compile value for key
+          value = pbGetCsvRecord(contents[key], key, schema[key])
+          value = nil if value.is_a?(Array) && value.length == 0
+          parameters_hash[schema[key][0]] = value
+        end
+        # Add parameters data to records
+        GameData::DungeonParameters.register(parameters_hash)
+      }
+    }
+    # Save all data
+    GameData::DungeonParameters.save
+    process_pbs_file_message_end
+  end
+
   #=============================================================================
   # Compile battle animations
   #=============================================================================

Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb

@@ -873,6 +873,91 @@ module Compiler
     process_pbs_file_message_end
   end
 
+  #=============================================================================
+  # Save dungeon tileset contents data to PBS file
+  #=============================================================================
+  def write_dungeon_tilesets(path = "PBS/dungeon_tilesets.txt")
+    write_pbs_file_message_start(path)
+    tilesets = load_data("Data/Tilesets.rxdata")
+    schema = GameData::DungeonTileset::SCHEMA
+    keys = schema.keys
+    File.open(path, "wb") { |f|
+      idx = 0
+      add_PBS_header_to_file(f)
+      GameData::DungeonTileset.each do |tileset_data|
+        echo "." if idx % 50 == 0
+        idx += 1
+        Graphics.update if idx % 250 == 0
+        f.write("\#-------------------------------\r\n")
+        tileset_name = (tilesets && tilesets[tileset_data.id]) ? tilesets[tileset_data.id].name : nil
+        if tileset_name
+          f.write(sprintf("[%d]   # %s\r\n", tileset_data.id, tileset_name))
+        else
+          f.write(sprintf("[%d]\r\n", tileset_data.id))
+        end
+        keys.each do |key|
+          if ["Autotile", "Tile"].include?(key)
+            tiles = tileset_data.tile_type_ids
+            tiles.each do |tile_type, tile_ids|
+              tile_ids.each do |tile|
+                next if tile[1]   # Tile was auto-generated from "walls" property
+                if tile[0] < 384
+                  next if key == "Tile"
+                  f.write(sprintf("Autotile = %i,%s", tile[0] / 48, tile_type.to_s))
+                else
+                  next if key == "Autotile"
+                  f.write(sprintf("Tile = %i,%s", tile[0] - 384, tile_type.to_s))
+                end
+                f.write("\r\n")
+              end
+            end
+          else
+            record = tileset_data.property_from_string(key)
+            next if record.nil? || (record.is_a?(Array) && record.empty?)
+            next if record == false || record == 0
+            f.write(sprintf("%s = ", key))
+            pbWriteCsvRecord(record, f, schema[key])
+            f.write("\r\n")
+          end
+        end
+      end
+    }
+    process_pbs_file_message_end
+  end
+
+  #=============================================================================
+  # Save dungeon parameters to PBS file
+  #=============================================================================
+  def write_dungeon_parameters(path = "PBS/dungeon_parameters.txt")
+    write_pbs_file_message_start(path)
+    schema = GameData::DungeonParameters::SCHEMA
+    keys = schema.keys
+    # Write file
+    File.open(path, "wb") { |f|
+      idx = 0
+      add_PBS_header_to_file(f)
+      GameData::DungeonParameters.each do |parameters_data|
+        echo "." if idx % 50 == 0
+        idx += 1
+        Graphics.update if idx % 250 == 0
+        f.write("\#-------------------------------\r\n")
+        if parameters_data.version > 0
+          f.write(sprintf("[%s,%d]\r\n", parameters_data.area, parameters_data.version))
+        else
+          f.write(sprintf("[%s]\r\n", parameters_data.area))
+        end
+        keys.each do |key|
+          value = parameters_data.property_from_string(key)
+          next if !value || (value.is_a?(Array) && value.length == 0)
+          f.write(sprintf("%s = ", key))
+          pbWriteCsvRecord(value, f, schema[key])
+          f.write("\r\n")
+        end
+      end
+    }
+    process_pbs_file_message_end
+  end
+
   #=============================================================================
   # Save all data to PBS files
   #=============================================================================
@@ -897,6 +982,8 @@ module Compiler
     write_trainer_lists
     write_metadata
     write_map_metadata
+    write_dungeon_tilesets
+    write_dungeon_parameters
     write_phone
     echoln ""
     Console.echo_h2("Successfully rewrote all PBS files", text: :green)