Skip to content

Commit

Permalink
Merge pull request #88 from GayBoysAdmirer/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Purge11
Purge11 authored Aug 23, 2023
2 parents 2a98972 + fbabfac commit 2823053
Show file tree
Hide file tree
Showing 64 changed files with 657 additions and 552 deletions.
14 changes: 7 additions & 7 deletions src/app/_json/accessories.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[
{
"name": "Laurena's Set",
"location": "You can get this set in Accessory Raid at $warp p3",
"location": "You can get this set in Accessory Raid at $warp p1",
"buff": "laurena_set",
"class": "pvp"
},
{
"name": "Lich Set",
"location": "You can get this set in $warp p8.2 quests, events and raids",
"location": "You can get this set in $warp p4 quests, events and raids",
"buff": "licht_set",
"class": "pvp"
},
{
"name": "Dragon Set",
"location": "You can craft this set in $warp p9 Equipments NPC",
"location": "You can craft this set in $warp p5 Equipments NPC",
"buff": "dragon_set",
"class": "pvp"
},
Expand All @@ -25,13 +25,13 @@
},
{
"name": "Loa Set",
"location": "You can get this set in Accessory Raid at $warp p3",
"location": "You can get this set in Accessory Raid at $warp p1",
"buff": "old_pvp_set",
"class": "pvp"
},
{
"name": "Tower",
"location": "You can craft this set at Tower NPC $warp p7",
"location": "You can craft this set at Tower NPC $warp p3",
"buff": "tower_set",
"class": "raid"
},
Expand All @@ -43,13 +43,13 @@
},
{
"name": "Raid Necklace",
"location": "You can craft it during Mouse Event and from Prestige 8.2 Time Space.",
"location": "You can craft it during Mouse Event and from Prestige 4 Time Space.",
"buff": "raid_necklace",
"class": "raid"
},
{
"name": "Noble Crystal Bracelet",
"location": "You can craft it during Halloween Event and from Prestige 8.2 Time Space.",
"location": "You can craft it during Halloween Event and from Prestige 4 Time Space.",
"buff": "noble_bracelet",
"class": "raid"
}
Expand Down
12 changes: 6 additions & 6 deletions src/app/_json/costumes/all-sets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
{
"name": "Concierge Uniform",
"location": "You can craft this set at Family Tower Rewards NPC $warp p8.1",
"location": "You can craft this set at Family Tower Rewards NPC $warp p4",
"skins": "concierge",
"buff": "concierge_buffs"
},
Expand All @@ -61,7 +61,7 @@
},
{
"name": "Death Lancer",
"location": "You can craft this set at Family Tower Rewards NPC $warp p8.1 or in the Fortune Wheel",
"location": "You can craft this set at Family Tower Rewards NPC $warp p4 or in the Fortune Wheel",
"skins": "death_lancer",
"buff": "death_lancer_buffs"
},
Expand All @@ -74,7 +74,7 @@

{
"name": "Dracula",
"location": "You can buy this set for 500 coins in VoidMall",
"location": "You can buy this set for 500 coins in VoidMall or can be crafted in Fernons Egg Craft NPC in $warp p2",
"skins": "dracula",
"buff": "dracula_buffs"
},
Expand All @@ -86,7 +86,7 @@
},
{
"name": "Fire Devil",
"location": "You can craft this set at Prestige 4 lobby or you can buy it for 350 coins in VoidMall",
"location": "You can craft this set atPrestige 2 Rewards NPC or you can buy it for 350 coins in VoidMall",
"skins": "fire_devil",
"buff": "fire_devil_buffs"
},
Expand Down Expand Up @@ -182,7 +182,7 @@
},
{
"name": "Nutcracker",
"location": "You can craft this set at P2 Costume NPC",
"location": "You can craft this set at Prestige 1 Rewards NPC",
"skins": "nutcracker",
"buff": "nutcracker_buffs"
},
Expand Down Expand Up @@ -236,7 +236,7 @@
},
{
"name": "Reindeer",
"location": "You can get this set at Family Tower Rewards NPC $warp p8.1 or for 450 coins in VoidMall",
"location": "You can get this set at Family Tower Rewards NPC $warp p4 or for 450 coins in VoidMall",
"skins": "reindeer",
"buff": "reindeer_buffs"
},
Expand Down
14 changes: 7 additions & 7 deletions src/app/_json/costumes/weapon-skins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
{
"name": "Heavenly Weapon Skins",
"id": "",
"location": "You can craft those weapon skins at Craft NPC (P9)",
"location": "You can craft those weapon skins at Craft NPC (P5)",
"upgrade": "You can upgrade them to +7 maximum.",
"buff": "heaven",
"class": "raid"
},
{
"name": "Hellord Weapon Skins",
"id": "",
"location": "You can craft those weapon skins at Craft NPC (P9)",
"location": "You can craft those weapon skins at Craft NPC (P5)",
"upgrade": "You can upgrade them to +7 maximum.",
"buff": "hell",
"class": "pvp"
Expand All @@ -26,23 +26,23 @@
{
"name": "Frost Weapon Skins",
"id": "",
"location": "You can craft those weapon skins at Family Tower NPC Prestige 8.1, or you can buy them for 900 coins in VoidMall.",
"location": "You can craft those weapon skins at Family Tower NPC Prestige 4, or you can buy them for 900 coins in VoidMall.",
"upgrade": "You can upgrade them to +10 maximum.",
"buff": "frost",
"class": "pvp"
},
{
"name": "Prestige 4 Weapon Skins",
"name": "Prestige 2 Weapon Skins",
"id": "",
"location": "You can craft those weapon skins at High Tier Weapon Skin NPC Prestige 4 lobby.",
"location": "You can craft those weapon skins at Prestige 2 Rewards NPC.",
"upgrade": "You can't upgrade them.",
"buff": "prestige4",
"class": "raid"
},
{
"name": "Prestige 8 Weapon Skins",
"name": "Prestige 4 Weapon Skins",
"id": "",
"location": "You can craft those weapon skins at Craft Stuff NPC Prestige 8 lobby, or you can buy them for 900 coins in VoidMall.",
"location": "You can craft those weapon skins at Craft Stuff NPC Prestige 84 lobby, or you can buy them for 900 coins in VoidMall.",
"upgrade": "You can upgrade them to +10 maximum.",
"buff": "prestige8",
"class": "pvp"
Expand Down
51 changes: 24 additions & 27 deletions src/app/_json/daily-quests.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"rewards": [{ "reward": "7x Random Amulet Box (Raid Quest)" }]
},
{
"name": "Zenas, Erenia and Fernon",
"complete": "Complete 7x Zenas, Erenia and Fernon raids",
"name": "Fernon Raid",
"complete": "15x Fernon Raid",
"rewards": [{ "reward": "7x Random Amulet Box (Raid Quest)"}]
}
]
},
{
"name": "Prestige 7 Daily Quests",
"name": "Prestige 3 Daily Quests",
"npc": "p7_quests_npc",
"todo": [
{
Expand All @@ -45,7 +45,7 @@
]
},
{
"name": "Prestige 8 Daily Quests",
"name": "Prestige 4 Daily Quests",
"npc": "p8_quests_npc",
"todo": [
{
Expand Down Expand Up @@ -86,7 +86,7 @@
]
},
{
"name": "Prestige 8.1 Daily Quests",
"name": "Prestige 4 Daily Quests",
"npc": "p81_quests_npc",
"todo": [
{
Expand Down Expand Up @@ -119,7 +119,7 @@
]
},
{
"name": "Prestige 9 Daily/Weekly Quests",
"name": "Prestige 5 Daily/Weekly Quests",
"npc": "p9_quests_npc",
"todo": [
{
Expand Down Expand Up @@ -169,31 +169,12 @@
"name": "NosVille Marathon Quests",
"npc": "p0_mara_quests_npc",
"todo": [
{
"name": "Zenas Marathon",
"complete": "Complete 200x Zenas raid (Can be done once per char)",
"rewards": [{ "reward": "King of Zenas Title"}]
},
{
"name": "Erenia Marathon",
"complete": "Complete 300x Erenia raid (Can be done once per char)",
"rewards": [{ "reward": "King of Erenia Title"}]
},

{
"name": "Fernon Marathon",
"complete": "Complete 400x Fernon raid (Can be done once per char)",
"rewards": [{ "reward": "King of Fernon Title"}]
},
{
"name": "Zenas Marathon 2",
"complete": "Complete 600x Zenas raid",
"rewards": [{ "reward": "Mini Zenas Pet"}]
},
{
"name": "Erenia Marathon 2",
"complete": "Complete 700x Erenia raid",
"rewards": [{ "reward": "Mini Erenia Pet"}]
},
},
{
"name": "Fernon Marathon 2",
"complete": "Complete 900x Fernon raid",
Expand All @@ -219,5 +200,21 @@
]
}
]
},
{
"title": "Books quest",
"quests": [
{
"name": "Obtain your hidden power",
"npc": "book_quest_npc",
"todo": [
{
"name": "Obtain your hidden power",
"complete": "Complete 1x following raids: Accesory Raid, Fernon Raid, Kirollas Raid, Pure Beast Raid.",
"rewards": [{ "reward": "Book of Powers (You will obtain all books except a4 books)."}]
}
]
}
]
}
]
17 changes: 1 addition & 16 deletions src/app/_json/fairies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,11 @@
{
"name": "Starter Fairies",
"location": "You can buy them at Starter Pack NPC in NosVille",
"buff": "starter_fairies"
},
{
"name": "Low Tier Fairies",
"location": "You can craft them at Low Tier Fairies NPC $warp p1",
"buff": "p1_fairies"
},
{
"name": "Zenas Fairies",
"location": "You can get them in Zenas raid boxes",
"buff": "zenas_fairies"
},
{
"name": "Erenia Fairies",
"location": "You can get them in Erenia raid boxes",
"buff": "erenia_fairies"
},
{
"name": "Fernon Fairies",
"location": "You can craft them at Fernon Fairy NPC $warp p5",
"location": "You can craft them at Fernon Fairy NPC $warp p2",
"buff": "fernon_fairies"
},
{
Expand Down
20 changes: 10 additions & 10 deletions src/app/_json/helmets-masks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"name": "Broken Frost Warrior Helmet",
"id": "broken-frost",
"location": "You can craft it at Kan's Rewards NPC $warp p8.2",
"location": "You can craft it at Kan's Rewards NPC $warp p4",
"buff": "broken_frost",
"class": "raid"
},
Expand All @@ -19,14 +19,14 @@
{
"name": "Ceremonial Helmet",
"id": "",
"location": "You can craft it at Family Tower Rewards NPC $warp p8.1",
"location": "You can craft it at Family Tower Rewards NPC $warp p4",
"buff": "ceremonial",
"class": "pvp"
},
{
"name": "Dark Knight Helmet",
"id": "",
"location": "You can craft it at Hardcore Rewards NPC $warp p8",
"location": "You can craft it at Hardcore Rewards NPC $warp p4",
"buff": "dark_knight_helmet",
"class": "raid"
},
Expand All @@ -47,14 +47,14 @@
{
"name": "Orc's Crown",
"id": "",
"location": "You can buy at Reputation Shop NPC $warp p8",
"location": "You can buy at Reputation Shop NPC $warp p4",
"buff": "orc_crown",
"class": "pvp"
},
{
"name": "Shadow King's Helmet",
"id": "",
"location": "You can get it from Family Tower Game Craft ($warp p8.2)",
"location": "You can get it from Family Tower Game Craft ($warp p4)",
"buff": "shadow_kings_helmet",
"class": "raid"
}
Expand All @@ -73,7 +73,7 @@
{
"name": "Crystal Mask",
"id": "",
"location": "You can buy at Reputation Shop NPC $warp p8",
"location": "You can buy at Reputation Shop NPC $warp p4",
"buff": "crystal_mask",
"class": "pvp"
},
Expand All @@ -87,21 +87,21 @@
{
"name": "Dark Knight Mask",
"id": "",
"location": "You can craft it at Hardcore Rewards NPC $warp p8",
"location": "You can craft it at Hardcore Rewards NPC $warp p4",
"buff": "dark_knight_mask",
"class": "raid"
},
{
"name": "Honeybee Shades",
"id": "",
"location": "You can craft it at Hardcore Rewards NPC $warp p8",
"location": "You can craft it at Hardcore Rewards NPC $warp p4",
"buff": "honeybee",
"class": "pvp"
},
{
"name": "Mask of the Elite",
"id": "mask-elite",
"location": "You can craft it at Kan's Rewards NPC $warp p8.2",
"location": "You can craft it at Kan's Rewards NPC $warp p4",
"buff": "mask_elite",
"class": "raid"
},
Expand All @@ -115,7 +115,7 @@
{
"name": "Shadow King's Mask",
"id": "",
"location": "You can get it from Family Tower Game Craft ($warp p8.2)",
"location": "You can get it from Family Tower Game Craft ($warp p4)",
"buff": "shadow_kings_mask",
"class": "raid"
}
Expand Down
Loading

0 comments on commit 2823053

Please sign in to comment.