Release 6.9.0

Data/Scripts/052_InfiniteFusion/Gameplay/0_Utilities/BattleUtils.rb

@@ -23,7 +23,7 @@ end
 def Kernel.getRoamingMap(roamingArrayPos)
   curmap = $PokemonGlobal.roamPosition[roamingArrayPos]
   mapinfos = $RPGVX ? load_data("Data/MapInfos.rvdata") : load_data("Data/MapInfos.rxdata")
-  text = mapinfos[curmap].name #,(curmap==$game_map.map_id) ? _INTL("(this map)") : "")
+  text = pbGetMessage(MessageTypes::MapNames, curmap) #,(curmap==$game_map.map_id) ? _INTL("(this map)") : "")
   return text
 end
 
@@ -63,4 +63,4 @@ end
 
 def setForcedAltSprites(forcedSprites_map)
   $PokemonTemp.forced_alt_sprites = forcedSprites_map
-end
+end

Data/Scripts/052_InfiniteFusion/Gameplay/0_Utilities/MenuUtils.rb

@@ -82,9 +82,9 @@ def pbReceiveCosmeticsMoney(amount, showMessage=true, msgwindow=nil, goldwindow=
 
   if showMessage
     if amount >= 0
-      pbMessage(_INTL("{1} received {2} {3}!", $Trainer.name, amount.to_s_formatted, COSMETIC_CURRENCY_NAME))
+      pbMessage(_INTL("{1} received {2} {3}!", $Trainer.name, amount.to_s_formatted, get_cosmetic_currency_name))
     else
-      pbMessage(_INTL("{1} spent {2} {3}!", $Trainer.name, amount.abs.to_s_formatted, COSMETIC_CURRENCY_NAME))
+      pbMessage(_INTL("{1} spent {2} {3}!", $Trainer.name, amount.abs.to_s_formatted, get_cosmetic_currency_name))
     end
   end
 
@@ -111,7 +111,7 @@ def pbReceiveCosmeticsMoney(amount, showMessage=true, msgwindow=nil, goldwindow=
     sign    = amount >= 0 ? "+" : "-"
     goldwindow.text = _INTL(
       "{1}:\n<ar>{2}</ar>\n<ar><c3={3}>{4} {5}</c3></ar>",
-      COSMETIC_CURRENCY_NAME,
+      get_cosmetic_currency_name,
       current.to_s_formatted,
       color,
       sign,
@@ -131,7 +131,7 @@ def pbReceiveCosmeticsMoney(amount, showMessage=true, msgwindow=nil, goldwindow=
   # Final display text
   goldwindow.text = _INTL(
     "{1}:\n<ar>{2}</ar>",
-    COSMETIC_CURRENCY_NAME,
+    get_cosmetic_currency_name,
     targetMoney.to_s_formatted
   )
 

Data/Scripts/052_InfiniteFusion/Gameplay/0_Utilities/OutfitUtils.rb

@@ -2,6 +2,11 @@ def unlock_easter_egg_hats()
   if $Trainer.name.downcase == "ash"
     $Trainer.hat = HAT_ASH
     $Trainer.unlock_hat(HAT_ASH)
+
+    $Trainer.clothes = CLOTHES_ASH
+
+    $Trainer.unlock_clothes(CLOTHES_ASH)
+    $Trainer.unlock_clothes(CLOTHES_ASH_2)
   end
   if $Trainer.name.downcase == "frogman"
     $Trainer.hat = HAT_FROG
@@ -96,7 +101,12 @@ def give_date_specific_hats()
   end
 end
 
+class PokemonTemp
+  attr_accessor :current_party
+  attr_accessor :obtainable_outfits_from_team
+end
 
+#Random chance of obtaining a hat related to the wild Pokemon you just defeated after a battle
 def check_obtain_hat_after_battle(species)
   hat_chance = 1
   if rand(1..100) <= hat_chance
@@ -107,6 +117,35 @@ def check_obtain_hat_after_battle(species)
   end
 end
 
+#Random chance of obtaining a hat related to the Pokemon in your team that took part in the battle after winning a Trainer battle
+def checkObtainClothesAfterBattle(battle_participants)
+  clothes_chance = 1
+  if rand(1..100) <= clothes_chance
+    possible_outfits = list_obtainable_clothes_from_party(battle_participants)
+    if possible_outfits && !possible_outfits.empty?
+      pbMessage(_INTL("Huh? Your Pokémon found something during the battle..."))
+      obtainClothes(possible_outfits.sample)
+    end
+  end
+end
+
+def list_obtainable_clothes_from_party(battle_participants)
+  species_list = []
+  battle_participants.each do |pokemon|
+    body_pokemon_id = get_body_species_from_symbol(pokemon.species).to_s.downcase
+    head_pokemon_id = get_head_species_from_symbol(pokemon.species).to_s.downcase
+    body_pokemon_tag = "pokemon-#{body_pokemon_id}"
+    head_pokemon_tag = "pokemon-#{head_pokemon_id}"
+    species_list << body_pokemon_tag unless species_list.include?(body_pokemon_tag)
+    species_list << head_pokemon_tag unless species_list.include?(head_pokemon_tag)
+  end
+  echoln species_list
+  return if species_list.empty?
+  possible_clothes = search_clothes(species_list)
+  possible_clothes = filter_clothes_only_not_owned(possible_clothes)
+  return possible_clothes
+end
+
 
 def qmarkMaskCheck()
   if $Trainer.seen_qmarks_sprite

Data/Scripts/052_InfiniteFusion/Gameplay/0_Utilities/RepairUtils.rb

@@ -66,7 +66,7 @@ def convertAllPokemon()
     if $game_switches[SWITCH_RANDOM_TRAINERS] #randomized trainers
       Kernel.pbShuffleTrainers()
     end
-    if $game_switches[956] #randomized pokemon
+    if $game_switches[SWITCH_WILD_RANDOM_GLOBAL] #randomized pokemon
       range = pbGet(197) == nil ? 25 : pbGet(197)
       Kernel.pbShuffleDex(range, 1)
     end

Data/Scripts/052_InfiniteFusion/Gameplay/0_Utilities/SystemUtils.rb

@@ -115,6 +115,10 @@ def numeric_string?(str)
   str.match?(/\A\d+\z/)
 end
 
+def titleize(str)
+  str.split(/ |\_/).map(&:capitalize).join(" ")
+end
+
 def timeDateGreaterThan(date1, date2)
   return (
     date1.year  > date2.year ||