Added 12 new advancements (ported from old achievement system)

worlds/minecraft/Items.py

@@ -42,7 +42,10 @@ def __init__(self, name: str, progression: bool, code: int, player: int):
     "50 XP": ItemData(45028, False), 
     "3 Ender Pearls": ItemData(45029, True),
     "4 Lapis Lazuli": ItemData(45030, False), 
-    "16 Porkchops": ItemData(45031, False)
+    "16 Porkchops": ItemData(45031, False), 
+    "8 Gold Ore": ItemData(45032, False), 
+    "Rotten Flesh": ItemData(45033, False), 
+    "Single Arrow": ItemData(45034, False)
 }
 
 # If not listed here then has frequency 1
@@ -57,10 +60,13 @@ def __init__(self, name: str, progression: bool, code: int, player: int):
     "16 Iron Ore": 4, 
     "500 XP": 4, # 2 after exclusions
     "100 XP": 10, # 4 after exclusions
-    "50 XP": 12, # 5 after exclusions
+    "50 XP": 12, # 4 after exclusions
     "3 Ender Pearls": 4, 
     "4 Lapis Lazuli": 2, 
-    "16 Porkchops": 4
+    "16 Porkchops": 8, 
+    "8 Gold Ore": 4, 
+    "Rotten Flesh": 4, 
+    "Single Arrow": 0
 }
 
 lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_table.items()}

worlds/minecraft/Locations.py

@@ -86,7 +86,19 @@ def __init__(self, player: int, name: str, address: int, parent):
     "Cover Me in Debris": 42076,
     "The End?": 42077,
     "The Parrots and the Bats": 42078,
-    "A Complete Catalogue": 42079
+    "A Complete Catalogue": 42079, 
+    "Getting Wood": 42080,
+    "Time to Mine!": 42081,
+    "Hot Topic": 42082,
+    "Bake Bread": 42083,
+    "The Lie": 42084,
+    "On A Rail": 42085,
+    "Time to Strike!": 42086,
+    "Cow Tipper": 42087,
+    "When Pigs Fly": 42088,
+    "Overkill": 42089,
+    "Librarian": 42090,
+    "Overpowered": 42091
 }
 
 exclusion_table = {
@@ -99,7 +111,8 @@ def __init__(self, player: int, name: str, address: int, parent):
         "A Balanced Diet": "100 XP",
         "Uneasy Alliance": "100 XP",
         "Cover Me in Debris": "100 XP",
-        "A Complete Catalogue": "50 XP"
+        "A Complete Catalogue": "50 XP", 
+        "Overpowered": "50 XP"
     }, 
     "insane": {
         "How Did We Get Here?": "500 XP",

worlds/minecraft/Rules.py

@@ -118,3 +118,16 @@ def reachable_locations(state):
     set_rule(world.get_location("The End?", player), lambda state: state.enter_end(player))
     set_rule(world.get_location("The Parrots and the Bats", player), lambda state: True)
     set_rule(world.get_location("A Complete Catalogue", player), lambda state: state.can_adventure(player)) # kill fish for raw
+    set_rule(world.get_location("Getting Wood", player), lambda state: True)
+    set_rule(world.get_location("Time to Mine!", player), lambda state: True)
+    set_rule(world.get_location("Hot Topic", player), lambda state: state.has("Ingot Crafting", player))
+    set_rule(world.get_location("Bake Bread", player), lambda state: True)
+    set_rule(world.get_location("The Lie", player), lambda state: state.has_iron_ingots(player) and state.has("Bucket", player))
+    set_rule(world.get_location("On A Rail", player), lambda state: state.has_iron_ingots(player))
+    set_rule(world.get_location("Time to Strike!", player), lambda state: True)
+    set_rule(world.get_location("Cow Tipper", player), lambda state: True)
+    set_rule(world.get_location("When Pigs Fly", player), lambda state: state.enter_fortress(player) and state.has("Fishing Rod", player) and state.can_adventure(player)) # saddles in fortress chests
+    set_rule(world.get_location("Overkill", player), lambda state: state.can_brew_potions(player) and state.has("Progressive Weapons", player)) # strength 2, stone axe crit
+    set_rule(world.get_location("Librarian", player), lambda state: state.has("Enchanting", player))
+    set_rule(world.get_location("Overpowered", player), lambda state: state.has_iron_ingots(player) and state.has("Resource Blocks", player) and 
+                                                                      (state.enter_nether(player) or state.has("Progressive Tools", player, 2)))