Update 6.8

Data/Scripts/050_Outfits/001_OutfitsMain/LayeredClothes.rb

@@ -42,8 +42,6 @@ def list_available_outfits(directory, versions = [], unlocked = [], prefix_filte
   else
     outfits = list_all_numeric_folders(directory)
   end
-  # #echoln outfits
-  # return outfits  #todo: remove this return for unlockable outfits
   available_outfits = []
   for outfit in outfits
     if !unlocked || unlocked.include?(outfit)
@@ -91,6 +89,13 @@ def shiftHairColor(incr)
   refreshPlayerOutfit()
 end
 
+def shiftBikeColor(incr)
+  $Trainer.bike_color = 0 if !$Trainer.bike_color
+  $Trainer.bike_color += incr
+  echoln "Bike color: #{$Trainer.bike_color}"
+  refreshPlayerOutfit()
+end
+
 def pbLoadOutfitBitmap(outfitFileName)
   begin
     outfitBitmap = RPG::Cache.load_bitmap("", outfitFileName)
@@ -109,6 +114,7 @@ def setHat(hat_id)
 end
 
 def getEasterEggHeldItem()
+  return unless Settings::KANTO #todo: add hoenn map ids too
   map = $game_map.map_id
   return "secrets/HOTDOG" if [141, 194].include?(map) #restaurant
   return "secrets/SNOWBALL" if [670, 693, 698, 694].include?(map)
@@ -140,7 +146,6 @@ def getCurrentPokeball(allowEasterEgg=true)
 end
 
 def generate_front_trainer_sprite_bitmap_from_appearance(trainerAppearance,is_trainer=true)
-  echoln trainerAppearance.hat
   return generate_front_trainer_sprite_bitmap(false,nil,trainerAppearance.clothes,trainerAppearance.hat,trainerAppearance.hat2,
                                               trainerAppearance.hair,trainerAppearance.skin_color,
                                               trainerAppearance.hair_color,trainerAppearance.hat_color,trainerAppearance.clothes_color,
@@ -152,7 +157,6 @@ def generate_front_trainer_sprite_bitmap(allowEasterEgg=true, pokeball = nil,
                                          clothes_id = nil, hat_id = nil, hat2_id=nil, hair_id = nil,
                                          skin_tone_id = nil, hair_color = nil, hat_color = nil, clothes_color = nil,
                                          hat2_color = nil, is_trainer=true)
-
   clothes_id = $Trainer.clothes if !clothes_id && is_trainer
   hat_id = $Trainer.hat if !hat_id && is_trainer
   hat2_id = $Trainer.hat2 if !hat2_id && is_trainer

Data/Scripts/050_Outfits/001_OutfitsMain/OutfitSelector.rb

@@ -52,7 +52,7 @@ class OutfitSelector
       list += get_hairstyle_salon_base_options()
       list += search_hairstyles(get_regional_sets_tags())
     end
-    list << HAIR_BALD
+    list << HAIR_BALD if Settings::KANTO
     return list
   end
 

Data/Scripts/050_Outfits/001_OutfitsMain/OutfitsGlobal.rb

@@ -14,12 +14,26 @@ def update_global_hats_list()
   # Iterate through the JSON data and create Hat objects
   hat_data.each do |data|
     tags = data['tags'] ? data['tags'].split(',').map(&:strip) : []
+    storeLocations = data['storelocation'] ? data['storelocation'].split(',').map(&:strip) : []
+    tags += storeLocations
+
+    regionTags = data['regiontags'] ? data['regiontags'].split(',').map(&:strip) : []
+    tags += regionTags
+
+    pokemonTags = data['pokemontags'] ? data['pokemontags'].split(',').map(&:strip) : []
+    pokemonTags.each do |tag|
+      tags << "pokemon-#{tag.downcase}"
+    end
+    contest_conditions = data['contestcondition'] ? data['contestcondition'].split(',').map(&:strip) : []
+
     hat = Hat.new(
       data['id'],
-      data['name'],
-      data['description'],
+      _OUTFIT_INTL(data['name']),
+      _OUTFIT_INTL(data['description']),
       data['price'],
-      tags
+      tags,
+      storeLocations,
+      contest_conditions
     )
     $PokemonGlobal.hats_data[hat.id] = hat
   end
@@ -35,17 +49,27 @@ def update_global_hairstyles_list()
   # Iterate through the JSON data and create Hat objects
   hair_data.each do |data|
     tags = data['tags'] ? data['tags'].split(',').map(&:strip) : []
+    storeLocations = data['storelocation'] ? data['storelocation'].split(',').map(&:strip) : []
+    tags += storeLocations
+
+    regionTags = data['regiontags'] ? data['regiontags'].split(',').map(&:strip) : []
+    tags += regionTags
+
     hair = Hairstyle.new(
       data['id'],
-      data['name'],
-      data['description'],
+      _OUTFIT_INTL(data['name']),
+      _OUTFIT_INTL(data['description']),
       data['price'],
-      tags
+      tags,
+      storeLocations
     )
     $PokemonGlobal.hairstyles_data[hair.id] = hair
   end
 end
 
+
+
+
 def update_global_clothes_list()
   file_path = Settings::CLOTHES_DATA_PATH
   json_data = File.read(file_path)
@@ -56,12 +80,25 @@ def update_global_clothes_list()
   # Iterate through the JSON data and create Hat objects
   outfits_data.each do |data|
     tags = data['tags'] ? data['tags'].split(',').map(&:strip) : []
+    storeLocations = data['storelocation'] ? data['storelocation'].split(',').map(&:strip) : []
+    tags += storeLocations
+
+    regionTags = data['regiontags'] ? data['regiontags'].split(',').map(&:strip) : []
+    tags += regionTags
+
+    pokemonTags = data['pokemontags'] ? data['pokemontags'].split(',').map(&:strip) : []
+    pokemonTags.each do |tag|
+      tags << "pokemon-#{tag.downcase}"
+    end
+    contest_conditions = data['contestcondition'] ? data['contestcondition'].split(',').map(&:strip) : []
     outfit = Clothes.new(
       data['id'],
-      data['name'],
-      data['description'],
+      _OUTFIT_INTL(data['name']),
+      _OUTFIT_INTL(data['description']),
       data['price'],
-      tags
+      tags,
+      storeLocations,
+      contest_conditions
     )
     $PokemonGlobal.clothes_data[outfit.id] = outfit
   end