diff --git a/Data/.DS_Store b/Data/.DS_Store index d4158a8e7..e435171fe 100644 Binary files a/Data/.DS_Store and b/Data/.DS_Store differ diff --git a/Data/outfits/clothes_data.json b/Data/outfits/clothes_data.json index 965da058e..300a6849c 100644 --- a/Data/outfits/clothes_data.json +++ b/Data/outfits/clothes_data.json @@ -89,6 +89,10 @@ "tags": "celadon", "howToGet": "city exclusive outfit" }, + { + "id": "brendanRS", + "name": "Ruby Runner" + }, { "id": "bughakama", "name": "Bug Hakama Dress", @@ -203,13 +207,14 @@ "id": "Eri", "name": "Caph Squad Captain", "obtainable": "yes", + "price": 8000, "tags": "paldea," }, { "id": "fantasyadventurersoutfit", "name": "Traveller Outfit", "obtainable": "yes", - "price": 0, + "price": 25000, "tags": "special,", "howToGet": "Given by exotic pokemon quest npc after completing all the quests" }, @@ -264,13 +269,14 @@ "id": "fusionnerd", "name": "Fusion Outfit", "obtainable": "yes", - "price": 0, + "price": 8000, "tags": "pokemon-fused,special,", "howToGet": "cinnabar lab after fusing 100 times" }, { "id": "ghostoutfit", "name": "Ghost Outfit", + "price": 10000, "tags": "type-ghost,special", "howToGet": "type trainer" }, @@ -361,7 +367,8 @@ { "id": "idolf", "name": "Idol Dress", - "price": 7500 + "price": 7500, + "tags": "goldenrod" }, { "id": "indigoicebeams", @@ -480,6 +487,11 @@ "price": 15000, "tags": "pokemon-mudkip,pokemon-marshtomp,pokemon-swampert," }, + { + "id": "mayRS", + "name": "Sapphire Strider", + "description": "A sporty, travel-ready outfit that evokes the spirit of a fledgling Hoenn trainer." + }, { "id": "mikufairyf", "name": "Fairy Outfit (F)", @@ -589,6 +601,14 @@ "tags": "azalea,", "howToGet": "city-exclusive outfit" }, + { + "id": "policeuniform", + "name": "Police Uniform", + "description": "The official uniform worn by the Kanto and Johto Police Department.", + "price": 0, + "tags": "special,", + "howToGet": "pinkan island quest (police side)" + }, { "id": "Ramos", "name": "Gardener Outfit", @@ -598,6 +618,13 @@ "tags": "kalos,", "howToGet": "regional set" }, + { + "id": "rangeruniform", + "name": "Ranger Uniform", + "description": "The uniform worn by those who dedicate their lives to protecting nature.", + "price": 2000, + "tags": "mahogany" + }, { "id": "red", "name": "Red jacket and Jeans", @@ -716,13 +743,21 @@ { "id": "RocketJames", "name": "White Rocket Uniform (M)", + "price": 0, "tags": "special" }, { "id": "RocketJessie", "name": "White Rocket Uniform (F)", + "price": 0, "tags": "special" }, + { + "id": "sludgeM", + "name": "Sludge Drip", + "price": 4500, + "tags": "cinnabar" + }, { "id": "splicer", "name": "Splicer Outfit", @@ -758,6 +793,12 @@ "tags": "type-steel,special", "howToGet": "type trainer (steel)" }, + { + "id": "streetwear", + "name": "Street Wear", + "price": 1200, + "tags": "blackthorn," + }, { "id": "summerdress", "name": "Summer Dress", @@ -766,6 +807,18 @@ "price": 1500, "tags": "default" }, + { + "id": "teamaquaF", + "name": "Aqua Uniform (F)", + "price": 6000, + "tags": "special" + }, + { + "id": "teamaquaM", + "name": "Aqua Uniform (M)", + "price": 6000, + "tags": "special" + }, { "id": "trevenantforestkingcloak", "name": "Forest King Cloak", diff --git a/Data/outfits/hairstyles_data.json b/Data/outfits/hairstyles_data.json index aac58be44..01e367942 100644 --- a/Data/outfits/hairstyles_data.json +++ b/Data/outfits/hairstyles_data.json @@ -630,12 +630,6 @@ "price": 500, "tags": "short, untied, smooth,cinnabar," }, - { - "id": "shortbeard", - "name": "Short Beard", - "description": "Either you miraculously got the ability to grow beard as a child, or you got creative with glue and salon floor clippings.", - "price": 500 - }, { "id": "shortcut", "name": "Square-Cut Bangs", diff --git a/Data/outfits/hats_data.json b/Data/outfits/hats_data.json index 2afa4e358..dc74610ba 100644 --- a/Data/outfits/hats_data.json +++ b/Data/outfits/hats_data.json @@ -49,6 +49,13 @@ "tags": "mask,pokemon-zorua,pokemon-zoroark", "howToGet": "Found in berry forest" }, + { + "id": "beret", + "name": "Beret", + "description": "It's a quirky beret. It's commonly used in Pokémon Contest.", + "price": 500, + "tags": "hat" + }, { "id": "bianca", "name": "Striped Beret", @@ -70,11 +77,18 @@ "howToGet": "regional set" }, { - "id": "BirthdayCake", - "name": "Birthday Cake", - "description": "A tasty birthday cake full of frosting! Wear it on your head a statement.", - "price": 4000, - "tags": "hat," + "id": "bigbarrette", + "name": "Big Barrette", + "description": "It's a cute barrette. It's commonly used as an accessory in Pokémon contests.", + "price": 400, + "tags": "hairclip," + }, + { + "id": "blacktie", + "name": "Black Tie", + "description": "It's an elegant tie. It's commonly used as an accessory in Pokémon contests.", + "price": 400, + "tags": "neckwear," }, { "id": "blaineGlasses", @@ -86,6 +100,25 @@ "tags": "glasses,trainer,type-fire,", "howToGet": "gym reward" }, + { + "id": "bluebarrette", + "name": "Blue Barrette", + "description": "It's a cute barrette. It's commonly used as an accessory in Pokémon contests.", + "price": 300, + "tags": "hairclip," + }, + { + "id": "blueflower", + "name": "Blue Flower", + "description": "It's a cute flower. It's commonly used as an accessory in Pokémon contests." + }, + { + "id": "bowtie", + "name": "Bow Tie", + "description": "It's an elegant tie. It's commonly used as an accessory in Pokémon contests.", + "price": 300, + "tags": "neckwear" + }, { "id": "box", "name": "Cardboard Box", @@ -179,15 +212,17 @@ "description": "Long antennas that make you look like you're a Bug-Type Pokémon.", "done": "yes", "len": 64, - "price": 0, + "price": 3500, "tags": "headband,azalea", + "storelocation": "azalea", "howToGet": "type trainer" }, { "id": "cafe", "name": "Sturdy Beret", "price": 500, - "tags": "vermillion," + "tags": "vermillion,", + "storelocation": "vermillion" }, { "id": "calem", @@ -199,6 +234,13 @@ "tags": "hat,trainer,kalos,", "howToGet": "regional set" }, + { + "id": "candy", + "name": "Candy", + "description": "It's a cute clip. It's commonly used as an accessory in Pokémon contests.", + "price": 200, + "tags": "hairclip," + }, { "id": "carbink", "name": "Carbink Headband", @@ -207,6 +249,12 @@ "price": 5000, "tags": "hat,pokemon-carbink" }, + { + "author": "weaselsheep", + "id": "cheftoque", + "name": "Chef Toque", + "description": "A pleated hat, representing mastery in the kitchen. Smells like pie." + }, { "id": "chuckmoustache", "name": "Eyebrows & Stache", @@ -240,7 +288,7 @@ "description": "A pink headband ressembling the ears and hair curl of a Clefairy.", "done": "yes", "len": 65, - "price": 2000, + "price": 500, "tags": "headband,pokemon-clefairy,pokemon-cleffa,pokemon-clefable", "howToGet": "gym reward" }, @@ -258,6 +306,7 @@ "len": 52, "price": 4500, "tags": "hat,lavender,", + "storelocation": "lavender", "howToGet": "city exclusive" }, { @@ -287,6 +336,20 @@ "price": 25000, "tags": "headband,pokemon-cresselia" }, + { + "id": "crimsonscarf", + "name": "Crimson Scarf", + "description": "It's a cute scarf. It's commonly used as an accessory in Pokémon contests.", + "price": 600, + "tags": "neckwear" + }, + { + "id": "crown", + "name": "Crown", + "description": "It's an elegant crown. It's commonly used in Pokémon Contests.", + "price": 100000, + "tags": "hat" + }, { "id": "cutecatears", "name": "Cat Ears", @@ -315,6 +378,13 @@ "tags": "hat,trainer,sinnoh,", "howToGet": "regional set" }, + { + "id": "decorativeribbon", + "name": "Decorative Ribbon", + "description": "It's a cute ribbon. It's commonly used as an accessory in Pokémon contests.", + "price": 400, + "tags": "hairclip," + }, { "id": "designerheadphones", "name": "Designer Headphones", @@ -331,12 +401,24 @@ "price": 50000, "tags": "hat,pokemon-diancie" }, + { + "id": "whitedominomask", + "name": "White Domino Mask", + "description": "It's a cool mask. It's commonly used as an accessory in Pokémon contests." + }, { "id": "dragonitehorns", "name": "Dragonite Horns", "price": 4500, "tags": "hat,pokemon-dratini,pokemon-dragonair,pokemon-dragonite," }, + { + "id": "dressytie", + "name": "Dressy Tie", + "description": "It's an elegant tie. It's commonly used as an accessory in Pokémon contests.", + "price": 600, + "tags": "neckwear" + }, { "id": "drifloon", "name": "Drifloon Hat", @@ -370,6 +452,7 @@ { "id": "eeveeears", "name": "Eevee Ears", + "price": 4500, "tags": "hairband,pokemon-eevee," }, { @@ -420,6 +503,13 @@ "tags": "headband,", "howToGet": "gym reward" }, + { + "id": "explorersscarf", + "name": "Explorer's Scarf", + "description": "It's a jaunty scarf commonly worn by explorers and rescue teams.", + "price": 800, + "tags": "neckwear" + }, { "id": "falknerscage", "name": "Bird Cage", @@ -430,6 +520,11 @@ "tags": "mask,", "howToGet": "gym reward" }, + { + "id": "fedora", + "name": "Fedora", + "description": "It's a cute fedora. It's commonly used in Pokémon Contests." + }, { "id": "fez", "name": "Fez", @@ -447,6 +542,7 @@ "done": "yes", "price": 0, "tags": "hat, cinnabar,", + "storelocation": "cinnabar", "howToGet": "type trainer" }, { @@ -463,12 +559,18 @@ "tags": "hat,weather-cold," }, { + "author": "icytos", "id": "FlareonHat", "name": "Flareon Hood", "description": "An oversized hood featuring large fluffy fur and long ears, resembling a Flareon.", "price": 8000, "tags": "hat,weather-cold,pokemon-flareon," }, + { + "id": "fluffybeard", + "name": "Fluffy Beard", + "description": "It's an elegant fake beard. It's commonly used as an accessory in Pokémon contests." + }, { "id": "froghat", "name": "Frog Hat", @@ -484,10 +586,39 @@ "description": "A pair of highly sophisticated AR-glasses. They don't do anything, but they look cool!", "done": "yes", "len": 86, - "price": 0, + "price": 30000, "tags": "glasses,special,", "howToGet": "cinnabar lab after fusing 100 times" }, + { + "id": "takopus", + "name": "GastrodonHelmetEast", + "description": "Gastrodon Helmet (East)", + "done": "A helmet fashioned in the likeness of the sinnohian Sea Slug Pokemon Gastrodon. This one is green, like the eastern form. ", + "price": 10000, + "tags": "hat,pokemon-shellos_e,pokemon-gastrodon_e" + }, + { + "id": "takopus", + "name": "GastrodonHelmetWest", + "description": "Gastrodon Helmet (West)", + "done": "A helmet fashioned in the likeness of the sinnohian Sea Slug Pokemon Gastrodon. This one is brown, like the western form. ", + "price": 10000, + "tags": "hat,pokemon-shellos_w,pokemon-gastrodon_w" + }, + { + "author": ".realthree", + "id": "gentlemanshat", + "name": "Gentleman's Hat", + "description": "It's an elegant top hat. It's commonly used in Pokémon Contests.", + "price": 1200, + "tags": "hat," + }, + { + "id": "germmask", + "name": "Germ Mask", + "description": "It's a quirky mask. It's commonly used as an accessory in Pokémon contests." + }, { "id": "giovannifedora", "name": "Mobster Fedora", @@ -514,6 +645,13 @@ "price": 8000, "tags": "hat,pokemon-snorunt,pokemon-glalie,pokemon-froslass," }, + { + "author": "mystora", + "id": "gligarhorns", + "name": "Gligar Horns", + "description": "Pink horns that resemble those of a Gligar.", + "tags": "headband,pokemon-gligar,pokemon-gliscor" + }, { "id": "glasses", "name": "Round Glasses", @@ -573,6 +711,21 @@ "tags": "hat,trainer,johto,", "howToGet": "regional set" }, + { + "id": "googlyspecs", + "name": "Googly Specs", + "description": "It's a pair of quirky glasses. It's commonly used as an accessory in Pokémon contests." + }, + { + "id": "gorgeousflower", + "name": "Gorgeous Flower", + "description": "It's an elegant flower. It's commonly used as an accessory in Pokémon contests." + }, + { + "id": "gorgeousspecs", + "name": "Gorgeous Specs", + "description": "It's a pair of elegant sunglasses. It's commonly used as an accessory in Pokémon contests." + }, { "id": "grassexpert", "name": "Flower Crown", @@ -581,6 +734,11 @@ "price": 5000, "tags": "hat,headband,weather-warm," }, + { + "id": "greenbarrette", + "name": "Green Barrette", + "description": "It's a quirky barrette. It's commonly used as an accessory in Pokémon contests." + }, { "id": "halo", "name": "Halo", @@ -591,6 +749,12 @@ "tags": "floating,pokemon-shedinja", "howToGet": "reward for beating the ilex forest shedinja encounter? reward for showing a shedinja to someone?" }, + { + "id": "harmonyscarf", + "description": "It's a scarf with a mysterious pattern. Wearing it fills you with energy.", + "price": 800, + "tags": "accessory" + }, { "id": "haxorushelmet", "name": "Jaw Helmet", @@ -606,13 +770,29 @@ "price": 5000, "tags": "pokemon-hawlucha,mask," }, + { + "id": "headband", + "name": "Simple Headband", + "description": "It's a cute headband. It's commonly used as an accessory in Pokémon contests.", + "price": 400, + "tags": "headband," + }, + { + "id": ".realthree", + "name": "headgoomy", + "description": "Head Goomy", + "done": "This Goomy has taken a liking to sitting on your head and somehow never falls off.", + "price": 0, + "tags": "nest," + }, { "id": "headlacecovering", "name": "Lace Covering", "description": "A delicate see-through lace covering that is worn over the head.", "done": "yes", "price": 1500, - "tags": "hat,vermillion" + "tags": "hat,vermillion", + "storelocation": "vermillion," }, { "id": "headparas", @@ -630,7 +810,16 @@ "done": "yes", "len": 99, "price": 6000, - "tags": "headband,saffron," + "tags": "headband,saffron,", + "storelocation": "saffron," + }, + { + "author": ".realthree", + "id": "helmet", + "name": "Helmet", + "description": "A hard helmet that's used to protect your head when doing construction work.", + "price": 400, + "tags": "hat" }, { "id": "hijabblack", @@ -657,7 +846,8 @@ "done": "yes", "len": 47, "price": 1000, - "tags": "hat,celadon," + "tags": "hat,celadon,", + "storelocation": "celadon," }, { "id": "hijablight", @@ -666,7 +856,8 @@ "done": "yes", "len": 50, "price": 1000, - "tags": "hat,celadon," + "tags": "hat,celadon,", + "storelocation": "celadon," }, { "id": "hijabwhite", @@ -675,7 +866,8 @@ "done": "yes", "len": 59, "price": 1000, - "tags": "hat,celadon," + "tags": "hat,celadon,", + "storelocation": "celadon," }, { "id": "hilda", @@ -703,11 +895,26 @@ "tags": "hat,trainer,unova,", "howToGet": "regional set" }, + { + "author": ".realthree", + "id": "hornedhelm", + "name": "Horned Helm", + "description": "It's a cool helmet with horns. It's commonly used in Pokémon Contests.", + "price": 800 + }, { "id": "idolf", "name": "Heart Headband", "price": 4500, - "tags": "headband,goldenrod" + "tags": "headband,goldenrod", + "storelocation": "goldenrod," + }, + { + "author": ".realthree", + "id": "jesterscap", + "name": "Jester's Cap", + "description": "It's a quirky hat. It's commonly used in Pokémon Contests.", + "price": 600 }, { "id": "karateHeadband", @@ -715,7 +922,7 @@ "description": "A red headband tied tightly around the forehead. It’s worn by trainers who strive for discipline and strength.", "done": "yes", "price": 6000, - "tags": "headband,saffron,pokemon-luvdisc,", + "tags": "hat", "howToGet": "type trainer" }, { @@ -725,7 +932,7 @@ "done": "yes", "len": 60, "price": 18000, - "tags": "floating,trainer,", + "tags": "floating,trainer,neckwear,", "howToGet": "gym reward" }, { @@ -748,6 +955,14 @@ "tags": "mask,pokemon-ledian", "howToGet": "gym reward" }, + { + "author": ".realthree", + "id": "lacecap", + "name": "Lace Cap", + "description": "It's an elegant cap. It's commonly used in Pokémon Contests.", + "price": 800, + "tags": "hat" + }, { "id": "lady", "name": "Sun Hat", @@ -757,16 +972,27 @@ "price": 1500, "tags": "hat,weather-warm,default," }, + { + "id": "laurelwreath", + "name": "Laurel Wreath", + "description": "It's an elegant wreath. It's commonly used as an accessory in Pokémon contests." + }, { "id": "leaf", "name": "White Boater Hat", "description": "Your iconic white hat. You and your sibling like to trade it sometimes.", "done": "yes", "len": 71, - "price": 100, + "price": 400, "tags": "hat,trainer", "howToGet": "start" }, + { + "author": ".realthree", + "id": "lonelyflower", + "name": "Lonely Flower", + "description": "It's an elegant flower. It's commonly used as an accessory in Pokémon contests." + }, { "id": "lucasDPP", "name": "Red Flat Cap", @@ -901,10 +1127,16 @@ "description": "A flower hairclip that is similar to the one worn by a famous singer.", "done": "yes", "len": 69, - "price": 0, + "price": 3000, "tags": "hairclip,trainer,type-fairy,special,", "howToGet": "type trainer" }, + { + "author": ".realthree", + "id": "monocle", + "name": "Monocle", + "description": "It's an elegant monocle. It's commonly used as an accessory in Pokémon contests." + }, { "id": "mortyHeadband", "name": "Purple Headband", @@ -954,7 +1186,7 @@ { "id": "nursejoy", "name": "Blank Nurse Cap", - "description": "A white hat that decidedly does not violite the Geneva Convention. It's usually worn by nurses", + "description": "A white hat that decidedly does not violate the Geneva Convention. It's usually worn by nurses", "price": 25000, "tags": "hat,pokemon-happiny,pokemon-chansey,pokemon-blissey", "howToGet": "quest in a broken down pokecenter, gotta help heal up a bunch of mons that are in critical condition (give potions etc to npc mons)? " @@ -962,8 +1194,8 @@ { "id": "nursejoyhat", "name": "Nurse Cap", - "description": "A white hat bearing a red cross that violates the Geneva Convention. It's usually worn by nurses.", - "len": 97, + "description": "A white hat bearing a non-red cross that no longer violates the Geneva Convention. It's usually worn by nurses.", + "len": 111, "price": 25000, "tags": "hat,pokemon-happiny,pokemon-chansey,pokemon-blissey", "howToGet": ";" @@ -1084,6 +1316,28 @@ "tags": "nest,", "howToGet": "stay idle in viridian forest" }, + { + "author": ".realthree", + "id": "pinkbarrette", + "name": "Pink Barrette", + "description": "It's a cute barrette. It's commonly used as an accessory in Pokémon contests.", + "price": 300, + "tags": "hairclip," + }, + { + "author": ".realthree", + "id": "piratehat", + "name": "Pirate Hat", + "description": "It's a cool bicorn. It's commonly used in Pokémon Contests.", + "tags": "hat" + }, + { + "author": ".realthree", + "id": "professorhat", + "name": "Professor Hat", + "description": "It's a quirky cap. It's commonly used in Pokémon Contests.", + "price": 450 + }, { "id": "PKMBreeder", "name": "Loose Bandana", @@ -1098,7 +1352,8 @@ "done": "yes", "len": 100, "price": 2500, - "tags": "hat,pokemon-ekans,pokemon-arbork,type-poison,fuchsia," + "tags": "hat,pokemon-ekans,pokemon-arbork,type-poison,fuchsia,", + "storelocation": "fuchsia" }, { "id": "poisonf", @@ -1107,7 +1362,16 @@ "done": "yes", "len": 102, "price": 2500, - "tags": "hat,pokemon-ekans,pokemon-arbork,type-poison,fuchsia," + "tags": "hat,pokemon-ekans,pokemon-arbork,type-poison,fuchsia,", + "storelocation": "fuchsia" + }, + { + "author": ".realthree", + "id": "policeuniform", + "name": "Police Cap", + "description": "It’s a cap worn for serving on the force or impersonating an officer.", + "price": 2000, + "tags": "hat,special," }, { "id": "postman", @@ -1118,6 +1382,14 @@ "tags": "hat,", "howToGet": "TR celadon quest" }, + { + "author": "chromaerym", + "id": "prinplupcap", + "name": "Prinplup cap", + "description": "A cap reminiscent of the head of a Prinplup.", + "price": 4500, + "tags": "hat,pokemon-piplup,pokemon-prinplup,pokemon-empoleon," + }, { "id": "prycemask", "name": "Glalie Mask", @@ -1158,10 +1430,24 @@ "description": "Your iconic red cap. You and your sibling like to trade it sometimes.", "done": "yes", "len": 69, - "price": 0, + "price": 400, "tags": "hat,", "howToGet": "start" }, + { + "author": ".realthree", + "id": "redbarrette", + "name": "Red Barrette", + "description": "It's a cute barrette. It's commonly used as an accessory in Pokémon contests.", + "price": 400, + "tags": "hairclip," + }, + { + "author": ".realthree", + "id": "redflower", + "name": "Red Flower", + "description": "It's a cute flower. It's commonly used as an accessory in Pokémon contests." + }, { "id": "registeelhelm", "name": "Steel Titan Helm", @@ -1197,6 +1483,12 @@ "tags": "hat,trainer,special,", "howToGet": "nugget bridge recruiter" }, + { + "author": ".realthree", + "id": "rose", + "name": "Rose", + "description": "It's an elegant flower. It's commonly used as an accessory in Pokémon contests." + }, { "id": "rosa", "name": "Pink & White Visor", @@ -1221,7 +1513,8 @@ "done": "yes", "len": 37, "price": 4500, - "tags": "glasses,mask,pokemon-budew,pokemon-roselia,pokemon-roserade,celadon" + "tags": "glasses,mask,pokemon-budew,pokemon-roselia,pokemon-roserade,celadon", + "storelocation": "celadon," }, { "id": "roseradeM", @@ -1230,7 +1523,16 @@ "done": "yes", "len": 37, "price": 4500, - "tags": "glasses,mask,pokemon-budew,pokemon-roselia,pokemon-roserade,celadon" + "tags": "glasses,mask,pokemon-budew,pokemon-roselia,pokemon-roserade,celadon", + "storelocation": "celadon," + }, + { + "author": ".realthree", + "id": "roundbutton", + "name": "Round Button", + "description": "It's a cute clip. It's commonly used in Pokémon Contests.", + "price": 100, + "tags": "hairclip," }, { "id": "sableyemask", @@ -1355,7 +1657,8 @@ "done": "yes", "len": 44, "price": 3500, - "tags": "hat,weather-cold,blackthorn,mahogany" + "tags": "hat,weather-cold,blackthorn,mahogany", + "storelocation": "blackthorn,mahogany," }, { "id": "skittyTV", @@ -1391,6 +1694,20 @@ "price": 15000, "tags": "hat,pokemon-slowbro,pokemon-slowking,pokemon-shellder" }, + { + "author": ".realthree", + "id": "smallbarrette", + "name": "Small Barrette", + "description": "It's a cute barrette. It's commonly used as an accessory in Pokémon contests.", + "price": 400, + "tags": "hairclip," + }, + { + "author": ".realthree", + "id": "smileyfacemask", + "name": "Smiley-Face Mask", + "description": "It's a quirky mask. It's commonly used as an accessory in Pokémon contests." + }, { "id": "sneaselfeather", "name": "Sharp Feather", @@ -1416,13 +1733,26 @@ "tags": "hat,pokemon-snorunt,weather-cold," }, { - "id": "Spheal", + "author": ".realthree", + "id": "snowcrystal", + "name": "Snow Crystal", + "description": "It's an elegant clip. It's commonly used as an accessory in Pokémon contests." + }, + { + "id": "duskrd", + "name": "solosisbubble", + "description": "Solosis Bubble", + "price": 3000, + "tags": "special,pokemon-solosis,pokemon-duosion,pokemon-reuniclus" + }, + { + "id": "spheal", "name": "Head Spheal", "price": 0, "tags": "nest," }, { - "id": "Sphealwintercap", + "id": "sphealwintercap", "name": "Spheal Toque", "price": 6000, "tags": "hat,weather-cold,pokemon-spheal,pokemon-sealio,pokemon-walrein," @@ -1436,6 +1766,19 @@ "price": 18000, "tags": "hat,pokemon-fused," }, + { + "author": "gummy.frog", + "id": "sprout", + "name": "Mysterious Sprout", + "description": "Somehow, a little leaf has managed to sprout from your head.", + "tags": "hat,special" + }, + { + "author": ".realthree", + "id": "squareglasses", + "name": "Square Glasses", + "description": "It's an elegant pair of glasses. It's commonly used as an accessory in Pokémon contests." + }, { "id": "squirtlesquadshades", "name": "Squad Shades", @@ -1455,6 +1798,14 @@ "tags": "hairclip,pokemon-staryu,pokemon-starmie,type-water,", "howToGet": "gym reward" }, + { + "author": ".realthree", + "id": "stripedtie", + "name": "Striped Tie", + "description": "It's an elegant tie. It's commonly used as an accessory in Pokémon contests.", + "price": 800, + "tags": "neckwear" + }, { "id": "surgeglasses", "name": "Shock Shades", @@ -1498,6 +1849,22 @@ "price": 6000, "tags": "hat,special" }, + { + "author": ".realthree", + "id": "tiara", + "name": "Tiara", + "description": "It's an elegant tiara. It's commonly used in Pokémon Contests.", + "price": 1200, + "tags": "headband," + }, + { + "author": ".realthree", + "id": "tie", + "name": "Tie", + "description": "It's an elegant tie. It's commonly used as an accessory in Pokémon contests.", + "price": 800, + "tags": "neckwear" + }, { "id": "tophat", "name": "Red Top Hat", @@ -1544,7 +1911,8 @@ "done": "yes", "len": 49, "price": 3500, - "tags": "hat,trainer,crimson," + "tags": "hat,trainer,crimson,", + "storelocation": "crimson," }, { "id": "victor", @@ -1569,6 +1937,7 @@ "done": "yes", "price": 1500, "tags": "hat,pewter,", + "storelocation": "pewter,", "howToGet": "trainer clothing store?" }, { @@ -1577,7 +1946,32 @@ "description": "A hat worn by safari zone groundskeepers.", "done": "yes", "price": 6500, - "tags": "hat,fuchsia," + "tags": "hat,fuchsia,", + "storelocation": "fuchsia" + }, + { + "author": "chromaerym", + "id": "whiscashbowlhat", + "name": "Whiscash bowl hat", + "price": 4000, + "tags": "hat,pokemon-barboach,pokemon-whiscash,", + "storelocation": "fallarbor," + }, + { + "author": ".realthree", + "id": "whitehand", + "name": "White Hand", + "description": "This ghostly white hand doesn't seem to be visible to other people...", + "price": 0, + "tags": "special," + }, + { + "author": ".realthree", + "id": "windupkey", + "name": "Windup Key", + "description": "It's a quirky costume piece. It's commonly used in Pokémon Contests.", + "price": 300, + "tags": "accessory,hairclip," }, { "id": "winona", @@ -1585,6 +1979,14 @@ "price": 18000, "tags": "hat," }, + { + "author": ".realthree", + "id": "witchyhat", + "name": "Witchy Hat", + "description": "It's a quirky hat. It's commonly used in Pokémon Contests.", + "price": 1100, + "tags": "hat," + }, { "id": "wooperclips", "name": "Wooper Hair Clips", @@ -1603,6 +2005,7 @@ "len": 72, "price": 2500, "tags": "hat,trainer,pewter,", + "storelocation": "pewter,", "howToGet": "trainer clothing store?" }, { @@ -1612,6 +2015,15 @@ "done": "yes", "price": 1500, "tags": "hat,pewter,", + "storelocation": "pewter,", "howToGet": "city exclusive" + }, + { + "author": "Busilisk", + "id": "zigzaghat", + "name": "Head Zigzagoon", + "description": "A Zigzagoon that has taken a liking to perching atop a trainer's head.", + "price": 0, + "tags": "nest," } ] \ No newline at end of file diff --git a/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx b/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx index e79d80224..8df9d578e 100644 Binary files a/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx and b/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx differ diff --git a/Graphics/Characters/player/clothes/richboy2/clothes_bike_richboy2.png b/Graphics/Characters/player/clothes/richboy2/clothes_bike_richboy2.png index e8fd9923c..6e868a023 100644 Binary files a/Graphics/Characters/player/clothes/richboy2/clothes_bike_richboy2.png and b/Graphics/Characters/player/clothes/richboy2/clothes_bike_richboy2.png differ diff --git a/Graphics/Characters/player/clothes/richboy2/clothes_dive_richboy2.png b/Graphics/Characters/player/clothes/richboy2/clothes_dive_richboy2.png index 22b6c4c5a..e892eb712 100644 Binary files a/Graphics/Characters/player/clothes/richboy2/clothes_dive_richboy2.png and b/Graphics/Characters/player/clothes/richboy2/clothes_dive_richboy2.png differ diff --git a/Graphics/Characters/player/clothes/richboy2/clothes_fish_richboy2.png b/Graphics/Characters/player/clothes/richboy2/clothes_fish_richboy2.png index 827ae6751..ee9a6a2ff 100644 Binary files a/Graphics/Characters/player/clothes/richboy2/clothes_fish_richboy2.png and b/Graphics/Characters/player/clothes/richboy2/clothes_fish_richboy2.png differ diff --git a/Graphics/Characters/player/clothes/richboy2/clothes_run_richboy2.png b/Graphics/Characters/player/clothes/richboy2/clothes_run_richboy2.png index 096b738fe..7a8632110 100644 Binary files a/Graphics/Characters/player/clothes/richboy2/clothes_run_richboy2.png and b/Graphics/Characters/player/clothes/richboy2/clothes_run_richboy2.png differ diff --git a/Graphics/Characters/player/clothes/richboy2/clothes_surf_richboy2.png b/Graphics/Characters/player/clothes/richboy2/clothes_surf_richboy2.png index e39ccd3c7..efe0782e1 100644 Binary files a/Graphics/Characters/player/clothes/richboy2/clothes_surf_richboy2.png and b/Graphics/Characters/player/clothes/richboy2/clothes_surf_richboy2.png differ diff --git a/Graphics/Characters/player/clothes/richboy2/clothes_walk_richboy2.png b/Graphics/Characters/player/clothes/richboy2/clothes_walk_richboy2.png index 167cee45c..3aa456f8b 100644 Binary files a/Graphics/Characters/player/clothes/richboy2/clothes_walk_richboy2.png and b/Graphics/Characters/player/clothes/richboy2/clothes_walk_richboy2.png differ diff --git a/Graphics/Characters/player/clothes/sludgeM/clothes_bike_sludgeM.png b/Graphics/Characters/player/clothes/sludgeM/clothes_bike_sludgeM.png new file mode 100644 index 000000000..7cebd922e Binary files /dev/null and b/Graphics/Characters/player/clothes/sludgeM/clothes_bike_sludgeM.png differ diff --git a/Graphics/Characters/player/clothes/sludgeM/clothes_dive_sludgeM.png b/Graphics/Characters/player/clothes/sludgeM/clothes_dive_sludgeM.png new file mode 100644 index 000000000..0b14b11f9 Binary files /dev/null and b/Graphics/Characters/player/clothes/sludgeM/clothes_dive_sludgeM.png differ diff --git a/Graphics/Characters/player/clothes/sludgeM/clothes_fish_sludgeM.png b/Graphics/Characters/player/clothes/sludgeM/clothes_fish_sludgeM.png new file mode 100644 index 000000000..756e27b20 Binary files /dev/null and b/Graphics/Characters/player/clothes/sludgeM/clothes_fish_sludgeM.png differ diff --git a/Graphics/Characters/player/clothes/sludgeM/clothes_run_sludgeM.png b/Graphics/Characters/player/clothes/sludgeM/clothes_run_sludgeM.png new file mode 100644 index 000000000..019e571cf Binary files /dev/null and b/Graphics/Characters/player/clothes/sludgeM/clothes_run_sludgeM.png differ diff --git a/Graphics/Characters/player/clothes/sludgeM/clothes_surf_sludgeM.png b/Graphics/Characters/player/clothes/sludgeM/clothes_surf_sludgeM.png new file mode 100644 index 000000000..c6932b721 Binary files /dev/null and b/Graphics/Characters/player/clothes/sludgeM/clothes_surf_sludgeM.png differ diff --git a/Graphics/Characters/player/clothes/sludgeM/clothes_trainer_sludgeM.png b/Graphics/Characters/player/clothes/sludgeM/clothes_trainer_sludgeM.png new file mode 100644 index 000000000..d9c9cb78a Binary files /dev/null and b/Graphics/Characters/player/clothes/sludgeM/clothes_trainer_sludgeM.png differ diff --git a/Graphics/Characters/player/clothes/sludgeM/clothes_walk_sludgeM.png b/Graphics/Characters/player/clothes/sludgeM/clothes_walk_sludgeM.png new file mode 100644 index 000000000..d3a8fc164 Binary files /dev/null and b/Graphics/Characters/player/clothes/sludgeM/clothes_walk_sludgeM.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaF/clothes_bike_teamaquaF.png b/Graphics/Characters/player/clothes/teamaquaF/clothes_bike_teamaquaF.png new file mode 100644 index 000000000..37a56acf9 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaF/clothes_bike_teamaquaF.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaF/clothes_dive_teamaquaF.png b/Graphics/Characters/player/clothes/teamaquaF/clothes_dive_teamaquaF.png new file mode 100644 index 000000000..beab59a48 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaF/clothes_dive_teamaquaF.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaF/clothes_fish_teamaquaF.png b/Graphics/Characters/player/clothes/teamaquaF/clothes_fish_teamaquaF.png new file mode 100644 index 000000000..824d08de1 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaF/clothes_fish_teamaquaF.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaF/clothes_run_teamaquaF.png b/Graphics/Characters/player/clothes/teamaquaF/clothes_run_teamaquaF.png new file mode 100644 index 000000000..63619d5aa Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaF/clothes_run_teamaquaF.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaF/clothes_surf_teamaquaF.png b/Graphics/Characters/player/clothes/teamaquaF/clothes_surf_teamaquaF.png new file mode 100644 index 000000000..c5087965d Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaF/clothes_surf_teamaquaF.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaF/clothes_trainer_teamaquaF.png b/Graphics/Characters/player/clothes/teamaquaF/clothes_trainer_teamaquaF.png new file mode 100644 index 000000000..37a99bb16 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaF/clothes_trainer_teamaquaF.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaF/clothes_walk_teamaquaF.png b/Graphics/Characters/player/clothes/teamaquaF/clothes_walk_teamaquaF.png new file mode 100644 index 000000000..4dffda729 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaF/clothes_walk_teamaquaF.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaM/clothes_bike_teamaquaM.png b/Graphics/Characters/player/clothes/teamaquaM/clothes_bike_teamaquaM.png new file mode 100644 index 000000000..34ba50fca Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaM/clothes_bike_teamaquaM.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaM/clothes_dive_teamaquaM.png b/Graphics/Characters/player/clothes/teamaquaM/clothes_dive_teamaquaM.png new file mode 100644 index 000000000..e4a08be45 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaM/clothes_dive_teamaquaM.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaM/clothes_fish_teamaquaM.png b/Graphics/Characters/player/clothes/teamaquaM/clothes_fish_teamaquaM.png new file mode 100644 index 000000000..4c35b60bc Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaM/clothes_fish_teamaquaM.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaM/clothes_run_teamaquaM.png b/Graphics/Characters/player/clothes/teamaquaM/clothes_run_teamaquaM.png new file mode 100644 index 000000000..89059b0a7 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaM/clothes_run_teamaquaM.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaM/clothes_surf_teamaquaM.png b/Graphics/Characters/player/clothes/teamaquaM/clothes_surf_teamaquaM.png new file mode 100644 index 000000000..8643e007a Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaM/clothes_surf_teamaquaM.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaM/clothes_trainer_teamaquaM.png b/Graphics/Characters/player/clothes/teamaquaM/clothes_trainer_teamaquaM.png new file mode 100644 index 000000000..68fd49143 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaM/clothes_trainer_teamaquaM.png differ diff --git a/Graphics/Characters/player/clothes/teamaquaM/clothes_walk_teamaquaM.png b/Graphics/Characters/player/clothes/teamaquaM/clothes_walk_teamaquaM.png new file mode 100644 index 000000000..e20af0ac7 Binary files /dev/null and b/Graphics/Characters/player/clothes/teamaquaM/clothes_walk_teamaquaM.png differ diff --git a/Graphics/Characters/player/hat/GastrodonHelmetEast/hat_GastrodonHelmetEast.png b/Graphics/Characters/player/hat/GastrodonHelmetEast/hat_GastrodonHelmetEast.png new file mode 100644 index 000000000..74383afa9 Binary files /dev/null and b/Graphics/Characters/player/hat/GastrodonHelmetEast/hat_GastrodonHelmetEast.png differ diff --git a/Graphics/Characters/player/hat/GastrodonHelmetEast/hat_trainer_GastrodonHelmetEast.png b/Graphics/Characters/player/hat/GastrodonHelmetEast/hat_trainer_GastrodonHelmetEast.png new file mode 100644 index 000000000..863357e38 Binary files /dev/null and b/Graphics/Characters/player/hat/GastrodonHelmetEast/hat_trainer_GastrodonHelmetEast.png differ diff --git a/Graphics/Characters/player/hat/GastrodonHelmetWest/hat_GastrodonHelmetWest.png b/Graphics/Characters/player/hat/GastrodonHelmetWest/hat_GastrodonHelmetWest.png new file mode 100644 index 000000000..9e42c789d Binary files /dev/null and b/Graphics/Characters/player/hat/GastrodonHelmetWest/hat_GastrodonHelmetWest.png differ diff --git a/Graphics/Characters/player/hat/GastrodonHelmetWest/hat_trainer_GastrodonHelmetWest.png b/Graphics/Characters/player/hat/GastrodonHelmetWest/hat_trainer_GastrodonHelmetWest.png new file mode 100644 index 000000000..3c55371bf Binary files /dev/null and b/Graphics/Characters/player/hat/GastrodonHelmetWest/hat_trainer_GastrodonHelmetWest.png differ diff --git a/Graphics/Characters/player/hat/headgoomy/hat_headgoomy.png b/Graphics/Characters/player/hat/headgoomy/hat_headgoomy.png new file mode 100644 index 000000000..5a9c4ebb6 Binary files /dev/null and b/Graphics/Characters/player/hat/headgoomy/hat_headgoomy.png differ diff --git a/Graphics/Characters/player/hat/headgoomy/hat_trainer_headgoomy.png b/Graphics/Characters/player/hat/headgoomy/hat_trainer_headgoomy.png new file mode 100644 index 000000000..6204aadb5 Binary files /dev/null and b/Graphics/Characters/player/hat/headgoomy/hat_trainer_headgoomy.png differ diff --git a/Graphics/Characters/player/hat/solosisbubble/hat_solosisbubble.png b/Graphics/Characters/player/hat/solosisbubble/hat_solosisbubble.png new file mode 100644 index 000000000..e09bdfac9 Binary files /dev/null and b/Graphics/Characters/player/hat/solosisbubble/hat_solosisbubble.png differ diff --git a/Graphics/Characters/player/hat/solosisbubble/hat_trainer_solosisbubble.png b/Graphics/Characters/player/hat/solosisbubble/hat_trainer_solosisbubble.png new file mode 100644 index 000000000..a89edc507 Binary files /dev/null and b/Graphics/Characters/player/hat/solosisbubble/hat_trainer_solosisbubble.png differ diff --git a/Graphics/Characters/player/hat/whiscashbowlhat/hat_trainer_whiscashbowlhat.png b/Graphics/Characters/player/hat/whiscashbowlhat/hat_trainer_whiscashbowlhat.png new file mode 100644 index 000000000..6762ae3e3 Binary files /dev/null and b/Graphics/Characters/player/hat/whiscashbowlhat/hat_trainer_whiscashbowlhat.png differ diff --git a/Graphics/Characters/player/hat/whiscashbowlhat/hat_whiscashbowlhat.png b/Graphics/Characters/player/hat/whiscashbowlhat/hat_whiscashbowlhat.png new file mode 100644 index 000000000..afe1d314c Binary files /dev/null and b/Graphics/Characters/player/hat/whiscashbowlhat/hat_whiscashbowlhat.png differ diff --git a/Graphics/Characters/player/hat/whitehand/hat_trainer_whitehand.png b/Graphics/Characters/player/hat/whitehand/hat_trainer_whitehand.png new file mode 100644 index 000000000..9e2b5b5b2 Binary files /dev/null and b/Graphics/Characters/player/hat/whitehand/hat_trainer_whitehand.png differ diff --git a/Graphics/Characters/player/hat/whitehand/hat_whitehand.png b/Graphics/Characters/player/hat/whitehand/hat_whitehand.png new file mode 100644 index 000000000..5c036d5f4 Binary files /dev/null and b/Graphics/Characters/player/hat/whitehand/hat_whitehand.png differ