mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
3fa253bac5
* MC: add death_link option * Minecraft: 1.17 advancements and logic support * Update Minecraft tracker to 1.17 * Minecraft: add tests for new advancements * removed jdk/forge download install out of iss and into MinecraftClient.py using flag --install * Add required_bosses option choices are none, ender_dragon, wither, both postgame advancements are set according to the required boss for completion * fix docstring for PostgameAdvancements * Minecraft: add starting_items List of dicts: item, amount, nbt * Update descriptions for AdvancementGoal and EggShardsRequired * Minecraft: fix tests for required_bosses attribute * Minecraft: updated logic for various dragon-related advancements Split the logic into can_respawn and can_kill dragon Free the End, Monsters Hunted, The End Again still require both respawn and kill, since the player needs to kill and be credited with the kill You Need a Mint and Is It a Plane now require only respawn, since the dragon need only be alive; if killed out of logic, it's ok The Next Generation only requires kill, since the egg spawns regardless of whether the player was credited with the kill or not * Minecraft client: ignore prereleases unless --prerelease flag is on * explicitly state all defaults change structure shuffle and structure compass defaults to true update install tutorial to point to player-settings page, as well as removing instructions for manual install * Minecraft client: add Minecraft version check Adds a minecraft_version field in the apmc, and downloads only mods which contain that version in the name of the .jar file. This ensures that the client remains compatible even if new mods are released for later versions, since they won't download a mod for a later version than the apmc says. Co-authored-by: Kono Tyran <Kono.Tyran@gmail.com>
64 lines
2.6 KiB
Python
64 lines
2.6 KiB
Python
import worlds.minecraft.Options
|
|
from test.TestBase import TestBase
|
|
from BaseClasses import MultiWorld
|
|
from worlds import AutoWorld
|
|
from worlds.minecraft import MinecraftWorld
|
|
from worlds.minecraft.Items import MinecraftItem, item_table
|
|
from worlds.minecraft.Options import *
|
|
from Options import Toggle, Range
|
|
|
|
# Converts the name of an item into an item object
|
|
def MCItemFactory(items, player: int):
|
|
ret = []
|
|
singleton = False
|
|
if isinstance(items, str):
|
|
items = [items]
|
|
singleton = True
|
|
for item in items:
|
|
if item in item_table:
|
|
ret.append(MinecraftItem(item, item_table[item].progression, item_table[item].code, player))
|
|
else:
|
|
raise Exception(f"Unknown item {item}")
|
|
|
|
if singleton:
|
|
return ret[0]
|
|
return ret
|
|
|
|
class TestMinecraft(TestBase):
|
|
|
|
def setUp(self):
|
|
self.world = MultiWorld(1)
|
|
self.world.game[1] = "Minecraft"
|
|
self.world.worlds[1] = MinecraftWorld(self.world, 1)
|
|
exclusion_pools = ['hard', 'unreasonable', 'postgame']
|
|
for pool in exclusion_pools:
|
|
setattr(self.world, f"include_{pool}_advancements", {1: False})
|
|
setattr(self.world, "advancement_goal", {1: AdvancementGoal(30)})
|
|
setattr(self.world, "egg_shards_required", {1: EggShardsRequired(0)})
|
|
setattr(self.world, "egg_shards_available", {1: EggShardsAvailable(0)})
|
|
setattr(self.world, "required_bosses", {1: BossGoal(1)}) # ender dragon
|
|
setattr(self.world, "shuffle_structures", {1: ShuffleStructures(False)})
|
|
setattr(self.world, "bee_traps", {1: BeeTraps(0)})
|
|
setattr(self.world, "combat_difficulty", {1: CombatDifficulty(1)}) # normal
|
|
setattr(self.world, "structure_compasses", {1: Toggle(False)})
|
|
AutoWorld.call_single(self.world, "create_regions", 1)
|
|
AutoWorld.call_single(self.world, "generate_basic", 1)
|
|
AutoWorld.call_single(self.world, "set_rules", 1)
|
|
|
|
def _get_items(self, item_pool, all_except):
|
|
if all_except and len(all_except) > 0:
|
|
items = self.world.itempool[:]
|
|
items = [item for item in items if
|
|
item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
|
|
items.extend(MCItemFactory(item_pool[0], 1))
|
|
else:
|
|
items = MCItemFactory(item_pool[0], 1)
|
|
return self.get_state(items)
|
|
|
|
def _get_items_partial(self, item_pool, missing_item):
|
|
new_items = item_pool[0].copy()
|
|
new_items.remove(missing_item)
|
|
items = MCItemFactory(new_items, 1)
|
|
return self.get_state(items)
|
|
|