Merge pull request #1 from Riprekt/main

Added more quest zones, raids and world bosses
ken2057 · Jun 20, 2022 · dad8e21 · dad8e21
2 parents 41a57b2 + a0e57ad
commit dad8e21
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 7 deletions.
diff --git a/config.json b/config.json
@@ -5,7 +5,7 @@
     "decline_treasure": false,
     "rerun_mode": true,
     "smart_rerun_mode": true,
-    "brush_force_energy": true,
+    "brush_force_energy": false,
     "boss": {
         "boss": "Orlag Clan",
         "difficulty": "Normal",
@@ -30,11 +30,11 @@
     },
     "quest": {
         "difficulty": "Heroic",
-        "dungeon": "2|Warty",
-        "zone": "4|Ashvale"
+        "dungeon": "2|Eshlyn Abyss",
+        "zone": "9|Eshlyn"
     },
     "raid": {
-        "boss": "Hyper Dimension",
+        "boss": "Charred Expanse",
         "difficulty": "Heroic"
     },
     "trails": {

diff --git a/img/boss/3xt3rmin4tion.png b/img/boss/3xt3rmin4tion.png
diff --git a/img/boss/brimstone-syndicate.png b/img/boss/brimstone-syndicate.png
diff --git a/img/boss/melvin-factory.png b/img/boss/melvin-factory.png
diff --git a/img/boss/titans-attack!.png b/img/boss/titans-attack!.png
diff --git a/img/quest/zone/z10.png b/img/quest/zone/z10.png
diff --git a/img/quest/zone/z10d1.png b/img/quest/zone/z10d1.png
diff --git a/img/quest/zone/z10d2.png b/img/quest/zone/z10d2.png
diff --git a/img/quest/zone/z10d3.png b/img/quest/zone/z10d3.png
diff --git a/img/quest/zone/z11.png b/img/quest/zone/z11.png
diff --git a/img/quest/zone/z11d1.png b/img/quest/zone/z11d1.png
diff --git a/img/quest/zone/z7d2.png b/img/quest/zone/z7d2.png
diff --git a/img/quest/zone/z8.png b/img/quest/zone/z8.png
diff --git a/img/quest/zone/z8d1.png b/img/quest/zone/z8d1.png
diff --git a/img/quest/zone/z8d2.png b/img/quest/zone/z8d2.png
diff --git a/img/quest/zone/z9.png b/img/quest/zone/z9.png
diff --git a/img/quest/zone/z9d1.png b/img/quest/zone/z9d1.png
diff --git a/img/quest/zone/z9d2.png b/img/quest/zone/z9d2.png
diff --git a/img/raid/boss-5.png b/img/raid/boss-5.png
diff --git a/img/raid/boss-6.png b/img/raid/boss-6.png
diff --git a/img/raid/boss-7.png b/img/raid/boss-7.png
diff --git a/img/raid/boss-8.png b/img/raid/boss-8.png
diff --git a/src/farm/boss.py b/src/farm/boss.py
@@ -22,7 +22,11 @@
 
 BOSSES = {
     "Orlag Clan": join(FEATURE_PATH, 'orlag-clan.png'),
-    "Netherworld": join(FEATURE_PATH, 'netherworld.png')
+    "Netherworld": join(FEATURE_PATH, 'netherworld.png'),
+    "Melvin Factory": join(FEATURE_PATH, 'melvin-factory.png'),
+    "3XT3RMIN4TION": join(FEATURE_PATH, '3xt3rmin4tion.png'),
+    "Brimstone Syndicate": join(FEATURE_PATH, 'brimstone-syndicate.png'),
+    "Titans Attack!": join(FEATURE_PATH, 'titans-attack!.png')
 }
 
 BOSS_DIFFICULTIES = {

diff --git a/src/farm/quest.py b/src/farm/quest.py
@@ -34,7 +34,11 @@
     "4|Ashvale": ["1|Rexie", "2|Warty", "3|Kov'Alg", DUNGEON_NAME],
     "5|Aramore": ["1|Torlim", "2|Zorul", "3|Tealk", DUNGEON_NAME],
     "6|Morgoroth": ["1|Rugumz", "2|Oozmire", "3|Moghur", DUNGEON_NAME],
-    "7|Cambora": ["1|Scorpius"],
+    "7|Cambora": ["1|Scorpius", "2|Vedaire", DUNGEON_NAME],
+    "8|Galaran": ["1|Googamenz", "2|The Trilogy", DUNGEON_NAME],
+    "9|Eshlyn": ["1|Eshlyn Void", "2|Eshlyn Abyss", DUNGEON_NAME],
+    "10|Vamor": ["1|Calverang", "2|Broken Abyss", "3|Elemental Colony", DUNGEON_NAME],
+    "11|Melvin's Genesis": ["1|Eldingverold"],
 }
 
 LIST_ZONES = list(ZONES.keys())

diff --git a/src/farm/raid.py b/src/farm/raid.py
@@ -16,7 +16,11 @@
     "Astaroth's Awakening": join(FEATURE_PATH, 'boss-1.png'),
     "Hyper Dimension": join(FEATURE_PATH, 'boss-2.png'),
     "Woodbeard's Booty": join(FEATURE_PATH, 'boss-3.png'),
-    "A Haile'Of A Mistake": join(FEATURE_PATH, 'boss-4.png')
+    "A Haile'Of A Mistake": join(FEATURE_PATH, 'boss-4.png'),
+    "Zol's Labyrinth": join(FEATURE_PATH, 'boss-5.png'),
+    "Mallowdale": join(FEATURE_PATH, 'boss-6.png'),
+    "Gorbon's Rockin' Ruckus": join(FEATURE_PATH, 'boss-7.png'),
+    "Charred Expanse": join(FEATURE_PATH, 'boss-8.png')
 }