diff --git a/Data/Scripts/050_Outfits/OutfitIds.rb b/Data/Scripts/050_Outfits/OutfitIds.rb index ddd03dfe9..9e01e637b 100644 --- a/Data/Scripts/050_Outfits/OutfitIds.rb +++ b/Data/Scripts/050_Outfits/OutfitIds.rb @@ -10,8 +10,10 @@ CLOTHES_ADVENTURER = "fantasyadventurersoutfit" CLOTHES_EMERALD = "emeraldSPE" CLOTHES_PIKACHU_ONESIE = "pikaonesie" +CLOTHES_GLITCH = "glitzerset" CLOTHES_BREEDER="PKMBreeder" + CLOTHES_LASS_YELLOW ="lass" CLOTHES_LASS_BLUE ="lass2" diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb index 140517178..1948b2980 100644 --- a/Data/Scripts/052_AddOns/GameplayUtils.rb +++ b/Data/Scripts/052_AddOns/GameplayUtils.rb @@ -1704,6 +1704,7 @@ def qmarkMaskCheck() if $Trainer.seen_qmarks_sprite unless hasHat?(HAT_QMARKS) obtainHat(HAT_QMARKS) + obtainClothes(CLOTHES_GLITCH) end end end \ No newline at end of file diff --git a/Data/outfits/clothes_data.json b/Data/outfits/clothes_data.json index e78344fa0..9e722de02 100644 --- a/Data/outfits/clothes_data.json +++ b/Data/outfits/clothes_data.json @@ -220,6 +220,13 @@ "tags": "celadon", "howToGet": "city-exclusive outfit" }, + { + "id": "flying", + "name": "Flying Outfit", + "description": "An aerodynamic outfit for gliding through the air. It captures the essence of Flying-type Pokémon.", + "price": 10000, + "tags": "type-flying,special" + }, { "id": "fusionnerd", "name": "Fusion Outfit", @@ -228,6 +235,11 @@ "tags": "pokemon-fused,special,", "howToGet": "cinnabar lab after fusing 100 times" }, + { + "id": "glitzerset", + "name": "Glitzer", + "price": 2550 + }, { "id": "gothhoodie", "name": "Goth Hoodie", @@ -306,8 +318,8 @@ }, { "id": "lady", - "name": "Summer Dress", - "description": "An elegant white dress with a ribbon at the waist, radiating a sense of grace and sophistication.", + "name": "Elegant Dress", + "description": "An elegant summer dress with a ribbon at the waist, radiating a sense of grace and sophistication.", "done": "yes", "price": 1500, "tags": "cerulean", diff --git a/Data/outfits/hairstyles_data.json b/Data/outfits/hairstyles_data.json index a83cd34ef..05f5073a2 100644 --- a/Data/outfits/hairstyles_data.json +++ b/Data/outfits/hairstyles_data.json @@ -12,7 +12,7 @@ "name": "Bald", "description": "A completely bald look - no hair, no fuss, just pure, unadulterated scalp!", "done": "yes", - "price": 0, + "price": 500, "tags": "no-hair" }, { @@ -151,6 +151,13 @@ "tags": "medium, untied, spiky, thick, npc,", "howToGet": "garys mom in their house (lol)?" }, + { + "id": "glitzerset", + "name": "Pomeg Cut", + "description": "A cute cut that is styled like a Pomeg berry!", + "price": 2000, + "tags": "kinisland" + }, { "id": "happinysuit", "name": "Curled Happiny Ponytail", @@ -297,7 +304,8 @@ "howToGet": "quest? cresselia outfit" }, { - "id": "lycanrocshorthair" + "id": "lycanrocshorthair", + "price": 3000 }, { "id": "mawile", diff --git a/Data/outfits/hats_data.json b/Data/outfits/hats_data.json index f6f1e6def..2daf2a022 100644 --- a/Data/outfits/hats_data.json +++ b/Data/outfits/hats_data.json @@ -142,6 +142,7 @@ "id": "carbink", "name": "Carbink Headband", "description": "A cute, rock-solid headband resembling Carbink.", + "done": "yes", "price": 5000, "tags": "hat,pokemon-carbink" }, @@ -356,6 +357,13 @@ "tags": "glasses,special,", "howToGet": "cinnabar lab after fusing 100 times" }, + { + "id": "ghastlygibus", + "name": "Gibus", + "done": "yes", + "price": 6000, + "tags": "hat, lavender,pokemon-ghastly,pokemon-haunter,pokemon-gengar," + }, { "id": "giovannifedora", "name": "Mobster Fedora", @@ -370,8 +378,10 @@ "id": "glitzerset", "name": "Glitched Mask", "description": "An odd mask that makes you look like you just stepped out of a corrupted save file. ", + "done": "yes", "price": 10000, - "tags": "mask" + "tags": "mask,special,", + "howToGet": "Obtained by defeating a Pokemon without a sprite" }, { "id": "glasses", @@ -445,7 +455,9 @@ { "id": "headlacecovering", "name": "Lace Covering", - "description": "A delicate seet-hrough lace covering that is worn over the head." + "description": "A delicate seet-hrough lace covering that is worn over the head.", + "price": 4500, + "tags": "hat,ecruteak" }, { "id": "headparas", @@ -973,6 +985,8 @@ { "id": "sableyemask", "name": "Sableye Mask", + "description": "A creepy, gem-eyed disguise that lets you channel your inner trickster.", + "done": "yes", "price": 4500, "tags": "mask,pokemon-sableye" }, @@ -999,6 +1013,7 @@ "id": "santa", "name": "Festive Hat", "description": "A warm, snug stocking cap worn during a festive holiday season.", + "done": "yes", "price": 25000, "tags": "hat," }, @@ -1044,7 +1059,10 @@ { "id": "skittyTV", "name": "Skitty TV", - "price": 5000 + "description": "A wearable TV themed like a Skitty. Use it to watch your battle replays!", + "price": 5000, + "tags": "hat,", + "howToGet": "goldenrod radio tower" }, { "id": "sleepmask", @@ -1193,6 +1211,7 @@ "id": "waterdress", "name": "Straw Hat", "description": "A simple hat made out of straw that is typically worn by bug-catchers.", + "done": "yes", "price": 1500, "tags": "hat,pewter,", "howToGet": "trainer clothing store?" diff --git a/Graphics/Characters/player/hair/gary/hair_1_gary.png b/Graphics/Characters/player/hair/gary/hair_1_gary.png index 6f2c5f6af..3d4f6d6b4 100644 Binary files a/Graphics/Characters/player/hair/gary/hair_1_gary.png and b/Graphics/Characters/player/hair/gary/hair_1_gary.png differ diff --git a/Graphics/Characters/player/hair/gary/hair_2_gary.png b/Graphics/Characters/player/hair/gary/hair_2_gary.png index 73b9454d3..e22c0e645 100644 Binary files a/Graphics/Characters/player/hair/gary/hair_2_gary.png and b/Graphics/Characters/player/hair/gary/hair_2_gary.png differ diff --git a/Graphics/Characters/player/hair/gary/hair_3_gary.png b/Graphics/Characters/player/hair/gary/hair_3_gary.png index 6040eee74..519724f94 100644 Binary files a/Graphics/Characters/player/hair/gary/hair_3_gary.png and b/Graphics/Characters/player/hair/gary/hair_3_gary.png differ diff --git a/Graphics/Characters/player/hair/gary/hair_4_gary.png b/Graphics/Characters/player/hair/gary/hair_4_gary.png index e32409e11..ceff17d01 100644 Binary files a/Graphics/Characters/player/hair/gary/hair_4_gary.png and b/Graphics/Characters/player/hair/gary/hair_4_gary.png differ