morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minecraft rewrite (#1493)

Browse Source 
* Minecraft: rewrite to modern AP standards

* Fix gitignore to not try to ignore the entire minecraft world

* minecraft: clean up MC-specific tests

* minecraft: use pkgutil instead of open

* minecraft: ship as apworld

* mc: update region to new api

* Increase upper limit on advancement and egg shard goals

* mc: reduce egg shard count by 5 for structure compasses

* Minecraft: add more tests
Ensures data loading works; tests beatability with various options at their max setting; new tests for 1.19 advancements

* test improvements

* mc: typing and imports cleanup

* parens

* mc: condense filler item code and override get_filler_item_name
This commit is contained in:
espeon65536
2023-03-08 21:13:52 -07:00
committed by GitHub
parent a95e51deda
commit 5e1aa52373
21 changed files with 1254 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
worlds/minecraft/Options.py
View File

@@ -6,7 +6,7 @@ class AdvancementGoal(Range):
"""Number of advancements required to spawn bosses."""
display_name = "Advancement Goal"
range_start = 0
range_end = 95
range_end = 114
default = 40
@@ -14,7 +14,7 @@ class EggShardsRequired(Range):
"""Number of dragon egg shards to collect to spawn bosses."""
display_name = "Egg Shards Required"
range_start = 0
range_end = 40
range_end = 74
default = 0
@@ -22,7 +22,7 @@ class EggShardsAvailable(Range):
"""Number of dragon egg shards available to collect."""
display_name = "Egg Shards Available"
range_start = 0
range_end = 40
range_end = 74
default = 0
@@ -35,6 +35,14 @@ class BossGoal(Choice):
option_both = 3
default = 1
@property
def dragon(self):
return self.value % 2 == 1
@property
def wither(self):
return self.value > 1
class ShuffleStructures(DefaultOnToggle):
"""Enables shuffling of villages, outposts, fortresses, bastions, and end cities."""
@@ -94,14 +102,16 @@ minecraft_options: typing.Dict[str, type(Option)] = {
"egg_shards_required": EggShardsRequired,
"egg_shards_available": EggShardsAvailable,
"required_bosses": BossGoal,
"shuffle_structures": ShuffleStructures,
"structure_compasses": StructureCompasses,
"bee_traps": BeeTraps,
"combat_difficulty": CombatDifficulty,
"include_hard_advancements": HardAdvancements,
"include_unreasonable_advancements": UnreasonableAdvancements,
"include_postgame_advancements": PostgameAdvancements,
"bee_traps": BeeTraps,
"send_defeated_mobs": SendDefeatedMobs,
"starting_items": StartingItems,
"death_link": DeathLink,
"starting_items": StartingItems,
}