diff --git a/data/in/botanics.json b/data/in/botanics.json index 1010f79..9997fc8 100644 --- a/data/in/botanics.json +++ b/data/in/botanics.json @@ -177,7 +177,7 @@ "name": "Cold-Dng-1" }, "region": { - "open": "open4.4" + "open": "mine.4" } }, "Beta Egg Pot": { @@ -186,7 +186,7 @@ "name": "Cold-Dng-2" }, "region": { - "open": "open4.4" + "open": "mine.4" } }, "Gamma Egg Pot": { @@ -195,7 +195,7 @@ "name": "Cold-Dng-3" }, "region": { - "open": "open4.4" + "open": "mine.4" } }, "Delta Egg Pot": { @@ -204,7 +204,7 @@ "name": "Cold-Dng-4" }, "region": { - "open": "open4.4" + "open": "mine.4" } }, "Omega Egg Pot A": { @@ -213,7 +213,7 @@ "name": "Cold-Dng-Special-1" }, "region": { - "open": "open4.4" + "open": "mine.4" } }, "Omega Egg Pot B": { @@ -222,7 +222,7 @@ "name": "Cold-Dng-Special-2" }, "region": { - "open": "open4.4" + "open": "mine.4" } }, "Alpha Dry Cactone": { diff --git a/data/in/chests.json b/data/in/chests.json index 2992bbd..b50de22 100644 --- a/data/in/chests.json +++ b/data/in/chests.json @@ -19,16 +19,7 @@ ] ], "condition": [ - [ - "item", - "Heat", - 1 - ], - [ - "item", - "Cold", - 1 - ] + ["defeat", "Neutral Virus", "Heat Virus", "Cold Virus"] ] }, "Wasteland: Spiral Cliff Upper": { @@ -50,16 +41,7 @@ ] ], "condition": [ - [ - "item", - "Heat", - 1 - ], - [ - "item", - "Cold", - 1 - ] + ["defeat", "Neutral Virus", "Heat Virus", "Cold Virus"] ] }, "Wasteland: Storage Basement": { @@ -383,6 +365,9 @@ "Broken Gauntlet", 1 ] + ], + "condition": [ + ["defeat", "Hedgehag", "Old Hedgehag", "Blue Hedgehag"] ] }, "Rise: Pathway 1": { @@ -782,6 +767,9 @@ "Tremor Engine", 1 ] + ], + "condition": [ + ["defeat", "Chillin' Hillkat"] ] }, "Fall: Lake Cave 3": { @@ -795,6 +783,9 @@ "linear": "20", "open": "open9" }, + "condition": [ + ["defeat", "Chillin' Hillkat", "Radical Hedgehag"] + ], "reward": [ [ "item", @@ -1219,6 +1210,9 @@ "Portrait of Ruin", 1 ] + ], + "condition": [ + ["defeat", "Aranetarda"] ] }, "Fall: Villa of Terror Left": { @@ -1238,6 +1232,9 @@ "Golden Ticket", 1 ] + ], + "condition": [ + ["defeat", "Aranetarda"] ] }, "Fall: Para Island 1": { @@ -1590,19 +1587,16 @@ "linear": "3", "open": "open3" }, + "condition": [ + ["item", "Heat", 1], + ["defeat", "Pengpeng", "Peng King Dakara"] + ], "reward": [ [ "item", "Broken Shield", 1 ] - ], - "condition": [ - [ - "item", - "Heat", - 1 - ] ] }, "Trail: Entrance Left": { @@ -1978,6 +1972,9 @@ "Perforated Tophat", 1 ] + ], + "condition": [ + ["defeat", "Karotto"] ] }, "Trail: Rising Path 4 Lower": { @@ -2018,11 +2015,7 @@ ] ], "condition": [ - [ - "item", - "Heat", - 1 - ] + [ "item", "Heat", 1 ] ] }, "Trail: Windy Climb": { @@ -2072,7 +2065,7 @@ "clearance": "Default", "region": { "linear": "5", - "open": "open4.2" + "open": "mine.2" }, "reward": [ [ @@ -2091,7 +2084,7 @@ "clearance": "Default", "region": { "linear": "5", - "open": "open4.2" + "open": "mine.3" }, "reward": [ [ @@ -2101,11 +2094,7 @@ ] ], "condition": [ - [ - "item", - "Heat", - 1 - ] + [ "item", "Heat", 1 ] ] }, "Mine U1: Old Shaft 1": { @@ -2117,7 +2106,7 @@ "clearance": "Default", "region": { "linear": "5", - "open": "open4.2" + "open": "mine.2" }, "reward": [ [ @@ -2127,11 +2116,7 @@ ] ], "condition": [ - [ - "item", - "Heat", - 1 - ] + [ "item", "Heat", 1 ] ] }, "Mine U1: Old Shaft 2": { @@ -2143,7 +2128,7 @@ "clearance": "Default", "region": { "linear": "5", - "open": "open4.2" + "open": "mine.3" }, "reward": [ [ @@ -2162,7 +2147,7 @@ "clearance": "Default", "region": { "linear": "5", - "open": "open4.2" + "open": "mine.3" }, "reward": [ [ @@ -2170,6 +2155,9 @@ "Mine Key", 1 ] + ], + "condition": [ + [ "defeat", "Fleazer" ] ] }, "Mine U1: Old Chamber": { @@ -2181,7 +2169,7 @@ "clearance": "Default", "region": { "linear": "6", - "open": "open4.3" + "open": "mine.2" }, "reward": [ [ @@ -2189,6 +2177,9 @@ "Mine Key", 1 ] + ], + "condition": [ + [ "item", "Mine Key", 2 ] ] }, "Mine U2: Storage Room 1": { @@ -2200,7 +2191,7 @@ "clearance": "Bronze", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.4" }, "reward": [ [ @@ -2219,7 +2210,7 @@ "clearance": "Default", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.5" }, "reward": [ [ @@ -2238,7 +2229,7 @@ "clearance": "Bronze", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.6" }, "reward": [ [ @@ -2257,7 +2248,7 @@ "clearance": "Bronze", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.6" }, "reward": [ [ @@ -2276,7 +2267,7 @@ "clearance": "Default", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.4" }, "reward": [ [ @@ -2295,7 +2286,7 @@ "clearance": "Default", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.4" }, "reward": [ [ @@ -2314,7 +2305,7 @@ "clearance": "Default", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.5" }, "reward": [ [ @@ -2333,7 +2324,7 @@ "clearance": "Bronze", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.5" }, "reward": [ [ @@ -2352,7 +2343,7 @@ "clearance": "Default", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.5" }, "reward": [ [ @@ -2360,6 +2351,9 @@ "Mine Key", 1 ] + ], + "condition": [ + [ "defeat", "Fleazer" ] ] }, "Mine U3: Overrun Chamber Lower": { @@ -2371,7 +2365,7 @@ "clearance": "Default", "region": { "linear": "7", - "open": "open4.4" + "open": "mine.5" }, "reward": [ [ @@ -2379,6 +2373,9 @@ "Vanilla Ice Cream", 2 ] + ], + "condition": [ + [ "defeat", "Fleazer" ] ] }, "Mine U4: Elevator": { @@ -2390,7 +2387,7 @@ "clearance": "Default", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.7" }, "reward": [ [ @@ -2398,13 +2395,6 @@ "Winterclaw", 1 ] - ], - "condition": [ - [ - "item", - "Thief's Key", - 1 - ] ] }, "Mine U4: Infested Chamber": { @@ -2416,7 +2406,7 @@ "clearance": "Default", "region": { "linear": "10", - "open": "open4.7" + "open": "mine.7" }, "reward": [ [ @@ -2426,11 +2416,7 @@ ] ], "condition": [ - [ - "item", - "Thief's Key", - 1 - ] + [ "item", "Mine Key", 5 ] ] }, "Mine U4: Forgotten Shaft 1": { @@ -2442,7 +2428,7 @@ "clearance": "Default", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.7" }, "reward": [ [ @@ -2450,13 +2436,6 @@ "Mine Key", 1 ] - ], - "condition": [ - [ - "item", - "Thief's Key", - 1 - ] ] }, "Mine U4: Forgotten Shaft 2": { @@ -2468,7 +2447,7 @@ "clearance": "Bronze", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.7" }, "reward": [ [ @@ -2476,13 +2455,6 @@ "Ancient Sandals", 1 ] - ], - "condition": [ - [ - "item", - "Thief's Key", - 1 - ] ] }, "Mine U4: Forgotten Shaft 3": { @@ -2494,7 +2466,7 @@ "clearance": "Default", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.7" }, "reward": [ [ @@ -2502,13 +2474,6 @@ "Mine Key", 1 ] - ], - "condition": [ - [ - "item", - "Thief's Key", - 1 - ] ] }, "Mine U4: Forgotten Shaft 4": { @@ -2520,7 +2485,7 @@ "clearance": "Default", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.7" }, "reward": [ [ @@ -2528,13 +2493,6 @@ "Mine Key", 1 ] - ], - "condition": [ - [ - "item", - "Thief's Key", - 1 - ] ] }, "Mine U4: Forgotten Shaft 5": { @@ -2546,7 +2504,7 @@ "clearance": "Default", "region": { "linear": "9", - "open": "open4.6" + "open": "mine.7" }, "reward": [ [ @@ -2554,13 +2512,6 @@ "Mine Key", 1 ] - ], - "condition": [ - [ - "item", - "Thief's Key", - 1 - ] ] }, "Mine GF: Elevator": { @@ -2572,7 +2523,7 @@ "clearance": "Bronze", "region": { "linear": "4", - "open": "open4.1" + "open": "mine.1" }, "reward": [ [ @@ -2582,11 +2533,7 @@ ] ], "condition": [ - [ - "item", - "Heat", - 1 - ] + [ "item", "Heat", 1 ] ] }, "Mine GF: Temple Chamber 2": { @@ -2598,7 +2545,7 @@ "clearance": "Default", "region": { "linear": "4", - "open": "open4.1" + "open": "mine.1" }, "reward": [ [ @@ -2653,16 +2600,9 @@ ] ], "condition": [ - [ - "item", - "Shock", - 1 - ], - [ - "item", - "Wave", - 1 - ] + ["item", "Shock", 1], + ["item", "Wave", 1], + ["defeat", "Aranetarda", "War Webster", "Pandza Mk. II"] ] }, "Ridge: Sapphire Tunnel": { @@ -2701,6 +2641,9 @@ "Cobalt Crystal", 4 ] + ], + "condition": [ + ["defeat", "Aranetarda"] ] }, "Ridge: Eroded Passage Upper": { @@ -2777,6 +2720,9 @@ "Wrap Roll", 5 ] + ], + "condition": [ + ["defeat", "Aranetarda", "Moon Beetle"] ] }, "Ridge: Narrow Passage Right": { @@ -2796,6 +2742,9 @@ "Spark Tin", 8 ] + ], + "condition": [ + ["defeat", "Aranetarda", "Moon Beetle"] ] }, "Ridge: Wheel Passage Lower": { @@ -3235,11 +3184,8 @@ ] ], "condition": [ - [ - "item", - "Shock", - 1 - ] + ["item", "Shock", 1], + ["defeat", "Aranetarda"] ] }, "Ridge: Carved Pathway Upper": { @@ -3261,11 +3207,8 @@ ] ], "condition": [ - [ - "item", - "Shock", - 1 - ] + ["item", "Shock", 1], + ["defeat", "Aranetarda"] ] }, "Ridge: High Ground Lower": { @@ -3375,6 +3318,9 @@ "Warkeeper", 1 ] + ], + "condition": [ + ["defeat", "Moon Beetle", "Sun Beetle"] ] }, "Ridge: Dream Pond": { @@ -3586,6 +3532,9 @@ "Broken Sword", 1 ] + ], + "condition": [ + ["defeat", "Cursed Sharkster"] ] }, "Maroon: Maroon Cave 1": { @@ -4068,6 +4017,9 @@ "Shrimp Risotto", 5 ] + ], + "condition": [ + ["defeat", "Sharkster"] ] }, "Maroon: Torn Road Center": { @@ -4174,7 +4126,7 @@ "clearance": "Default", "region": { "linear": "15", - "open": "open7.3" + "open": "fajro.4" }, "reward": [ [ @@ -4193,7 +4145,7 @@ "clearance": "Default", "region": { "linear": "17", - "open": "open7.5" + "open": "fajro.6" }, "reward": [ [ @@ -4212,7 +4164,7 @@ "clearance": "Bronze", "region": { "linear": "17.5", - "open": "open7.6" + "open": "fajro.8" }, "reward": [ [ @@ -4231,7 +4183,7 @@ "clearance": "Silver", "region": { "linear": "17.5", - "open": "open7.6" + "open": "fajro.8" }, "reward": [ [ @@ -4250,7 +4202,7 @@ "clearance": "Default", "region": { "linear": "17.5", - "open": "open7.6" + "open": "fajro.7" }, "reward": [ [ @@ -4258,6 +4210,9 @@ "Faj'ro Key", 1 ] + ], + "condition": [ + [ "defeat", "Trijelly" ] ] }, "Faj'ro 4F: West Pathway": { @@ -4269,7 +4224,7 @@ "clearance": "Default", "region": { "linear": "17", - "open": "open7.5" + "open": "fajro.7" }, "reward": [ [ @@ -4288,7 +4243,7 @@ "clearance": "Default", "region": { "linear": "17", - "open": "open7.5" + "open": "fajro.8" }, "reward": [ [ @@ -4296,6 +4251,9 @@ "Faj'ro Key", 1 ] + ], + "condition": [ + [ "defeat", "Trijelly" ] ] }, "Faj'ro 4F: West Chamber 1": { @@ -4307,7 +4265,7 @@ "clearance": "Default", "region": { "linear": "17.5", - "open": "open7.6" + "open": "fajro.8" }, "reward": [ [ @@ -4326,7 +4284,7 @@ "clearance": "Default", "region": { "linear": "17.5", - "open": "open7.6" + "open": "fajro.9" }, "reward": [ [ @@ -4345,7 +4303,7 @@ "clearance": "Silver", "region": { "linear": "17", - "open": "open7.5" + "open": "fajro.9" }, "reward": [ [ @@ -4353,6 +4311,9 @@ "Dented Crown", 1 ] + ], + "condition": [ + [ "item", "Heat" ] ] }, "Faj'ro 4F: Test of Memory": { @@ -4364,7 +4325,7 @@ "clearance": "Default", "region": { "linear": "17.5", - "open": "open7.6" + "open": "fajro.9" }, "reward": [ [ @@ -4372,6 +4333,9 @@ "Faj'ro Key", 1 ] + ], + "condition": [ + [ "defeat", "Boss Pincer" ] ] }, "Faj'ro 4F: Chamber of Prosperity": { @@ -4383,7 +4347,7 @@ "clearance": "Default", "region": { "linear": "18", - "open": "open7.7" + "open": "fajro.8" }, "reward": [ [ @@ -4391,6 +4355,48 @@ "Faj'ro Master Key", 1 ] + ], + "condition": [ + [ "item", "Heat" ], + [ "defeat", "Darth Moth" ] + ] + }, + "Faj'ro GF: Balance Room 1 Left": { + "location": { + "area": "heat-dng", + "map": "heat-dng.g.room-02-cross", + "mapId": 1276 + }, + "clearance": "Default", + "region": { + "linear": "14", + "open": "fajro.4" + }, + "reward": [ + [ + "item", + "Flaming Bun", + 2 + ] + ] + }, + "Faj'ro GF: Balance Room 1 Right": { + "location": { + "area": "heat-dng", + "map": "heat-dng.g.room-02-cross", + "mapId": 1277 + }, + "clearance": "Default", + "region": { + "linear": "14", + "open": "fajro.4" + }, + "reward": [ + [ + "item", + "Salty Ice Cream", + 2 + ] ] }, "Faj'ro GF: Left Chamber 1": { @@ -4402,7 +4408,7 @@ "clearance": "Default", "region": { "linear": "13", - "open": "open7.1" + "open": "fajro.1" }, "reward": [ [ @@ -4410,6 +4416,9 @@ "Faj'ro Key", 1 ] + ], + "condition": [ + [ "item", "Heat" ] ] }, "Faj'ro GF: Fire and Sand 2": { @@ -4421,7 +4430,7 @@ "clearance": "Default", "region": { "linear": "14", - "open": "open7.2" + "open": "fajro.2" }, "reward": [ [ @@ -4440,7 +4449,7 @@ "clearance": "Default", "region": { "linear": "14", - "open": "open7.2" + "open": "fajro.3" }, "reward": [ [ @@ -4459,7 +4468,7 @@ "clearance": "Default", "region": { "linear": "14", - "open": "open7.2" + "open": "fajro.3" }, "reward": [ [ @@ -4478,7 +4487,7 @@ "clearance": "Default", "region": { "linear": "14", - "open": "open7.2" + "open": "fajro.3" }, "reward": [ [ @@ -4497,7 +4506,7 @@ "clearance": "Default", "region": { "linear": "14", - "open": "open7.2" + "open": "fajro.3" }, "reward": [ [ @@ -4516,7 +4525,7 @@ "clearance": "Default", "region": { "linear": "14", - "open": "open7.2" + "open": "fajro.3" }, "reward": [ [ @@ -4524,6 +4533,9 @@ "Faj'ro Key", 1 ] + ], + "condition": [ + [ "defeat", "Tim" ] ] }, "Faj'ro GF: Test of Memory Right": { @@ -4535,7 +4547,7 @@ "clearance": "Default", "region": { "linear": "14", - "open": "open7.2" + "open": "fajro.3" }, "reward": [ [ @@ -4543,6 +4555,9 @@ "Faj'ro Key", 1 ] + ], + "condition": [ + [ "defeat", "Sharkster" ] ] }, "Ba'kii: Solar Farm Upper": { @@ -4837,6 +4852,9 @@ "Precious Metal", 2 ] + ], + "condition": [ + ["defeat", "Wiccat"] ] }, "Garden: Chief's Den Center": { @@ -4856,6 +4874,9 @@ "Golden Bars", 3 ] + ], + "condition": [ + ["defeat", "Wiccat"] ] }, "Garden: Chief's Den Upper": { @@ -4875,6 +4896,9 @@ "Prime Pistachios", 2 ] + ], + "condition": [ + ["defeat", "Wiccat"] ] }, "Garden: Chief's Den Lower": { @@ -4896,11 +4920,8 @@ ] ], "condition": [ - [ - "item", - "Wave", - 1 - ] + ["item", "Wave", 1], + ["defeat", "Wiccat"] ] }, "Garden: Grand Krys'kajo Entrance": { @@ -5191,16 +5212,9 @@ ] ], "condition": [ - [ - "item", - "Wave", - 1 - ], - [ - "item", - "Shock", - 1 - ] + ["item", "Wave", 1], + ["item", "Shock", 1], + ["defeat", "Tiefsee Angler"] ] }, "Garden: Lost Lookout Center": { diff --git a/data/in/cutscenes.json b/data/in/cutscenes.json index fb66f51..113dd8f 100644 --- a/data/in/cutscenes.json +++ b/data/in/cutscenes.json @@ -42,7 +42,7 @@ }, "region": { "linear": "4", - "open": "open4.1" + "open": "mine.1" }, "reward": [ [ "item", "Just Water", 2 ] @@ -75,11 +75,8 @@ }, "region": { "linear": "10", - "open": "open4.1" + "open": "mine.8" }, - "condition": [ - ["item", "Mine Master Key", 1] - ], "reward": [ [ "item", "Blue Ice Shade", 1 ] ] @@ -108,7 +105,7 @@ }, "region": { "linear": "19", - "open": "open7.8" + "open": "fajro.10" }, "reward": [ [ "item", "Red Flame Shade", 1 ] @@ -255,7 +252,7 @@ }, "region": { "linear": "11", - "open": "open4.8" + "open": "mine.8" }, "reward": [ [ "item", "Circuit Override", 1 ] @@ -270,7 +267,7 @@ }, "region": { "linear": "19", - "open": "open7.8" + "open": "fajro.10" }, "reward": [ [ "item", "Circuit Override", 1 ] @@ -333,7 +330,7 @@ }, "region": { "linear": "19", - "open": "open7.8" + "open": "fajro.10" }, "reward": [ [ "sp" ] diff --git a/data/in/elements.json b/data/in/elements.json index 2f98c09..d686804 100644 --- a/data/in/elements.json +++ b/data/in/elements.json @@ -8,10 +8,13 @@ }, "region": { "linear": "8", - "open": "open4.5" + "open": "mine.4" }, "reward": [ ["element", "Heat"] + ], + "condition": [ + [ "item", "Mine Key", 5] ] }, "Cold Pedestal": { @@ -22,7 +25,7 @@ }, "region": { "linear": "16", - "open": "open7.4" + "open": "fajro.5" }, "reward": [ ["element", "Cold"] diff --git a/data/in/enemies/master.json b/data/in/enemies/master.json index 42acbd0..fd477ac 100644 --- a/data/in/enemies/master.json +++ b/data/in/enemies/master.json @@ -1,6 +1,7 @@ { "_includes": [ "grind.json", + "quests.json", "bosses.json" ] } diff --git a/data/in/enemies/quests.json b/data/in/enemies/quests.json new file mode 100644 index 0000000..b691cfe --- /dev/null +++ b/data/in/enemies/quests.json @@ -0,0 +1,88 @@ +{ + "enemies": { + "Tunnel Gelleric": { + "name": "Tunnel Gelleric", + "id": "jungle.special.quest_td_blob_1", + "level": 38, + "firstEncounter": { + "region": { + "open10.Right" + } + }, + "area": "jungle", + "condition": { + [ "quest", "Tower Defense" ] + } + }, + "Tunnel Argeby": { + "name": "Tunnel Argeby", + "id": "jungle.special.quest_td_plant_1", + "level": 39, + "firstEncounter": { + "region": { + "open10.Right" + } + }, + "area": "jungle", + "condition": { + [ "quest", "Tower Defense" ] + } + }, + "Tunnel Angler": { + "name": "Tunnel Angler", + "id": "jungle.special.quest_td_fish_1", + "level": 40, + "firstEncounter": { + "region": { + "open10.Right" + } + }, + "area": "jungle", + "condition": { + [ "quest", "Tower Defense" ] + } + }, + "Tunnel Wiccat": { + "name": "Tunnel Wiccat", + "id": "jungle.special.quest_td_shockcat_1", + "level": 45, + "firstEncounter": { + "region": { + "open10.Right" + } + }, + "area": "jungle", + "condition": { + [ "quest", "An Original Idea" ] + } + }, + "Tunnel Shockcat": { + "name": "Tunnel Shockcat", + "id": "jungle.special.quest_td_shockcat_2", + "level": 46, + "firstEncounter": { + "region": { + "open10.Right" + } + }, + "area": "jungle", + "condition": { + [ "quest", "An Original Idea" ] + } + }, + "Tunnel Teslabovine": { + "name": "Tunnel Teslabovine", + "id": "jungle.special.quest_td_buffel_1", + "level": 47, + "firstEncounter": { + "region": { + "open10.Right" + } + }, + "area": "jungle", + "condition": { + [ "quest", "An Original Idea" ] + } + } + } +} diff --git a/data/in/quests-always.json b/data/in/quests-always.json index 2ccf728..742d94b 100644 --- a/data/in/quests-always.json +++ b/data/in/quests-always.json @@ -8,8 +8,7 @@ "open": "open9" }, "condition": [ - [ "item", "Heat" ], - [ "item", "Cold" ] + [ "defeat", "Radical Hedgehag", "Chillin' Hillkat", "Ivory Bovine", "Fallfly", "Hologram Frobbit" ] ], "properties": { "alwaysQuest": true @@ -42,7 +41,7 @@ }, "condition": [ [ "item", "Maroon Cave Pass", 1 ], - [ "item", "Heat", 1 ] + [ "defeat", "Tim", "Ti'im" ] ], "properties": { "alwaysQuest": true @@ -62,6 +61,9 @@ }, "reward": [ [ "item", "Old Dojo Key", 1 ] + ], + "condition": [ + [ "defeat", "Aranetarda" ] ] } } diff --git a/data/in/quests-qr.json b/data/in/quests-qr.json index 8c73a96..35dad4a 100644 --- a/data/in/quests-qr.json +++ b/data/in/quests-qr.json @@ -79,10 +79,14 @@ "clearance": "Bronze", "region": { "linear": "4", - "open": "open4.1" + "open": "mine.1" }, "condition": [ - [ "or", [ "item", "Heat" ], [ "item", "Mine Key", 1 ] ], + [ "or", + [ "item", "Heat" ], + [ "item", "Mine Key", 1 ], + [ "grind", "Fleazer" ] + ], [ "quest","The Legendary Bunny" ] ], "reward": [ @@ -176,7 +180,8 @@ }, "condition": [ [ "item", "Heat" ], - [ "item", "Cold" ] + [ "item", "Cold" ], + [ "defeat", "Shokat" ] ], "reward": [ [ "item", "Perforated Tophat", 5 ] @@ -193,6 +198,9 @@ "reward": [ [ "item", "Edge o' All", 1 ], [ "item", "Grasswalkers", 1 ] + ], + "condition": [ + [ "grind", "Hedgehag" ] ] }, "A Few More Steps": { @@ -234,7 +242,10 @@ "region": { "linear": "3", "open": "open3" - } + }, + "condition": [ + [ "grind", "Hedgehag", "Rockin' Hillkat", "Mad Bovine", "Old Hedgehag" ] + ] }, "Autumn's Rise Landmarks": { "questid": "trailblaze-autumn-3", @@ -315,7 +326,10 @@ "region": { "linear": "3", "open": "open3" - } + }, + "condition": [ + [ "grind", "Young Frobbit", "Pengpeng", "Horny Goat", "Karotto" ] + ] }, "Bergen Trailblazing Landmarks": { "questid": "trailblaze-bergen-3", @@ -358,7 +372,10 @@ "region": { "linear": "3", "open": "open3" - } + }, + "condition": [ + [ "defeat", "Legendary Frobbit" ] + ] }, "Round and Round 2": { "questid": "round-and-round-2", @@ -379,7 +396,7 @@ "questid": "bergen-mining_tools", "region": { "linear": "10", - "open": "open4.7" + "open": "mine.7" }, "condition": [ [ "item", "Heat", 1 ], @@ -396,6 +413,9 @@ "reward": [ [ "item", "Metal Gears", 2 ], [ "item", "Purple Ore Lump", 4 ] + ], + "condition": [ + [ "defeat", "Dirty Frobbit" ] ] }, "Explosive Debugging": { @@ -407,7 +427,8 @@ "condition": [ [ "quest", "Filthy Frobbits" ], [ "item", "Blue Ice Shade" ], - [ "item", "Heat", 1 ] + [ "item", "Heat", 1 ], + [ "defeat", "Flintzer" ] ], "reward": [ [ "item", "Metal Gears", 3 ], @@ -448,7 +469,8 @@ "condition": [ [ "quest", "Kidding Around" ], [ "item", "Heat" ], - [ "item", "Blue Ice Shade", 1 ] + [ "item", "Blue Ice Shade", 1 ], + [ "defeat", "Horny Cavegoat" ] ], "reward": [ [ "item", "Perforated Tophat", 2 ], @@ -464,18 +486,30 @@ "reward": [ [ "item", "Solid Bubble", 4 ], [ "item", "Diabolic Horns", 2 ] + ], + "condition": [ + [ "grind", "Karotto" ], + [ "or", + [ "grind", "Young Frobbit" ], + [ "grind", "White Frobbit" ] + ] ] }, "Heating the Hermit": { "questid": "bergtraders-2-hermit_materials", "region": { "linear": "3.1", - "open": "open4.1" + "open": "mine.1" }, "condition": [ [ "quest", "Fancy Tophat" ], [ "item", "Blue Ice Shade", 1 ], - [ "item", "Heat", 1 ] + [ "or", + [ "item", "Heat" ], + [ "grind", "Carritrich" ], + [ "grind", "Kamikatze" ], + [ "grind", "Digmo" ] + ] ], "reward": [ [ "item", "Rusty Bits", 6 ], @@ -581,17 +615,20 @@ "questid": "omni-1", "region": { "linear": "4", - "open": "open4.1" + "open": "mine.1" }, "condition": [ - [ "item", "Heat", 1 ] + [ "or", + [ "item", "Heat", 1 ], + [ "grind", "Fleazer" ] + ] ] }, "Pushing Bases": { "questid": "omni-2", "region": { "linear": "4", - "open": "open4.1" + "open": "mine.1" }, "condition": [ [ "quest", "Building a Base" ], @@ -623,7 +660,7 @@ [ "quest", "Bergen Trailblazing" ], [ "quest", "Maroon Valley Trailblazing" ], [ "quest", "Gaia's Garden Trailblazing" ], - [ "item", "Shock" ] + [ "defeat", "Henry" ] ], "reward": [ [ "item", "Circuit Override", 1 ] @@ -637,7 +674,8 @@ }, "condition": [ [ "item", "Meteor Shade", 1 ], - [ "item", "Guild Pass", 1 ] + [ "item", "Guild Pass", 1 ], + [ "defeat", "Sun Beetle", "Moon Beetle" ] ] }, "An Unfortunate Series of Features": { @@ -650,7 +688,8 @@ [ "item", "Heat", 1 ], [ "item", "Cold", 1 ], [ "item", "Wave", 1 ], - [ "item", "Shock", 1 ] + [ "item", "Shock", 1 ], + [ "defeat", "DON'T USE THIS" ] ], "reward": [ [ "item", "Lunatic Paws", 1 ] @@ -683,7 +722,7 @@ "open": "open5" }, "condition": [ - [ "item", "Heat"] + [ "grind", "Pinceron", "Sharkster", "Vulturbine", "Tim" ] ] }, "Maroon Valley Landmarks": { @@ -709,6 +748,9 @@ "reward": [ [ "item", "Pepper Night Tea", 2 ], [ "item", "Old Bones", 10 ] + ], + "condition": [ + [ "defeat", "Chillertoise" ] ] }, "Hot Trail": { @@ -721,7 +763,8 @@ [ "quest", "Blasting Shells" ], [ "item", "Red Flame Shade", 1 ], [ "item", "Cold" ], - [ "item", "Heat", 1 ] + [ "item", "Heat", 1 ], + [ "defeat", "Wowturbine" ] ], "reward": [ [ "item", "Laser Eyes", 2 ] @@ -736,7 +779,8 @@ "condition": [ [ "quest", "Hot Trail" ], [ "item", "Wave", 1 ], - [ "item", "Meteor Shade", 1 ] + [ "item", "Meteor Shade", 1 ], + [ "defeat", "Sandamoth" ] ], "reward": [ [ "item", "Pepper Night Tea", 5 ], @@ -752,6 +796,9 @@ "reward": [ [ "item", "Glaring Rock", 6 ], [ "item", "Maroon Chestnut", 2 ] + ], + "condition": [ + [ "defeat", "Legionary Turret v1", "Legionary Leader v1" ] ] }, "Just Deserts": { @@ -764,7 +811,8 @@ [ "quest", "Shady Thief" ], [ "item", "Red Flame Shade", 1 ], [ "item", "Heat", 1 ], - [ "item", "Cold", 1 ] + [ "item", "Cold", 1 ], + [ "defeat", "Legionary Turret v2", "Guard Billston" ] ], "reward": [ [ "item", "Lucid Shard", 6 ], @@ -780,6 +828,9 @@ "reward": [ [ "item", "Cactone Fruit", 11 ], [ "item", "Ancient Earth", 3 ] + ], + "condition": [ + [ "defeat", "Sharkster" ] ] }, "Steamy Booze": { @@ -828,7 +879,10 @@ "linear": "23", "open": "open10" }, - "condition": [[ "region", "open", "open10.Grove" ]], + "condition": [ + [ "region", "open", "open10.Grove" ], + [ "defeat", "Tunnel Gelleric", "Tunnel Argeby", "Tunnel Angler" ] + ], "reward": [ [ "item", "Virus Root", 4 ], [ "item", "Stout Backplate", 2 ] @@ -845,7 +899,8 @@ [ "item", "Azure Drop Shade", 1 ], [ "item", "Shock", 1 ], [ "item", "Wave", 1 ], - [ "quest", "Turret Defense" ] + [ "quest", "Turret Defense" ], + [ "defeat", "Tunnel Wiccat", "Tunnel Shockcat", "Tunnel Teslabovine" ] ], "reward": [ [ "item", "Living Bolt", 2 ], @@ -861,6 +916,9 @@ "reward": [ [ "item", "Chili Dog", 4 ], [ "item", "Star Fruit", 5 ] + ], + "condition": [ + [ "defeat", "Papagangster Softhat" ] ] }, "High Crating": { @@ -874,7 +932,8 @@ [ "item", "Azure Drop Shade", 1 ], [ "item", "Shock", 1 ], [ "item", "Wave", 1 ], - [ "quest", "Hostage Situation" ] + [ "quest", "Hostage Situation" ], + [ "defeat", "Papagangster Muscle" ] ], "reward": [ [ "item", "Plain Cube", 3 ], @@ -890,7 +949,8 @@ "condition": [ [ "item", "Cold" ], [ "item", "Heat" ], - [ "region", "open", "open10.Right" ] + [ "region", "open", "open10.Right" ], + [ "defeat", "Shokat", "Tourist Karotto" ] ], "reward": [ [ "item", "Moon Fruit", 5 ], @@ -909,7 +969,8 @@ [ "item", "Azure Drop Shade", 1 ], [ "item", "Shock", 1 ], [ "item", "Wave", 1 ], - [ "quest", "Tropical Chill" ] + [ "quest", "Tropical Chill" ], + [ "defeat", "Karotto Fruitseeker" ] ], "reward": [ [ "item", "Climate Cowl", 1 ] @@ -921,7 +982,10 @@ "linear": "23", "open": "open10" }, - "condition": [[ "region", "open", "open10.Grove" ]], + "condition": [ + [ "region", "open", "open10.Grove" ], + [ "defeat", "Angler", "Gelleric" ] + ], "reward": [ [ "item", "Green Risotto", 3 ], [ "item", "Wrap Roll", 3 ], @@ -937,8 +1001,8 @@ "condition": [ [ "item", "Purple Bolt Shade", 1 ], [ "item", "Azure Drop Shade", 1 ], - [ "item", "Wave" ], - [ "quest", "Lakeside Escort" ] + [ "quest", "Lakeside Escort" ], + [ "defeat", "Ampery" ] ], "reward": [ [ "item", "Echo Roll", 5 ], @@ -963,7 +1027,10 @@ "linear": "23", "open": "open10" }, - "condition": [[ "region", "open", "open10.Infested" ]], + "condition": [ + [ "region", "open", "open10.Infested" ], + [ "defeat", "Jack'On'Fire", "Flamezer" ] + ], "reward": [ [ "item", "Scarecrown", 1 ] ] @@ -1009,7 +1076,8 @@ "open": "open10.Right" }, "condition": [ - [ "region", "open", "open10.Left" ] + [ "region", "open", "open10.Left" ], + [ "grind", "Gelleric", "Papagun", "Shokat", "Behesloth" ] ] }, "Gaia's Garden Landmarks": { @@ -1150,6 +1218,9 @@ }, "reward": [ [ "item", "Bronze Edge", 1 ] + ], + "condition": [ + [ "defeat", "Rockin' Hillkat" ] ] }, "It Can Dig But It Can't Hide": { @@ -1159,7 +1230,8 @@ "open": "open3" }, "condition": [ - [ "quest", "Digging for Data" ] + [ "quest", "Digging for Data" ], + [ "defeat", "Flamin' Hillkat", "Hillkat Bandleader" ] ], "reward": [ [ "item", "Swiftspike", 1 ], @@ -1176,7 +1248,8 @@ [ "item", "Red Flame Shade", 1 ], [ "item", "Heat", 1 ], [ "item", "Cold", 1 ], - [ "quest", "It Can Dig But It Can't Hide" ] + [ "quest", "It Can Dig But It Can't Hide" ], + [ "defeat", "Radical Hedgehag", "Chillin' Hillkat", "Fallfly" ] ], "reward": [ [ "item", "Twilight Dew", 9 ], @@ -1192,6 +1265,9 @@ "reward": [ [ "item", "Hi-Sandwich", 3 ], [ "item", "Just Water", 3 ] + ], + "condition": [ + [ "defeat", "Hedgehag" ] ] }, "Smuggle Trouble": { @@ -1201,7 +1277,8 @@ "open": "open3" }, "condition": [ - [ "quest", "Petty Crime Hunter" ] + [ "quest", "Petty Crime Hunter" ], + [ "defeat", "Illegal Rhombus Turret" ] ], "reward": [ [ "item", "Battered Fist", 1 ], @@ -1218,7 +1295,8 @@ [ "item", "Red Flame Shade", 1 ], [ "item", "Heat", 1 ], [ "item", "Cold", 1 ], - [ "quest", "Smuggle Trouble" ] + [ "quest", "Smuggle Trouble" ], + [ "defeat", "Illegal Floating Turret", "Illegal Floating Bomber" ] ], "reward": [ [ "item", "Hunter's Bolt", 1 ], @@ -1243,7 +1321,8 @@ "open": "open3" }, "condition": [ - [ "quest", "Small Time Delivery" ] + [ "quest", "Small Time Delivery" ], + [ "defeat", "Red Eyed Bovine", "Old Hedgehag", "Flamin' Hillkat" ] ], "reward": [ [ "item", "Flaming Bun", 3 ], @@ -1261,8 +1340,10 @@ [ "item", "Red Flame Shade", 1 ], [ "item", "Heat", 1 ], [ "item", "Cold", 1 ], - [ "region", "open", "open4.5" ], - [ "quest", "Bull Grab" ] + [ "region", "open", "mine.4" ], + [ "item", "Mine Key", 5 ], + [ "quest", "Bull Grab" ], + [ "defeat", "Smelter Digmo", "Experienced Fleazer" ] ], "reward": [ [ "item", "Refined Metal", 5 ], @@ -1287,7 +1368,8 @@ "open": "open3" }, "condition": [ - [ "quest", "Sickly Trees" ] + [ "quest", "Sickly Trees" ], + [ "defeat", "Red Eyed Bovine", "Old Hedgehag" ] ], "reward": [ [ "item", "Autumn Leaves", 13 ], @@ -1304,7 +1386,8 @@ "condition": [ [ "quest", "Intensive Tree Care" ], [ "item", "Heat" ], - [ "item", "Cold" ] + [ "item", "Cold" ], + [ "defeat", "Fallfly", "Blazehoof" ] ], "reward": [ [ "item", "Ginger Tom. Salad", 4 ], @@ -1331,6 +1414,14 @@ "reward": [ [ "item", "Hi-Sandwich", 5 ], [ "item", "Chili Con Carne", 2 ] + ], + "condition": [ + [ "or", + [ "grind", "Mad Bovine" ], + [ "grind", "Red Eyed Bovine" ], + [ "grind", "Ivory Bovine" ], + [ "grind", "Horny Goat" ] + ] ] }, "Meating Expectations": { diff --git a/data/in/regions.json b/data/in/regions.json index b768d9e..abfcb3a 100644 --- a/data/in/regions.json +++ b/data/in/regions.json @@ -264,7 +264,7 @@ }, { "from": "open3", - "to": "open4.1", + "to": "mine.1", "condition": [ [ "item", "Mine Pass", 1 ] ] @@ -277,52 +277,56 @@ ] }, { - "from": "open4.1", - "to": "open4.2", + "from": "mine.1", + "to": "mine.2", "condition": [ - [ "item", "Mine Key", 1 ] + [ "item", "Mine Key", 1 ], + [ "defeat", "Carritrich" ] ] }, { - "from": "open4.2", - "to": "open4.3", + "from": "mine.2", + "to": "mine.3", "condition": [ - [ "item", "Mine Key", 2 ] + [ "defeat", "Kamikatze" ] ] }, { - "from": "open4.3", - "to": "open4.4", + "from": "mine.2", + "to": "mine.4", "condition": [ - [ "item", "Mine Key", 3 ] + [ "item", "Mine Key", 3 ], + [ "defeat", "Digmo" ] ] }, { - "from": "open4.4", - "to": "open4.5", + "from": "mine.4", + "to": "mine.5", "condition": [ - [ "item", "Mine Key", 5 ] + [ "defeat", "Kamikatze" ] ] }, { - "from": "open4.4", - "to": "open4.6", + "from": "mine.5", + "to": "mine.6", "condition": [ [ "item", "Heat", 1 ] ] }, { - "from": "open4.6", - "to": "open4.7", + "from": "mine.6", + "to": "mine.7", "condition": [ - [ "item", "Mine Key", 5 ] + [ "item", "Thief's Key" ], + [ "defeat", "Fleazer" ] ] }, { - "from": "open4.1", - "to": "open4.8", + "from": "mine.1", + "to": "mine.8", "condition": [ - [ "item", "Mine Master Key", 1 ] + [ "item", "Mine Master Key", 1 ], + [ "defeat", "X01 Driller H.F.S." ] ] }, { @@ -358,59 +362,75 @@ }, { "from": "open5", - "to": "open7.1", + "to": "fajro.1", "condition": [ - [ "item", "Yellow Sand Shade", 1 ], - [ "item", "Heat", 1 ] + [ "item", "Yellow Sand Shade", 1 ] ] }, { - "from": "open7.1", - "to": "open7.2", + "from": "fajro.1", + "to": "fajro.2", "condition": [ - [ "item", "Faj'ro Key", 1 ] + [ "item", "Faj'ro Key", 1 ], + [ "item", "Heat" ], + [ "defeat", "Trijelly" ] + ] + }, + { + "from": "fajro.2", + "to": "fajro.3", + "condition": [ + [ "defeat", "Pada Moth" ] ] }, { - "from": "open7.2", - "to": "open7.3", + "from": "fajro.3", + "to": "fajro.4", "condition": [ [ "item", "Faj'ro Key", 3 ] ] }, { - "from": "open7.3", - "to": "open7.4", + "from": "fajro.1", + "to": "fajro.5", "condition": [ - [ "item", "Faj'ro Key", 4 ] + [ "defeat", "Pinzo'Jrahrrrn" ] ] }, { - "from": "open7.4", - "to": "open7.5", + "from": "fajro.5", + "to": "fajro.6", "condition": [ - [ "item", "Cold", 1 ] + [ "item", "Cold" ] + ] + { + "from": "fajro.6", + "to": "fajro.7", + "condition": [ + [ "defeat", "Magmanizer" ] ] }, { - "from": "open7.5", - "to": "open7.6", + "from": "fajro.7", + "to": "fajro.8", "condition": [ - [ "item", "White Key", 1 ] + [ "defeat", "Pada Moth" ] ] }, { - "from": "open7.6", - "to": "open7.7", + "from": "fajro.8", + "to": "fajro.9", "condition": [ - [ "item", "Faj'ro Key", 9 ] + [ "item", "White Key" ], + [ "defeat", "Darth Moth" ] ] }, { - "from": "open7.6", - "to": "open7.8", + "from": "fajro.6", + "to": "fajro.10", "condition": [ - [ "item", "Faj'ro Master Key", 1 ] + [ "item", "Faj'ro Master Key" ], + [ "defeat", "Master Magmoth" ] ] }, {