diff --git a/.DS_Store b/.DS_Store index 678d8db72..a5fe95597 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Data/Map151.rxdata b/Data/Map151.rxdata index bd8071f92..8c9f0e1e3 100644 Binary files a/Data/Map151.rxdata and b/Data/Map151.rxdata differ diff --git a/Data/Scripts/050_Outfits/OutfitIds.rb b/Data/Scripts/050_Outfits/OutfitIds.rb index 715cc031e..3ffa33053 100644 --- a/Data/Scripts/050_Outfits/OutfitIds.rb +++ b/Data/Scripts/050_Outfits/OutfitIds.rb @@ -139,4 +139,5 @@ HAIR_HOOH = "ho-oh" HAIR_CRESSELIA = "lunarbob" HAIR_LYCANROC="lycanrocshorthair" HAIR_HAPPINY="happinysuit" -HAIR_LATIAS="SpecialLatias" \ No newline at end of file +HAIR_LATIAS="SpecialLatias" +HAIR_GARDEVOIR="gardevoir" \ No newline at end of file diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb index 5755b92aa..3740c857b 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb @@ -10,6 +10,8 @@ class HairMartAdapter < OutfitsMartAdapter @version = getCurrentHairVersion().to_i @worn_hair = $Trainer.hair @worn_hat = $Trainer.hat + @worn_hat2 = $Trainer.hat2 + @hat_visible = false @removable = true @previous_item= find_first_item() @@ -105,8 +107,14 @@ class HairMartAdapter < OutfitsMartAdapter item = @previous_item if item.is_a?(Symbol) @previous_item = find_first_item() if !item.is_a?(Symbol) displayed_hat = @hat_visible ? @worn_hat : nil + displayed_hat2 = @hat_visible ? @worn_hat2 : nil + previewWindow.hat = displayed_hat + previewWindow.hat2 = displayed_hat2 + $Trainer.hat = displayed_hat + $Trainer.hat2 = displayed_hat2 + itemId = getCurrentHairId(item.id) previewWindow.hair = itemId $Trainer.hair = itemId @@ -142,6 +150,8 @@ class HairMartAdapter < OutfitsMartAdapter $Trainer.hair = @worn_hair $Trainer.hat = @worn_hat + $Trainer.hat2 = @worn_hat2 + end def get_unlocked_items_list() diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb index 42336873a..18af956da 100644 --- a/Data/Scripts/052_AddOns/GameplayUtils.rb +++ b/Data/Scripts/052_AddOns/GameplayUtils.rb @@ -1717,4 +1717,64 @@ def qmarkMaskCheck() obtainClothes(CLOTHES_GLITCH) end end +end + + +def purchaseDyeKitMenu(hats_kit_price=0,clothes_kit_price=0) + + commands = [] + command_hats = "Hats Dye Kit ($#{hats_kit_price})" + command_clothes = "Clothes Dye Kit ($#{clothes_kit_price})" + command_cancel = "Cancel" + + commands << command_hats if !$PokemonBag.pbHasItem?(:HATSDYEKIT) + commands << command_clothes if !$PokemonBag.pbHasItem?(:CLOTHESDYEKIT) + commands << command_cancel + + if commands.length <= 1 + pbCallBub(2,@event_id) + pbMessage("\\C[1]Dye Kits\\C[0] can be used to dye clothes all sorts of colours!") + + pbCallBub(2,@event_id) + pbMessage("You can use them at any time when you change clothes.") + return + end + pbCallBub(2,@event_id) + pbMessage("\\GWelcome! Are you interested in dyeing your outfits different colours?") + + pbCallBub(2,@event_id) + pbMessage("I make handy \\C[1]Dye Kits\\C[0] from my Smeargle's paint that can be used to dye your outfits any color you want!") + + pbCallBub(2,@event_id) + pbMessage("\\GWhat's more is that it's reusable so you can go completely wild with it if you want! Are you interested?") + + choice = optionsMenu(commands,commands.length) + case commands[choice] + when command_hats + if $Trainer.money < hats_kit_price + pbCallBub(2,@event_id) + pbMessage("Oh, you don't have enough money...") + return + end + pbMessage("\\G\\PN purchased the dye kit.") + $Trainer.money -= hats_kit_price + pbSEPlay("SlotsCoin") + Kernel.pbReceiveItem(:HATSDYEKIT) + pbCallBub(2,@event_id) + pbMessage("\\GHere you go! Have fun dyeing your hats!") + when command_clothes + if $Trainer.money < clothes_kit_price + pbCallBub(2,@event_id) + pbMessage("Oh, you don't have enough money...") + return + end + pbMessage("\\G\\PN purchased the dye kit.") + $Trainer.money -= clothes_kit_price + pbSEPlay("SlotsCoin") + Kernel.pbReceiveItem(:CLOTHESDYEKIT) + pbCallBub(2,@event_id) + pbMessage("\\GHere you go! Have fun dyeing your clothes!") + end + pbCallBub(2,@event_id) + pbMessage("You can use \\C[1]Dye Kits\\C[0] at any time when you change clothes.") end \ No newline at end of file diff --git a/Data/System.rxdata b/Data/System.rxdata index f3a8a9748..f46a1a3e1 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/outfits/hairstyles_data.json b/Data/outfits/hairstyles_data.json index bf54cdb8b..b8e0e23e5 100644 --- a/Data/outfits/hairstyles_data.json +++ b/Data/outfits/hairstyles_data.json @@ -140,8 +140,17 @@ }, { "id": "fusionnerd", + "name": "Side-Swept Fringe", + "description": "A bold, asymmetrical hairstyle where strands fuse into a stylish wave.", "price": 1000 }, + { + "id": "gardevoir", + "name": "Guardian Fringe", + "description": "A neat fringe that covers one eye that is styled to look like a Gardevoir.", + "price": 3000, + "howToGet": "saffron boutique" + }, { "id": "gary", "name": "Front Spikes", diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log index 0237a9355..1dd20e641 100644 --- a/Data/sprites/sprites_rate_limit.log +++ b/Data/sprites/sprites_rate_limit.log @@ -1,2 +1 @@ -1741995246 -1741995284 \ No newline at end of file +1742045788 \ No newline at end of file diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index 397c42a36..a94489973 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -686,3 +686,9 @@ Graphics/CustomBattlers/spritesheets/spritesheets_base/13.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/13/13.png Graphics/CustomBattlers/spritesheets/spritesheets_base/312.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/210/210a.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/364.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/196.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/196/196.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/229.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/342/342d.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/1/1e.png diff --git a/Graphics/Characters/player/.DS_Store b/Graphics/Characters/player/.DS_Store index 70d894309..2b475fd94 100644 Binary files a/Graphics/Characters/player/.DS_Store and b/Graphics/Characters/player/.DS_Store differ diff --git a/Graphics/Characters/player/clothes/Eri/clothes_bike_Eri.png b/Graphics/Characters/player/clothes/Eri/clothes_bike_Eri.png index 0c00df97c..9054d2aab 100644 Binary files a/Graphics/Characters/player/clothes/Eri/clothes_bike_Eri.png and b/Graphics/Characters/player/clothes/Eri/clothes_bike_Eri.png differ diff --git a/Graphics/Characters/player/clothes/Eri/clothes_dive_Eri.png b/Graphics/Characters/player/clothes/Eri/clothes_dive_Eri.png index 89c5c02fd..12a8b1f72 100644 Binary files a/Graphics/Characters/player/clothes/Eri/clothes_dive_Eri.png and b/Graphics/Characters/player/clothes/Eri/clothes_dive_Eri.png differ diff --git a/Graphics/Characters/player/clothes/Eri/clothes_fish_Eri.png b/Graphics/Characters/player/clothes/Eri/clothes_fish_Eri.png index 8b79e412f..e7f987f91 100644 Binary files a/Graphics/Characters/player/clothes/Eri/clothes_fish_Eri.png and b/Graphics/Characters/player/clothes/Eri/clothes_fish_Eri.png differ diff --git a/Graphics/Characters/player/clothes/Eri/clothes_run_Eri.png b/Graphics/Characters/player/clothes/Eri/clothes_run_Eri.png index 31da1ac18..d75ffb320 100644 Binary files a/Graphics/Characters/player/clothes/Eri/clothes_run_Eri.png and b/Graphics/Characters/player/clothes/Eri/clothes_run_Eri.png differ diff --git a/Graphics/Characters/player/clothes/Eri/clothes_surf_Eri.png b/Graphics/Characters/player/clothes/Eri/clothes_surf_Eri.png index 9c2c653e5..401f7d585 100644 Binary files a/Graphics/Characters/player/clothes/Eri/clothes_surf_Eri.png and b/Graphics/Characters/player/clothes/Eri/clothes_surf_Eri.png differ diff --git a/Graphics/Characters/player/clothes/Eri/clothes_walk_Eri.png b/Graphics/Characters/player/clothes/Eri/clothes_walk_Eri.png index 98351c15c..ddf833923 100644 Binary files a/Graphics/Characters/player/clothes/Eri/clothes_walk_Eri.png and b/Graphics/Characters/player/clothes/Eri/clothes_walk_Eri.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_1_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_1_gardevoir.png new file mode 100644 index 000000000..0f91356ce Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_1_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_2_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_2_gardevoir.png new file mode 100644 index 000000000..a7eee327b Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_2_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_3_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_3_gardevoir.png new file mode 100644 index 000000000..1c103c87c Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_3_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_4_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_4_gardevoir.png new file mode 100644 index 000000000..d440185c6 Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_4_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_5_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_5_gardevoir.png new file mode 100644 index 000000000..642b330bb Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_5_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_trainer_1_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_trainer_1_gardevoir.png new file mode 100644 index 000000000..48ed87b0a Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_trainer_1_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_trainer_2_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_trainer_2_gardevoir.png new file mode 100644 index 000000000..df0f84e2b Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_trainer_2_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_trainer_3_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_trainer_3_gardevoir.png new file mode 100644 index 000000000..2e89aa005 Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_trainer_3_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_trainer_4_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_trainer_4_gardevoir.png new file mode 100644 index 000000000..40f51f68a Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_trainer_4_gardevoir.png differ diff --git a/Graphics/Characters/player/hair/gardevoir/hair_trainer_5_gardevoir.png b/Graphics/Characters/player/hair/gardevoir/hair_trainer_5_gardevoir.png new file mode 100644 index 000000000..153e527cd Binary files /dev/null and b/Graphics/Characters/player/hair/gardevoir/hair_trainer_5_gardevoir.png differ