diff --git a/worlds/am2r/docs/setup_en.md b/worlds/am2r/docs/setup_en.md index d81b66e8d342..ad469485b422 100644 --- a/worlds/am2r/docs/setup_en.md +++ b/worlds/am2r/docs/setup_en.md @@ -6,6 +6,11 @@ - [AM2R Launcher](https://github.com/AM2R-Community-Developers/AM2RLauncher/releases/latest) - Your self provided copy of AM2R 1.1 for the launcher +## Optional Software +- [Sublime Text](https://www.sublimetext.com/) or [Notepad++](https://notepad-plus-plus.org/downloads/) for easy editing of `.yaml` files +- [Poptracker](https://github.com/black-sliver/PopTracker/releases) and the [AM2R Tracker](https://github.com/Ehseezed/AM2R-Tracker/releases) pack for a map tracker +- [Universal Tracker](https://github.com/FarisTheAncient/Archipelago/releases) for an updating list of available checks + ## Installation Process ### Installing Multiworld Mod @@ -13,7 +18,7 @@ Download and set up the latest release of [AM2R Launcher](https://github.com/AM2R-Community-Developers/AM2RLauncher/releases) using your copy of AM2R 1.1 then in the launcher you can under the `Mod Settings` tab, hit the `ADD NEW MOD` button, and select Multiworld mod `.zip` file from either of the Multiworld Mod downloads. -Finally from the `Play` tab select the `Multiworld` profile and hit `Install` and then play to load up the mod. +Finally, from the `Play` tab select the `Multiworld` profile and hit `Install` and then play to load up the mod. ### Installing `am2r.apworld` @@ -80,7 +85,7 @@ multiworld session at which point you can start a new save file or continue a sa ## Bug Reporting/Feature Requests -If you are playing this mod and are encountering bugs **DO NOT** report them to the Archipelago server this is not official support from them, and they may or may not know what to do instead you can report them to the dedicated mod thread on the [AM2R Server](https://discord.gg/YTQnkAJ) or on the [Modding Server](https://discord.gg/Fdq3MSXEDb) and you can always open an issue on the github. +If you are playing this mod and are encountering bugs **DO NOT** report them to the Archipelago server this is not official support from them, and they may or may not know what to do instead you can report them to the dedicated mod thread on the [AM2R Server](https://discord.gg/YTQnkAJ) or on the [Modding Server](https://discord.gg/Fdq3MSXEDb) and you can always open an issue on the GitHub. ### Help I don't have enough energy to do this check with 100% trap fill on fusion mode diff --git a/worlds/am2r/locations.py b/worlds/am2r/locations.py index 5158e72eb2e5..7fa92a059b7a 100644 --- a/worlds/am2r/locations.py +++ b/worlds/am2r/locations.py @@ -160,15 +160,15 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int]): LocationData("Industrial Complex", "Inside Industrial: Guardian of Doom Treadmill", 108680121, 324, lambda state: state.has("Speed Booster", player) and logic.AM2R_can_bomb(state)), LocationData("Industrial Complex", "Inside Industrial: Rawsome1234 by the Lava Lake", 108680122, 325, lambda state: state.has("Speed Booster", player) and logic.AM2R_can_bomb(state) and (state.has("Gravity Suit", player) or state.has("Space Jump", player))), - LocationData("GFS Thoth", "Dual Alphas: Marco", 108680123, 333), # Epsilon - LocationData("GFS Thoth", "Dual Alphas: Polo", 108680124, 334), # Epsilon + LocationData("GFS Thoth", "Research Camp Dual Alphas: Marco", 108680123, 333), # Epsilon + LocationData("GFS Thoth", "Research Camp Dual Alphas: Polo", 108680124, 334), # Epsilon LocationData("Mines", "Mines: Unga", 108680125, 335, lambda state: state.has("Super Missile", player) and logic.AM2R_can_bomb(state) and (state.has("Space Jump", player) or state.has("Spider Ball", player))), LocationData("Mines", "Mines: Gunga", 108680126, 336, lambda state: state.has("Super Missile", player) and logic.AM2R_can_bomb(state) and (state.has("Space Jump", player) or state.has("Spider Ball", player))), LocationData("The Tower", "The Tower: Patricia", 108680127, 337, logic.AM2R_can_fly), # Mahan LocationData("The Tower", "The Tower: Variable \"GUH\"", 108680128, 338, logic.AM2R_can_spider), # ANX - LocationData("The Tower", "Ruler of The Tower: Slagathor", 108680129, 340, lambda state: state.has("Power Bomb", player, 3) or state.has("Bombs", player)), # Rawsome + LocationData("The Tower", "The Tower: Slagathor, the Ruler", 108680129, 340, lambda state: state.has("Power Bomb", player, 3) or state.has("Bombs", player)), # Rawsome LocationData("The Tower", "The Tower: Mr.Sandman", 108680130, 339, lambda state: state.has("Space Jump", player) or state.has("Hi Jump", player) and state.has("Speed Booster", player)), # Xander LocationData("The Tower", "The Tower: Anakin", 108680131, 341, lambda state: state.has("Space Jump", player)), # Xander LocationData("The Tower", "The Tower: Xander", 108680132, 342, lambda state: state.has("Space Jump", player)), @@ -181,8 +181,8 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int]): LocationData("Pipe Hell R", "Alpha Squadron: Telly", 108680137, 347), # Lucina LocationData("Pipe Hell R", "Alpha Squadron: Martin", 108680138, 344), - LocationData("Underwater Distro Connection", "Underwater: Gamma Bros Mario", 108680139, 349), # Lucina - LocationData("Underwater Distro Connection", "Underwater: Gamma Bros Luigi", 108680140, 350), # Lucina + LocationData("Underwater Distro Connection", "Distribution Center: Gamma Bros Mario", 108680139, 349), # Lucina + LocationData("Underwater Distro Connection", "Distribution Center: Gamma Bros Luigi", 108680140, 350), # Lucina LocationData("Deep Caves", "Deep Caves: Lil\' Bro", 108680141, 351), LocationData("Deep Caves", "Deep Caves: Big Sis", 108680142, 352),