From 479aeacc2c9dddad1b701c1a92a2a1f915e34388 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Wed, 24 Nov 2021 19:05:18 +0000
Subject: [PATCH] Added new section-based format for berry_plants.txt

---
 .../010_Data/002_PBS data/007_BerryPlant.rb   |  21 +-
 .../021_Compiler/002_Compiler_CompilePBS.rb   |  68 ++-
 .../021_Compiler/003_Compiler_WritePBS.rb     |  13 +-
 PBS/Gen 5/berry_plants.txt                    | 383 ++++++++++++++---
 PBS/Gen 7/berry_plants.txt                    | 401 +++++++++++++++---
 PBS/Gen 8/berry_plants.txt                    | 401 +++++++++++++++---
 PBS/berry_plants.txt                          | 401 +++++++++++++++---
 7 files changed, 1396 insertions(+), 292 deletions(-)

diff --git a/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb b/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb
index c0cb001bd..054e84be7 100644
--- a/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb	
@@ -3,12 +3,17 @@ module GameData
     attr_reader :id
     attr_reader :hours_per_stage
     attr_reader :drying_per_hour
-    attr_reader :minimum_yield
-    attr_reader :maximum_yield
+    attr_reader :yield
 
     DATA = {}
     DATA_FILENAME = "berry_plants.dat"
 
+    SCHEMA = {
+      "HoursPerStage" => [:hours_per_stage, "v"],
+      "DryingPerHour" => [:drying_per_hour, "u"],
+      "Yield"         => [:yield,           "uv"]
+    }
+
     NUMBER_OF_REPLANTS           = 9
     NUMBER_OF_GROWTH_STAGES      = 4
     NUMBER_OF_FULLY_GROWN_STAGES = 4
@@ -21,8 +26,16 @@ module GameData
       @id              = hash[:id]
       @hours_per_stage = hash[:hours_per_stage] || 3
       @drying_per_hour = hash[:drying_per_hour] || 15
-      @minimum_yield   = hash[:minimum_yield]   || 2
-      @maximum_yield   = hash[:maximum_yield]   || 5
+      @yield           = hash[:yield]           || [2, 5]
+      @yield.reverse! if @yield[1] < @yield[0]
+    end
+
+    def minimum_yield
+      return @yield[0]
+    end
+
+    def maximum_yield
+      return @yield[1]
     end
   end
 end
diff --git a/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb b/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
index 16a890578..347fc8d52 100644
--- a/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
+++ b/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
@@ -516,24 +516,62 @@ module Compiler
   def compile_berry_plants(path = "PBS/berry_plants.txt")
     compile_pbs_file_message_start(path)
     GameData::BerryPlant::DATA.clear
-    pbCompilerEachCommentedLine(path) { |line, line_no|
-      if line[/^\s*(\w+)\s*=\s*(.*)$/]   # Of the format XXX = YYY
-        key   = $1
-        value = $2
-        item_id = parseItem(key)
-        line = pbGetCsvRecord(value, line_no, [0, "vuuv"])
-        # Construct berry plant hash
-        berry_plant_hash = {
-          :id              => item_id,
-          :hours_per_stage => line[0],
-          :drying_per_hour => line[1],
-          :minimum_yield   => line[2],
-          :maximum_yield   => line[3]
+    schema = GameData::BerryPlant::SCHEMA
+    item_hash = nil
+    old_format = nil
+    # Read each line of berry_plants.txt at a time and compile it into a berry plant
+    idx = 0
+    pbCompilerEachPreppedLine(path) { |line, line_no|
+      echo "." if idx % 250 == 0
+      idx += 1
+      if line[/^\s*\[\s*(.+)\s*\]\s*$/]   # New section [item_id]
+        old_format = false if old_format.nil?
+        if old_format
+          raise _INTL("Can't mix old and new formats.\r\n{1}", FileLineData.linereport)
+        end
+        # Add previous berry plant's data to records
+        GameData::BerryPlant.register(item_hash) if item_hash
+        # Parse item ID
+        item_id = $~[1].to_sym
+        if GameData::BerryPlant.exists?(item_id)
+          raise _INTL("Item ID '{1}' is used twice.\r\n{2}", item_id, FileLineData.linereport)
+        end
+        # Construct item hash
+        item_hash = {
+          :id => item_id
         }
-        # Add berry plant's data to records
-        GameData::BerryPlant.register(berry_plant_hash)
+      elsif line[/^\s*(\w+)\s*=\s*(.*)\s*$/]   # XXX=YYY lines
+        old_format = true if old_format.nil?
+        if old_format
+          key   = $1
+          value = $2
+          item_id = parseItem(key)
+          line = pbGetCsvRecord(value, line_no, [0, "vuuv"])
+          # Construct berry plant hash
+          berry_plant_hash = {
+            :id              => item_id,
+            :hours_per_stage => line[0],
+            :drying_per_hour => line[1],
+            :yield           => [line[2], line[3]]
+          }
+          # Add berry plant's data to records
+          GameData::BerryPlant.register(berry_plant_hash)
+        else
+          if !item_hash
+            raise _INTL("Expected a section at the beginning of the file.\r\n{1}", FileLineData.linereport)
+          end
+          # Parse property and value
+          property_name = $~[1]
+          line_schema = schema[property_name]
+          next if !line_schema
+          property_value = pbGetCsvRecord($~[2], line_no, line_schema)
+          # Record XXX=YYY setting
+          item_hash[line_schema[0]] = property_value
+        end
       end
     }
+    # Add last berry plant's data to records
+    GameData::BerryPlant.register(item_hash) if item_hash
     # Save all data
     GameData::BerryPlant.save
     process_pbs_file_message_end
diff --git a/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb b/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb
index 1135a64dd..af366aeac 100644
--- a/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb
+++ b/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb
@@ -251,15 +251,12 @@ module Compiler
     write_pbs_file_message_start(path)
     File.open(path, "wb") { |f|
       add_PBS_header_to_file(f)
-      f.write("\#-------------------------------\r\n")
       GameData::BerryPlant.each do |bp|
-        f.write(sprintf("%s = %d,%d,%d,%d\r\n",
-          csvQuote(bp.id.to_s),
-          bp.hours_per_stage,
-          bp.drying_per_hour,
-          bp.minimum_yield,
-          bp.maximum_yield
-        ))
+        f.write("\#-------------------------------\r\n")
+        f.write(sprintf("[%s]\r\n", bp.id))
+        f.write(sprintf("HoursPerStage = %d\r\n", bp.hours_per_stage))
+        f.write(sprintf("DryingPerHour = %d\r\n", bp.drying_per_hour))
+        f.write(sprintf("Yield = %s\r\n", bp.yield.join(",")))
       end
     }
     process_pbs_file_message_end
diff --git a/PBS/Gen 5/berry_plants.txt b/PBS/Gen 5/berry_plants.txt
index d7eaedec1..c0abaecc6 100644
--- a/PBS/Gen 5/berry_plants.txt	
+++ b/PBS/Gen 5/berry_plants.txt	
@@ -1,66 +1,321 @@
 # See the documentation on the wiki to learn how to edit this file.
 #-------------------------------
-CHERIBERRY = 3,15,2,5
-CHESTOBERRY = 3,15,2,5
-PECHABERRY = 3,15,2,5
-RAWSTBERRY = 3,15,2,5
-ASPEARBERRY = 3,15,2,5
-LEPPABERRY = 4,15,2,5
-ORANBERRY = 4,15,2,5
-PERSIMBERRY = 4,15,2,5
-LUMBERRY = 12,8,2,5
-SITRUSBERRY = 8,7,2,5
-FIGYBERRY = 5,10,1,5
-WIKIBERRY = 5,10,1,5
-MAGOBERRY = 5,10,1,5
-AGUAVBERRY = 5,10,1,5
-IAPAPABERRY = 5,10,1,5
-RAZZBERRY = 2,35,2,10
-BLUKBERRY = 2,35,2,10
-NANABBERRY = 2,35,2,10
-WEPEARBERRY = 2,35,2,10
-PINAPBERRY = 2,35,2,10
-POMEGBERRY = 8,8,1,5
-KELPSYBERRY = 8,8,1,5
-QUALOTBERRY = 8,8,1,5
-HONDEWBERRY = 8,8,1,5
-GREPABERRY = 8,8,1,5
-TAMATOBERRY = 8,8,1,5
-CORNNBERRY = 6,10,2,10
-MAGOSTBERRY = 6,10,2,10
-RABUTABERRY = 6,10,2,10
-NOMELBERRY = 6,10,2,10
-SPELONBERRY = 15,8,2,15
-PAMTREBERRY = 15,8,3,15
-WATMELBERRY = 15,8,2,15
-DURINBERRY = 15,8,3,15
-BELUEBERRY = 15,8,2,15
-OCCABERRY = 18,6,1,5
-PASSHOBERRY = 18,6,1,5
-WACANBERRY = 18,6,1,5
-RINDOBERRY = 18,6,1,5
-YACHEBERRY = 18,6,1,5
-CHOPLEBERRY = 18,6,1,5
-KEBIABERRY = 18,6,1,5
-SHUCABERRY = 18,6,1,5
-COBABERRY = 18,6,1,5
-PAYAPABERRY = 18,6,1,5
-TANGABERRY = 18,6,1,5
-CHARTIBERRY = 18,6,1,5
-KASIBBERRY = 18,6,1,5
-HABANBERRY = 18,6,1,5
-COLBURBERRY = 18,6,1,5
-BABIRIBERRY = 18,6,1,5
-CHILANBERRY = 18,6,1,5
-LIECHIBERRY = 24,4,1,5
-GANLONBERRY = 24,4,1,5
-SALACBERRY = 24,4,1,5
-PETAYABERRY = 24,4,1,5
-APICOTBERRY = 24,4,1,5
-LANSATBERRY = 24,4,1,5
-STARFBERRY = 24,4,1,5
-ENIGMABERRY = 24,7,1,5
-MICLEBERRY = 24,7,1,5
-CUSTAPBERRY = 24,7,1,5
-JABOCABERRY = 24,7,1,5
-ROWAPBERRY = 24,7,1,5
+[CHERIBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[CHESTOBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PECHABERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[RAWSTBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ASPEARBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LEPPABERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ORANBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PERSIMBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LUMBERRY]
+HoursPerStage = 12
+DryingPerHour = 8
+Yield = 2,5
+#-------------------------------
+[SITRUSBERRY]
+HoursPerStage = 8
+DryingPerHour = 7
+Yield = 2,5
+#-------------------------------
+[FIGYBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[WIKIBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[MAGOBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[AGUAVBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[IAPAPABERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[RAZZBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[BLUKBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[NANABBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[WEPEARBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[PINAPBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[POMEGBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[KELPSYBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[QUALOTBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[HONDEWBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[GREPABERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[TAMATOBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[CORNNBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[MAGOSTBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[RABUTABERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[NOMELBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[SPELONBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[PAMTREBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[WATMELBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[DURINBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[BELUEBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[OCCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PASSHOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[WACANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[RINDOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[YACHEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHOPLEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KEBIABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[SHUCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COBABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PAYAPABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[TANGABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHARTIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KASIBBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[HABANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COLBURBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[BABIRIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHILANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[LIECHIBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[GANLONBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[SALACBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[PETAYABERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[APICOTBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[LANSATBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[STARFBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[ENIGMABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[MICLEBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[CUSTAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[JABOCABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[ROWAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
diff --git a/PBS/Gen 7/berry_plants.txt b/PBS/Gen 7/berry_plants.txt
index f4e543292..d8c10bd5f 100644
--- a/PBS/Gen 7/berry_plants.txt	
+++ b/PBS/Gen 7/berry_plants.txt	
@@ -1,69 +1,336 @@
 # See the documentation on the wiki to learn how to edit this file.
 #-------------------------------
-CHERIBERRY = 3,15,2,5
-CHESTOBERRY = 3,15,2,5
-PECHABERRY = 3,15,2,5
-RAWSTBERRY = 3,15,2,5
-ASPEARBERRY = 3,15,2,5
-LEPPABERRY = 4,15,2,5
-ORANBERRY = 4,15,2,5
-PERSIMBERRY = 4,15,2,5
-LUMBERRY = 12,8,2,5
-SITRUSBERRY = 8,7,2,5
-FIGYBERRY = 5,10,1,5
-WIKIBERRY = 5,10,1,5
-MAGOBERRY = 5,10,1,5
-AGUAVBERRY = 5,10,1,5
-IAPAPABERRY = 5,10,1,5
-RAZZBERRY = 2,35,2,10
-BLUKBERRY = 2,35,2,10
-NANABBERRY = 2,35,2,10
-WEPEARBERRY = 2,35,2,10
-PINAPBERRY = 2,35,2,10
-POMEGBERRY = 8,8,1,5
-KELPSYBERRY = 8,8,1,5
-QUALOTBERRY = 8,8,1,5
-HONDEWBERRY = 8,8,1,5
-GREPABERRY = 8,8,1,5
-TAMATOBERRY = 8,8,1,5
-CORNNBERRY = 6,10,2,10
-MAGOSTBERRY = 6,10,2,10
-RABUTABERRY = 6,10,2,10
-NOMELBERRY = 6,10,2,10
-SPELONBERRY = 15,8,2,15
-PAMTREBERRY = 15,8,3,15
-WATMELBERRY = 15,8,2,15
-DURINBERRY = 15,8,3,15
-BELUEBERRY = 15,8,2,15
-OCCABERRY = 18,6,1,5
-PASSHOBERRY = 18,6,1,5
-WACANBERRY = 18,6,1,5
-RINDOBERRY = 18,6,1,5
-YACHEBERRY = 18,6,1,5
-CHOPLEBERRY = 18,6,1,5
-KEBIABERRY = 18,6,1,5
-SHUCABERRY = 18,6,1,5
-COBABERRY = 18,6,1,5
-PAYAPABERRY = 18,6,1,5
-TANGABERRY = 18,6,1,5
-CHARTIBERRY = 18,6,1,5
-KASIBBERRY = 18,6,1,5
-HABANBERRY = 18,6,1,5
-COLBURBERRY = 18,6,1,5
-BABIRIBERRY = 18,6,1,5
-CHILANBERRY = 18,6,1,5
-LIECHIBERRY = 24,4,1,5
-GANLONBERRY = 24,4,1,5
-SALACBERRY = 24,4,1,5
-PETAYABERRY = 24,4,1,5
-APICOTBERRY = 24,4,1,5
-LANSATBERRY = 24,4,1,5
-STARFBERRY = 24,4,1,5
-ENIGMABERRY = 24,7,1,5
-MICLEBERRY = 24,7,1,5
-CUSTAPBERRY = 24,7,1,5
-JABOCABERRY = 24,7,1,5
-ROWAPBERRY = 24,7,1,5
-ROSELIBERRY = 18,6,1,5
-KEEBERRY = 24,7,1,5
-MARANGABERRY = 24,7,1,5
+[CHERIBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[CHESTOBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PECHABERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[RAWSTBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ASPEARBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LEPPABERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ORANBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PERSIMBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LUMBERRY]
+HoursPerStage = 12
+DryingPerHour = 8
+Yield = 2,5
+#-------------------------------
+[SITRUSBERRY]
+HoursPerStage = 8
+DryingPerHour = 7
+Yield = 2,5
+#-------------------------------
+[FIGYBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[WIKIBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[MAGOBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[AGUAVBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[IAPAPABERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[RAZZBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[BLUKBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[NANABBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[WEPEARBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[PINAPBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[POMEGBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[KELPSYBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[QUALOTBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[HONDEWBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[GREPABERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[TAMATOBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[CORNNBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[MAGOSTBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[RABUTABERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[NOMELBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[SPELONBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[PAMTREBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[WATMELBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[DURINBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[BELUEBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[OCCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PASSHOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[WACANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[RINDOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[YACHEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHOPLEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KEBIABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[SHUCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COBABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PAYAPABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[TANGABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHARTIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KASIBBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[HABANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COLBURBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[BABIRIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHILANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[LIECHIBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[GANLONBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[SALACBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[PETAYABERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[APICOTBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[LANSATBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[STARFBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[ENIGMABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[MICLEBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[CUSTAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[JABOCABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[ROWAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[ROSELIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KEEBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[MARANGABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
diff --git a/PBS/Gen 8/berry_plants.txt b/PBS/Gen 8/berry_plants.txt
index f4e543292..d8c10bd5f 100644
--- a/PBS/Gen 8/berry_plants.txt	
+++ b/PBS/Gen 8/berry_plants.txt	
@@ -1,69 +1,336 @@
 # See the documentation on the wiki to learn how to edit this file.
 #-------------------------------
-CHERIBERRY = 3,15,2,5
-CHESTOBERRY = 3,15,2,5
-PECHABERRY = 3,15,2,5
-RAWSTBERRY = 3,15,2,5
-ASPEARBERRY = 3,15,2,5
-LEPPABERRY = 4,15,2,5
-ORANBERRY = 4,15,2,5
-PERSIMBERRY = 4,15,2,5
-LUMBERRY = 12,8,2,5
-SITRUSBERRY = 8,7,2,5
-FIGYBERRY = 5,10,1,5
-WIKIBERRY = 5,10,1,5
-MAGOBERRY = 5,10,1,5
-AGUAVBERRY = 5,10,1,5
-IAPAPABERRY = 5,10,1,5
-RAZZBERRY = 2,35,2,10
-BLUKBERRY = 2,35,2,10
-NANABBERRY = 2,35,2,10
-WEPEARBERRY = 2,35,2,10
-PINAPBERRY = 2,35,2,10
-POMEGBERRY = 8,8,1,5
-KELPSYBERRY = 8,8,1,5
-QUALOTBERRY = 8,8,1,5
-HONDEWBERRY = 8,8,1,5
-GREPABERRY = 8,8,1,5
-TAMATOBERRY = 8,8,1,5
-CORNNBERRY = 6,10,2,10
-MAGOSTBERRY = 6,10,2,10
-RABUTABERRY = 6,10,2,10
-NOMELBERRY = 6,10,2,10
-SPELONBERRY = 15,8,2,15
-PAMTREBERRY = 15,8,3,15
-WATMELBERRY = 15,8,2,15
-DURINBERRY = 15,8,3,15
-BELUEBERRY = 15,8,2,15
-OCCABERRY = 18,6,1,5
-PASSHOBERRY = 18,6,1,5
-WACANBERRY = 18,6,1,5
-RINDOBERRY = 18,6,1,5
-YACHEBERRY = 18,6,1,5
-CHOPLEBERRY = 18,6,1,5
-KEBIABERRY = 18,6,1,5
-SHUCABERRY = 18,6,1,5
-COBABERRY = 18,6,1,5
-PAYAPABERRY = 18,6,1,5
-TANGABERRY = 18,6,1,5
-CHARTIBERRY = 18,6,1,5
-KASIBBERRY = 18,6,1,5
-HABANBERRY = 18,6,1,5
-COLBURBERRY = 18,6,1,5
-BABIRIBERRY = 18,6,1,5
-CHILANBERRY = 18,6,1,5
-LIECHIBERRY = 24,4,1,5
-GANLONBERRY = 24,4,1,5
-SALACBERRY = 24,4,1,5
-PETAYABERRY = 24,4,1,5
-APICOTBERRY = 24,4,1,5
-LANSATBERRY = 24,4,1,5
-STARFBERRY = 24,4,1,5
-ENIGMABERRY = 24,7,1,5
-MICLEBERRY = 24,7,1,5
-CUSTAPBERRY = 24,7,1,5
-JABOCABERRY = 24,7,1,5
-ROWAPBERRY = 24,7,1,5
-ROSELIBERRY = 18,6,1,5
-KEEBERRY = 24,7,1,5
-MARANGABERRY = 24,7,1,5
+[CHERIBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[CHESTOBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PECHABERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[RAWSTBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ASPEARBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LEPPABERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ORANBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PERSIMBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LUMBERRY]
+HoursPerStage = 12
+DryingPerHour = 8
+Yield = 2,5
+#-------------------------------
+[SITRUSBERRY]
+HoursPerStage = 8
+DryingPerHour = 7
+Yield = 2,5
+#-------------------------------
+[FIGYBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[WIKIBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[MAGOBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[AGUAVBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[IAPAPABERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[RAZZBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[BLUKBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[NANABBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[WEPEARBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[PINAPBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[POMEGBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[KELPSYBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[QUALOTBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[HONDEWBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[GREPABERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[TAMATOBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[CORNNBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[MAGOSTBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[RABUTABERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[NOMELBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[SPELONBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[PAMTREBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[WATMELBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[DURINBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[BELUEBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[OCCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PASSHOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[WACANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[RINDOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[YACHEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHOPLEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KEBIABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[SHUCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COBABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PAYAPABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[TANGABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHARTIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KASIBBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[HABANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COLBURBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[BABIRIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHILANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[LIECHIBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[GANLONBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[SALACBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[PETAYABERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[APICOTBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[LANSATBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[STARFBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[ENIGMABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[MICLEBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[CUSTAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[JABOCABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[ROWAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[ROSELIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KEEBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[MARANGABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
diff --git a/PBS/berry_plants.txt b/PBS/berry_plants.txt
index f4e543292..d8c10bd5f 100644
--- a/PBS/berry_plants.txt
+++ b/PBS/berry_plants.txt
@@ -1,69 +1,336 @@
 # See the documentation on the wiki to learn how to edit this file.
 #-------------------------------
-CHERIBERRY = 3,15,2,5
-CHESTOBERRY = 3,15,2,5
-PECHABERRY = 3,15,2,5
-RAWSTBERRY = 3,15,2,5
-ASPEARBERRY = 3,15,2,5
-LEPPABERRY = 4,15,2,5
-ORANBERRY = 4,15,2,5
-PERSIMBERRY = 4,15,2,5
-LUMBERRY = 12,8,2,5
-SITRUSBERRY = 8,7,2,5
-FIGYBERRY = 5,10,1,5
-WIKIBERRY = 5,10,1,5
-MAGOBERRY = 5,10,1,5
-AGUAVBERRY = 5,10,1,5
-IAPAPABERRY = 5,10,1,5
-RAZZBERRY = 2,35,2,10
-BLUKBERRY = 2,35,2,10
-NANABBERRY = 2,35,2,10
-WEPEARBERRY = 2,35,2,10
-PINAPBERRY = 2,35,2,10
-POMEGBERRY = 8,8,1,5
-KELPSYBERRY = 8,8,1,5
-QUALOTBERRY = 8,8,1,5
-HONDEWBERRY = 8,8,1,5
-GREPABERRY = 8,8,1,5
-TAMATOBERRY = 8,8,1,5
-CORNNBERRY = 6,10,2,10
-MAGOSTBERRY = 6,10,2,10
-RABUTABERRY = 6,10,2,10
-NOMELBERRY = 6,10,2,10
-SPELONBERRY = 15,8,2,15
-PAMTREBERRY = 15,8,3,15
-WATMELBERRY = 15,8,2,15
-DURINBERRY = 15,8,3,15
-BELUEBERRY = 15,8,2,15
-OCCABERRY = 18,6,1,5
-PASSHOBERRY = 18,6,1,5
-WACANBERRY = 18,6,1,5
-RINDOBERRY = 18,6,1,5
-YACHEBERRY = 18,6,1,5
-CHOPLEBERRY = 18,6,1,5
-KEBIABERRY = 18,6,1,5
-SHUCABERRY = 18,6,1,5
-COBABERRY = 18,6,1,5
-PAYAPABERRY = 18,6,1,5
-TANGABERRY = 18,6,1,5
-CHARTIBERRY = 18,6,1,5
-KASIBBERRY = 18,6,1,5
-HABANBERRY = 18,6,1,5
-COLBURBERRY = 18,6,1,5
-BABIRIBERRY = 18,6,1,5
-CHILANBERRY = 18,6,1,5
-LIECHIBERRY = 24,4,1,5
-GANLONBERRY = 24,4,1,5
-SALACBERRY = 24,4,1,5
-PETAYABERRY = 24,4,1,5
-APICOTBERRY = 24,4,1,5
-LANSATBERRY = 24,4,1,5
-STARFBERRY = 24,4,1,5
-ENIGMABERRY = 24,7,1,5
-MICLEBERRY = 24,7,1,5
-CUSTAPBERRY = 24,7,1,5
-JABOCABERRY = 24,7,1,5
-ROWAPBERRY = 24,7,1,5
-ROSELIBERRY = 18,6,1,5
-KEEBERRY = 24,7,1,5
-MARANGABERRY = 24,7,1,5
+[CHERIBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[CHESTOBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PECHABERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[RAWSTBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ASPEARBERRY]
+HoursPerStage = 3
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LEPPABERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[ORANBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[PERSIMBERRY]
+HoursPerStage = 4
+DryingPerHour = 15
+Yield = 2,5
+#-------------------------------
+[LUMBERRY]
+HoursPerStage = 12
+DryingPerHour = 8
+Yield = 2,5
+#-------------------------------
+[SITRUSBERRY]
+HoursPerStage = 8
+DryingPerHour = 7
+Yield = 2,5
+#-------------------------------
+[FIGYBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[WIKIBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[MAGOBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[AGUAVBERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[IAPAPABERRY]
+HoursPerStage = 5
+DryingPerHour = 10
+Yield = 1,5
+#-------------------------------
+[RAZZBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[BLUKBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[NANABBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[WEPEARBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[PINAPBERRY]
+HoursPerStage = 2
+DryingPerHour = 35
+Yield = 2,10
+#-------------------------------
+[POMEGBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[KELPSYBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[QUALOTBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[HONDEWBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[GREPABERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[TAMATOBERRY]
+HoursPerStage = 8
+DryingPerHour = 8
+Yield = 1,5
+#-------------------------------
+[CORNNBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[MAGOSTBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[RABUTABERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[NOMELBERRY]
+HoursPerStage = 6
+DryingPerHour = 10
+Yield = 2,10
+#-------------------------------
+[SPELONBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[PAMTREBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[WATMELBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[DURINBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 3,15
+#-------------------------------
+[BELUEBERRY]
+HoursPerStage = 15
+DryingPerHour = 8
+Yield = 2,15
+#-------------------------------
+[OCCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PASSHOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[WACANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[RINDOBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[YACHEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHOPLEBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KEBIABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[SHUCABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COBABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[PAYAPABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[TANGABERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHARTIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KASIBBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[HABANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[COLBURBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[BABIRIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[CHILANBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[LIECHIBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[GANLONBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[SALACBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[PETAYABERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[APICOTBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[LANSATBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[STARFBERRY]
+HoursPerStage = 24
+DryingPerHour = 4
+Yield = 1,5
+#-------------------------------
+[ENIGMABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[MICLEBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[CUSTAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[JABOCABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[ROWAPBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[ROSELIBERRY]
+HoursPerStage = 18
+DryingPerHour = 6
+Yield = 1,5
+#-------------------------------
+[KEEBERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5
+#-------------------------------
+[MARANGABERRY]
+HoursPerStage = 24
+DryingPerHour = 7
+Yield = 1,5