Skip to content

Commit

Permalink
Revert "Mission order fix"
Browse files Browse the repository at this point in the history 
This reverts commit 746c60e.
  • Loading branch information
@MadiMadsen
MadiMadsen committed Nov 17, 2023
1 parent 15f9815 commit 18a2069
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 20 deletions.
16 changes: 8 additions & 8 deletions worlds/sc2/MissionTables.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,16 +258,16 @@ class FillMission(NamedTuple):
FillMission(MissionPools.MEDIUM, [MissionConnection(3, SC2Campaign.LOTV)], "Korhal", completion_critical=True, removal_priority=7),
FillMission(MissionPools.MEDIUM, [MissionConnection(2, SC2Campaign.LOTV)], "Shakuras", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(5, SC2Campaign.LOTV)], "Shakuras", completion_critical=True, removal_priority=6),
FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.LOTV), MissionConnection(6, SC2Campaign.LOTV)], "Purifier", completion_critical=True, or_requirements=True),
FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.LOTV), MissionConnection(6, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV)], "Ulnar", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.LOTV), MissionConnection(6, SC2Campaign.LOTV)], "Purifier", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(7, SC2Campaign.LOTV)], "Ulnar", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(8, SC2Campaign.LOTV)], "Ulnar", completion_critical=True, removal_priority=1),
FillMission(MissionPools.HARD, [MissionConnection(9, SC2Campaign.LOTV)], "Ulnar", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(10, SC2Campaign.LOTV)], "Purifier", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(11, SC2Campaign.LOTV)], "Purifier", completion_critical=True, removal_priority=5),
FillMission(MissionPools.HARD, [MissionConnection(10, SC2Campaign.LOTV)], "Tal'darim", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(13, SC2Campaign.LOTV)], "Tal'darim", completion_critical=True, removal_priority=4),
FillMission(MissionPools.HARD, [MissionConnection(12, SC2Campaign.LOTV), MissionConnection(14, SC2Campaign.LOTV)], "Moebius", completion_critical=True, or_requirements=True),
FillMission(MissionPools.HARD, [MissionConnection(12, SC2Campaign.LOTV), MissionConnection(14, SC2Campaign.LOTV), MissionConnection(15, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(12, SC2Campaign.LOTV), MissionConnection(14, SC2Campaign.LOTV)], "Moebius", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(15, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True),
FillMission(MissionPools.HARD, [MissionConnection(16, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True, removal_priority=2),
FillMission(MissionPools.FINAL, [MissionConnection(17, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True),
],
Expand Down Expand Up @@ -499,16 +499,16 @@ class FillMission(NamedTuple):
SC2Mission.BROTHERS_IN_ARMS.mission_name: MissionInfo(SC2Mission.BROTHERS_IN_ARMS, [MissionConnection(4, SC2Campaign.LOTV)], SC2Mission.BROTHERS_IN_ARMS.area, completion_critical=True),
SC2Mission.AMON_S_REACH.mission_name: MissionInfo(SC2Mission.AMON_S_REACH, [MissionConnection(3, SC2Campaign.LOTV)], SC2Mission.AMON_S_REACH.area, completion_critical=True),
SC2Mission.LAST_STAND.mission_name: MissionInfo(SC2Mission.LAST_STAND, [MissionConnection(6, SC2Campaign.LOTV)], SC2Mission.LAST_STAND.area, completion_critical=True),
SC2Mission.FORBIDDEN_WEAPON.mission_name: MissionInfo(SC2Mission.FORBIDDEN_WEAPON, [MissionConnection(5, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV)], SC2Mission.FORBIDDEN_WEAPON.area, completion_critical=True, or_requirements=True),
SC2Mission.TEMPLE_OF_UNIFICATION.mission_name: MissionInfo(SC2Mission.TEMPLE_OF_UNIFICATION, [MissionConnection(5, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV), MissionConnection(8, SC2Campaign.LOTV)], SC2Mission.TEMPLE_OF_UNIFICATION.area, completion_critical=True),
SC2Mission.FORBIDDEN_WEAPON.mission_name: MissionInfo(SC2Mission.FORBIDDEN_WEAPON, [MissionConnection(5, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV)], SC2Mission.FORBIDDEN_WEAPON.area, completion_critical=True),
SC2Mission.TEMPLE_OF_UNIFICATION.mission_name: MissionInfo(SC2Mission.TEMPLE_OF_UNIFICATION, [MissionConnection(8, SC2Campaign.LOTV)], SC2Mission.TEMPLE_OF_UNIFICATION.area, completion_critical=True),
SC2Mission.THE_INFINITE_CYCLE.mission_name: MissionInfo(SC2Mission.THE_INFINITE_CYCLE, [MissionConnection(9, SC2Campaign.LOTV)], SC2Mission.THE_INFINITE_CYCLE.area, completion_critical=True),
SC2Mission.HARBINGER_OF_OBLIVION.mission_name: MissionInfo(SC2Mission.HARBINGER_OF_OBLIVION, [MissionConnection(10, SC2Campaign.LOTV)], SC2Mission.HARBINGER_OF_OBLIVION.area, completion_critical=True),
SC2Mission.UNSEALING_THE_PAST.mission_name: MissionInfo(SC2Mission.UNSEALING_THE_PAST, [MissionConnection(11, SC2Campaign.LOTV)], SC2Mission.UNSEALING_THE_PAST.area, completion_critical=True),
SC2Mission.PURIFICATION.mission_name: MissionInfo(SC2Mission.PURIFICATION, [MissionConnection(12, SC2Campaign.LOTV)], SC2Mission.PURIFICATION.area, completion_critical=True),
SC2Mission.STEPS_OF_THE_RITE.mission_name: MissionInfo(SC2Mission.STEPS_OF_THE_RITE, [MissionConnection(11, SC2Campaign.LOTV)], SC2Mission.STEPS_OF_THE_RITE.area, completion_critical=True),
SC2Mission.RAK_SHIR.mission_name: MissionInfo(SC2Mission.RAK_SHIR, [MissionConnection(14, SC2Campaign.LOTV)], SC2Mission.RAK_SHIR.area, completion_critical=True),
SC2Mission.TEMPLAR_S_CHARGE.mission_name: MissionInfo(SC2Mission.TEMPLAR_S_CHARGE, [MissionConnection(13, SC2Campaign.LOTV), MissionConnection(15, SC2Campaign.LOTV)], SC2Mission.TEMPLAR_S_CHARGE.area, completion_critical=True, or_requirements=True),
SC2Mission.TEMPLAR_S_RETURN.mission_name: MissionInfo(SC2Mission.TEMPLAR_S_RETURN, [MissionConnection(13, SC2Campaign.LOTV), MissionConnection(15, SC2Campaign.LOTV), MissionConnection(16, SC2Campaign.LOTV)], SC2Mission.TEMPLAR_S_RETURN.area, completion_critical=True),
SC2Mission.TEMPLAR_S_CHARGE.mission_name: MissionInfo(SC2Mission.TEMPLAR_S_CHARGE, [MissionConnection(12, SC2Campaign.LOTV), MissionConnection(15, SC2Campaign.LOTV)], SC2Mission.TEMPLAR_S_CHARGE.area, completion_critical=True),
SC2Mission.TEMPLAR_S_RETURN.mission_name: MissionInfo(SC2Mission.TEMPLAR_S_RETURN, [MissionConnection(16, SC2Campaign.LOTV)], SC2Mission.TEMPLAR_S_RETURN.area, completion_critical=True),
SC2Mission.THE_HOST.mission_name: MissionInfo(SC2Mission.THE_HOST, [MissionConnection(17, SC2Campaign.LOTV)], SC2Mission.THE_HOST.area, completion_critical=True),
SC2Mission.SALVATION.mission_name: MissionInfo(SC2Mission.SALVATION, [MissionConnection(18, SC2Campaign.LOTV)], SC2Mission.SALVATION.area, completion_critical=True),
},
Expand Down
18 changes: 6 additions & 12 deletions worlds/sc2/Regions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,15 @@ def wol_cleared_missions(state: CollectionState, mission_count: int) -> bool:
lambda state: state.has("Beat The Spear of Adun", player)),
connect(multiworld, player, names, "Sky Shield", "Brothers in Arms",
lambda state: state.has("Beat Sky Shield", player)),
connect(multiworld, player, names, "Brothers in Arms", "Forbidden Weapon",
lambda state: state.has("Beat Brothers in Arms", player)),
connect(multiworld, player, names, "The Spear of Adun", "Amon's Reach",
lambda state: state.has("Beat The Spear of Adun", player)),
connect(multiworld, player, names, "Amon's Reach", "Last Stand",
lambda state: state.has("Beat Amon's Reach", player)),
connect(multiworld, player, names, "Last Stand", "Forbidden Weapon",
lambda state: state.has("Beat Last Stand", player)),
lambda state: state.has("Beat Last Stand", player)
and state.has("Beat Brothers in Arms", player)),
connect(multiworld, player, names, "Forbidden Weapon", "Temple of Unification",
lambda state: state.has("Beat Brothers in Arms", player)
and state.has("Beat Last Stand", player)
and state.has("Beat Forbidden Weapon", player)),
lambda state: state.has("Beat Forbidden Weapon", player)),
connect(multiworld, player, names, "Temple of Unification", "The Infinite Cycle",
lambda state: state.has("Beat Temple of Unification", player)),
connect(multiworld, player, names, "The Infinite Cycle", "Harbinger of Oblivion",
Expand All @@ -219,18 +216,15 @@ def wol_cleared_missions(state: CollectionState, mission_count: int) -> bool:
lambda state: state.has("Beat Harbinger of Oblivion", player)),
connect(multiworld, player, names, "Unsealing the Past", "Purification",
lambda state: state.has("Beat Unsealing the Past", player)),
connect(multiworld, player, names, "Purification", "Templar's Charge",
lambda state: state.has("Beat Purification", player)),
connect(multiworld, player, names, "Harbinger of Oblivion", "Steps of the Rite",
lambda state: state.has("Beat Harbinger of Oblivion", player)),
connect(multiworld, player, names, "Steps of the Rite", "Rak'Shir",
lambda state: state.has("Beat Steps of the Rite", player)),
connect(multiworld, player, names, "Rak'Shir", "Templar's Charge",
lambda state: state.has("Beat Rak'Shir", player)),
lambda state: state.has("Beat Rak'Shir", player)
and state.has("Beat Purification", player)),
connect(multiworld, player, names, "Templar's Charge", "Templar's Return",
lambda state: state.has("Beat Purification", player)
and state.has("Beat Rak Shir", player)
and state.has("Beat Templar's Charge", player)),
lambda state: state.has("Beat Templar's Charge", player)),
connect(multiworld, player, names, "Templar's Return", "The Host",
lambda state: state.has("Beat Templar's Return", player)),
connect(multiworld, player, names, "The Host", "Salvation",
Expand Down

0 comments on commit 18a2069

Please sign in to comment.