Merged

SC2: Multi-campaign#2954
Berserker66 merged 1215 commits intoArchipelagoMW:mainfrom Ziktofel:sc2-next

SC2: Multi-campaign#2954

Merged

Berserker66 merged 1215 commits intoArchipelagoMW:mainfrom Ziktofel:sc2-next

Mar 15, 2024

+13,712-4,743

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 23, 2023

Fix locking progressive upgrades due to upgrade amount config restrictions
Ziktofel
committedNov 23, 2023

Commits on Nov 24, 2023

Merge pull request #84 from MatthewMarinets/sc2/valkyrie_upgrades
Ziktofel
authoredNov 24, 2023
Fix Valkyrie upgrades to have the recent changes
Ziktofel
committedNov 24, 2023
Add Valkyrie Resource Efficiency
Ziktofel
committedNov 24, 2023

Commits on Dec 4, 2023

Add Scourge
Ziktofel
committedDec 4, 2023
Add Predator's Fury
Ziktofel
committedDec 4, 2023

Commits on Dec 5, 2023

Fix Scourge origin
Ziktofel
committedDec 5, 2023

Commits on Dec 13, 2023

Add Protoss unit upgrades
Ziktofel
committedDec 13, 2023

Commits on Dec 14, 2023

Reorganized location types and balanced the default inclusion options
Magnemania
committedDec 14, 2023
Fixed important_for_filtering item field
Magnemania
committedDec 14, 2023
Fix item important_for_filtering
Ziktofel
committedDec 14, 2023
remove High Archon from logical inventory if it was removed by advanced filtering
Ziktofel
committedDec 14, 2023
Cleanup
Ziktofel
committedDec 14, 2023

Commits on Dec 15, 2023

Discard Power Overwhelming if Supplicant is not roll'd
Ziktofel
committedDec 15, 2023
Revert "Fixed important_for_filtering item field"
Magnemania
committedDec 15, 2023
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago into sc2-next-location-relabel
Magnemania
committedDec 15, 2023
Make starting resource amounts configurable
Ziktofel
committedDec 15, 2023
Finished MasteryLocations description.
Magnemania
committedDec 15, 2023
More description for ExtraLocations
Magnemania
committedDec 15, 2023
Use ItemNames for parent_item
Ziktofel
committedDec 15, 2023
Avoid aliasing Kerrigan's Primal Form with Kinetic Blast
Ziktofel
committedDec 15, 2023
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago into sc2-next-location-relabel
Magnemania
committedDec 15, 2023
Changed classifications on Gates of Hell and Loki
Magnemania
committedDec 15, 2023
Update Last Stand Requirements
Ziktofel
committedDec 15, 2023
Merge remote-tracking branch 'magnemania/sc2-next-location-relabel' into sc2-next
Ziktofel
committedDec 15, 2023
Make all optional locations enabled as we don't have in-game objective filtering yet
Ziktofel
committedDec 15, 2023

Commits on Dec 19, 2023

Add an another blink varinat into blink logic
Ziktofel
committedDec 19, 2023
Cleanup
Ziktofel
committedDec 19, 2023

Commits on Dec 21, 2023

SC2: fixing QoL commands
EnvyDragon
committedDec 21, 2023
Merge pull request #119 from EnvyDragon/sc2-next
Ziktofel
authoredDec 21, 2023
Add additional Zerg upgrades
Ziktofel
committedDec 21, 2023
Update list of items that can be put back safely after pulling out first.
Ziktofel
committedDec 21, 2023
Add HERC and Warhound items
Ziktofel
committedDec 21, 2023

Commits on Dec 23, 2023

Cleanup strain/mutation ocunts from init
Ziktofel
committedDec 23, 2023
Fix Logical inventory set filtering for Archon upgrade rule
Ziktofel
committedDec 23, 2023

Commits on Dec 24, 2023

Fix typo in pool filter filtering T3 items
Ziktofel
committedDec 24, 2023

Commits on Jan 7, 2024

Item names fixes
Ziktofel
committedJan 7, 2024
sc2: Added Protoss item groups for the different factions
MatthewMarinets
committedJan 7, 2024
sc2: Added Warp Prism attack to Tal'Darim item group
MatthewMarinets
committedJan 7, 2024
sc2: Fixed a typo in item variable name
MatthewMarinets
committedJan 7, 2024
sc2: Removed Dark Templar meld from Nerazim group as item filtering should handle it
MatthewMarinets
committedJan 7, 2024
Merge pull request #124 from MatthewMarinets/sc2/protoss_item_groups
Ziktofel
authoredJan 7, 2024
Add initial NCO implementation
Ziktofel
committedJan 7, 2024
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel
committedJan 7, 2024
Some unit-test related fixes
Ziktofel
committedJan 7, 2024
Merge remote-tracking branch 'origin/main' into sc2-next
Ziktofel
committedJan 7, 2024
Fix some dumb bugs in item exclusions
Ziktofel
committedJan 7, 2024
Attempt to fix pre-3.10 unit tests
Ziktofel
committedJan 7, 2024
Additional attempt to fix for pre-3.10 Python
Ziktofel
committedJan 7, 2024
Remove deprecation warning from SC2 option access
Ziktofel
committedJan 7, 2024
Allow to connect to legacy games
Ziktofel
committedJan 7, 2024
Set In the Enemy's Shadow as a starter if Grant Story Tech is on
Ziktofel
committedJan 7, 2024
Update Evil Awoken logic
Ziktofel
committedJan 7, 2024

Commits on Jan 8, 2024

Add some Terran locations
Ziktofel
committedJan 8, 2024
Add a second level to BC Missile Pods
Ziktofel
committedJan 8, 2024
Typing cleanup
Ziktofel
committedJan 8, 2024
Small fix for Missile Pods
Ziktofel
committedJan 8, 2024

Commits on Jan 9, 2024

Remove nerfed Banshee Rocket Barrage from logic
Ziktofel
committedJan 9, 2024
Add HotS locations
Ziktofel
committedJan 9, 2024

Commits on Jan 10, 2024

Typo fix
Ziktofel
committedJan 10, 2024
Yet Another Typo Fix
Ziktofel
committedJan 10, 2024

Commits on Jan 11, 2024

Fix Engine of Destruction requirement
Ziktofel
committedJan 11, 2024
Fix missiing return
Ziktofel
committedJan 11, 2024
Merge branch 'main' of github.com:ArchipelagoMW/Archipelago into sc2-next
Ziktofel
committedJan 11, 2024

Commits on Jan 12, 2024

Remove Nova equipmnet from pool if no NCO mission is generated. Fix #127
Ziktofel
committedJan 12, 2024

Commits on Jan 13, 2024

Update Items.py
hopop201
authoredJan 13, 2024

Commits on Jan 14, 2024

Make the escape rule more clear
Ziktofel
committedJan 14, 2024
Fix brackets in escape logic
Ziktofel
committedJan 14, 2024
Typo fix
Ziktofel
committedJan 14, 2024

Commits on Jan 15, 2024

Fix another logic hole
Ziktofel
committedJan 15, 2024
Add a requirement having Detectors
Ziktofel
committedJan 15, 2024
Fix location name
Ziktofel
committedJan 15, 2024

Commits on Jan 16, 2024

sc2: Added a small handful of item descriptions
MatthewMarinets
committedJan 16, 2024
sc2: Fixing capitalization in description
MatthewMarinets
committedJan 16, 2024
Merge pull request #128 from hopop201/patch-1
Ziktofel
authoredJan 16, 2024
Fix item quantity
Ziktofel
committedJan 16, 2024
Attempt to fix more progressive upgrades handling
Ziktofel
committedJan 16, 2024
sc2: Updated new descriptions with review feedback
MatthewMarinets
committedJan 16, 2024
sc2: One final clarification on Repair Beam
MatthewMarinets
committedJan 16, 2024
Merge pull request #131 from MatthewMarinets/sc2/few_item_descriptions
Ziktofel
authoredJan 16, 2024
Generator: Clarify "too many items excluded" error
Salzkorn
committedJan 16, 2024
Merge pull request #132 from Salzkorn/sc2-next
Ziktofel
authoredJan 16, 2024

Commits on Jan 17, 2024

Fix a logic hole for Into the Void
Ziktofel
committedJan 17, 2024

Commits on Jan 20, 2024

Commits on Jan 21, 2024

sc2: Added a bit of extra height to the multi-campaign scrollable region
MatthewMarinets
committedJan 21, 2024
sc2: Changing line-feed type on starcraft2.kv in case that's what's causing a weird diff
MatthewMarinets
committedJan 21, 2024
Merge pull request #137 from MatthewMarinets/mm/fix_launcher_scrolling
Ziktofel
authoredJan 21, 2024
Fix /available and /unfinished Fix #136
Ziktofel
committedJan 21, 2024
Add an option to exclude Very Hard missions. Cleaned up some option documentation
Ziktofel
committedJan 21, 2024
SC2: Fine-tuning mission gui
EnvyDragon
committedJan 21, 2024
SC2: Made grid layout spacing consistent
EnvyDragon
committedJan 21, 2024
SC2: left-side padding increase for layout screen
EnvyDragon
committedJan 21, 2024
SC2: using enum for campaign check
EnvyDragon
committedJan 21, 2024
Merge pull request #139 from EnvyDragon/sc2-next
Ziktofel
authoredJan 21, 2024

Commits on Jan 22, 2024

Commits on Jan 23, 2024

added descriptions for all of the remaining Protoss units.
ArchonofFail
committedJan 23, 2024
added descriptions for all WoL and LotV protoss units mostly based on the one in-game.
ArchonofFail
committedJan 23, 2024
updated descriptions for starting mineral/gas/supply upgrades to reflect the fact that the amount is variable.
ArchonofFail
committedJan 23, 2024
minor edits to the nothing item's description
ArchonofFail
committedJan 23, 2024
Minor unit descriptions fixes
ArchonofFail
committedJan 23, 2024
sc2: Added contributors.md
MatthewMarinets
committedJan 23, 2024
sc2: Updating contributors doc with more github usernames, and responding to feedback from the discord
MatthewMarinets
committedJan 23, 2024
sc2: Updated entry in contributors.md with new PR contributor
MatthewMarinets
committedJan 23, 2024

Commits on Jan 24, 2024

Commits on Jan 25, 2024

sc2: Adding a client toggle for taking over AI ally option
MatthewMarinets
committedJan 25, 2024
sc2: Added new bug reporter to contributors.md
MatthewMarinets
committedJan 25, 2024
sc2: Added another bug reporter
MatthewMarinets
committedJan 25, 2024
sc2: Fixed a typo and incorrect difficulty rating for Devil's Playground full-clear location
MatthewMarinets
committedJan 25, 2024
added desciptions for the basic zerg units loosely based on the ingame descriptions but rewritten because I think a lot of the ingame descriptions are kinda bad.
ArchonofFail
committedJan 25, 2024
Merge pull request #146 from MatthewMarinets/mm/location_typo
Ziktofel
authoredJan 25, 2024
Merge pull request #143 from MatthewMarinets/mm/contibutors_doc
Ziktofel
authoredJan 25, 2024
sc2: Updated toggle ally control comment
MatthewMarinets
committedJan 25, 2024
Merge pull request #142 from ArchonofFail/master
Ziktofel
authoredJan 25, 2024
Merge pull request #144 from MatthewMarinets/mm/utility_commands
Ziktofel
authoredJan 25, 2024
Merge branch 'Ziktofel:sc2-next' into master
ArchonofFail
authoredJan 25, 2024
Merge branch 'genderdruid'
ArchonofFail
committedJan 25, 2024
updated a few descriptions based on feedback
ArchonofFail
committedJan 25, 2024
Merge branch 'hopop/patch2' of https://github.com/ArchonofFail/Working-on-descriptions
ArchonofFail
committedJan 25, 2024
Merge branch 'sc2-next' of https://github.com/ArchonofFail/Working-on-descriptions
ArchonofFail
committedJan 25, 2024
Merge branch 'master' of https://github.com/ArchonofFail/Working-on-descriptions
ArchonofFail
committedJan 25, 2024

Commits on Jan 26, 2024

Merge pull request #148 from ArchonofFail/master
Ziktofel
authoredJan 26, 2024

Commits on Jan 28, 2024

Commits on Jan 29, 2024

Add a code to prevent missing the logic by a cascade item removal
Ziktofel
committedJan 29, 2024
Always generate the initial mission order for each world to generate.
Ziktofel
committedJan 29, 2024
Alter the Vent logic in Enemy Within in order to match map changes
Ziktofel
committedJan 29, 2024
Update options documentation
Ziktofel
committedJan 29, 2024
Get rid of KeyError in logic
Ziktofel
committedJan 29, 2024
Force Kerrigan level update if a Kerrigan level item is given
Ziktofel
committedJan 29, 2024
Fix some NCO-only starter items
Ziktofel
committedJan 29, 2024

Commits on Jan 30, 2024

Fix item filtering bug
Ziktofel
committedJan 30, 2024

Commits on Jan 31, 2024

Set Kerrigan levels from mission completed (instead of checks)
Ziktofel
committedJan 31, 2024
Update option documentation
Ziktofel
committedJan 31, 2024
Option documentation update
Ziktofel
committedJan 31, 2024
Disable Kerrigan if HotS campaign is disabled
Ziktofel
committedJan 31, 2024
Cleanup
Ziktofel
committedJan 31, 2024
Option documentation cleanup
Ziktofel
committedJan 31, 2024
Reformat imports in the client
Ziktofel
committedJan 31, 2024
Merge pull request #153 from Ziktofel/kerrigan_disable_if_not_hots
Ziktofel
authoredJan 31, 2024
Fix csircular import
Ziktofel
committedJan 31, 2024
Fix Kerrigan level on start
Ziktofel
committedJan 31, 2024
Remove unneeded await
Ziktofel
committedJan 31, 2024
Use greater or equal for terran def score
Ziktofel
committedJan 31, 2024
Declare No Logic Protoss Starting units
Ziktofel
committedJan 31, 2024

Commits on Feb 1, 2024

Fix type hinting
Ziktofel
committedFeb 1, 2024
Additional Kerrigan level options; description cleanup; levels per beaten mission fixed
Salzkorn
committedFeb 1, 2024
Merge pull request #154 from Salzkorn/sc2-next
Ziktofel
authoredFeb 1, 2024

Commits on Feb 2, 2024

Fix NCO vanilla shuffled mission removals
Ziktofel
committedFeb 2, 2024
Change LOTV to not Require LOTV Prologue to be completed to start
MadiMadsen
committedFeb 2, 2024

Commits on Feb 3, 2024

sc2: Added a sorted and formatted /received command; moved many misc options to an /option command
MatthewMarinets
committedFeb 3, 2024
These missions require Story Levels too to be starters
Ziktofel
committedFeb 3, 2024
sc2: Switched style and colouring method of /received to use NetUtils / core functionality
MatthewMarinets
committedFeb 3, 2024
sc2: Added some configurable options for SOA presence
MatthewMarinets
committedFeb 3, 2024
sc2: Compacted /options implementation down
MatthewMarinets
committedFeb 3, 2024
sc2: Added option mapping for boolean options; cleanup
MatthewMarinets
committedFeb 3, 2024
sc2: Removed old markup writer; added a simple one to print with bold and underline tags
MatthewMarinets
committedFeb 3, 2024
sc2: Support showing multiple same items with /received; minor type/default cleanup
MatthewMarinets
committedFeb 3, 2024
sc2: Fixed indentation and a typing issue
MatthewMarinets
committedFeb 3, 2024
sc2: Fixed child item indentation and broken item colours
MatthewMarinets
committedFeb 3, 2024
Merge pull request #155 from MatthewMarinets/mm/client_commands
Ziktofel
authoredFeb 3, 2024
Generation: Add reusable items to second pass item placement
Salzkorn
committedFeb 3, 2024
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago into sc2-next
Salzkorn
committedFeb 3, 2024
Merge pull request #158 from Salzkorn/sc2-next
Ziktofel
authoredFeb 3, 2024
Merge pull request #156 from MadiMadsen/sc2-next
Ziktofel
authoredFeb 3, 2024
Fix location classifiaction in Harvest of Screams. See #157
Ziktofel
committedFeb 3, 2024
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel
committedFeb 3, 2024
Refactor item name groups
Salzkorn
committedFeb 3, 2024
Rework /received filtering
Salzkorn
committedFeb 3, 2024
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago into sc2-next
Salzkorn
committedFeb 3, 2024
Fix flaggroup item name groups
Salzkorn
committedFeb 3, 2024
Merge pull request #159 from Salzkorn/sc2-next
Ziktofel
authoredFeb 3, 2024

Commits on Feb 4, 2024

Fix certain items with brackets not being in parent/race item groups
Salzkorn
committedFeb 4, 2024
Merge pull request #161 from Salzkorn/sc2-next
Ziktofel
authoredFeb 4, 2024

Commits on Feb 9, 2024

Add Viking as a valid starting unit for Sudden Strike
Ziktofel
committedFeb 9, 2024
Add Banshee to a valid starters for Sudden Strike
Ziktofel
committedFeb 9, 2024
Fix handling legacy games
Ziktofel
committedFeb 9, 2024

Commits on Feb 10, 2024

Fix location name
Ziktofel
committedFeb 10, 2024

Commits on Feb 13, 2024

Fix several exclusion options not working
Salzkorn
committedFeb 13, 2024
Re-fix NCO/Kerrigan passives & Primal Form
Salzkorn
committedFeb 13, 2024
Merge pull request #170 from Salzkorn/sc2-next
Ziktofel
authoredFeb 13, 2024

Commits on Feb 14, 2024

Typo fix
Ziktofel
committedFeb 14, 2024

Commits on Feb 15, 2024

Fix exclude_very_hard_missions not doing what it should
Ziktofel
committedFeb 15, 2024

Commits on Feb 23, 2024

Remove some redundant code
Salzkorn
committedFeb 23, 2024
Merge pull request #171 from Salzkorn/sc2-next
Ziktofel
authoredFeb 23, 2024
Update Raid Liberator name
Ziktofel
committedFeb 23, 2024

Commits on Mar 3, 2024

Commits on Mar 5, 2024

Check all the required mods
Ziktofel
committedMar 5, 2024
Fix veryfiyng not checking LotV/NCO maps
Ziktofel
committedMar 5, 2024

Commits on Mar 9, 2024

Merge pull request #172 from MatthewMarinets/mm/more_descriptions
Ziktofel
authoredMar 9, 2024
Reformat Items.py. Fix some typos
Ziktofel
committedMar 9, 2024

Commits on Mar 10, 2024

Unify Mutalisk upgrade names with those present in the game
Ziktofel
committedMar 10, 2024
Fixed maximum number upgrades, type in var name, remove a no longer revelent comment
neocerber
committedMar 10, 2024
Merge pull request #173 from neocerber/fix/maxNbUpgrades
Ziktofel
authoredMar 10, 2024
Classify End Game as Very Hard mission
Ziktofel
committedMar 10, 2024
Update Diamondback upgrades. See #168
Ziktofel
committedMar 10, 2024
sc2: Added more contributors from the beta async
MatthewMarinets
committedMar 10, 2024
sc2: Fixing inconsistent formatting in contributors.md
MatthewMarinets
committedMar 10, 2024
sc2: Added another contributor
MatthewMarinets
committedMar 10, 2024
sc2: Added Figment and eudai to bug reporters contributors list for IUD bug reports
MatthewMarinets
committedMar 10, 2024
sc2: Updated contributors per PR request
MatthewMarinets
committedMar 10, 2024
Warhound rebalance. See #167
Ziktofel
committedMar 10, 2024
Fix typo Glave -> Glaive
Ziktofel
committedMar 10, 2024
Add HERC upgrades. See #166
Ziktofel
committedMar 10, 2024
Fix Tri-Lithium Power Cell item quantity
Ziktofel
committedMar 10, 2024

Commits on Mar 11, 2024

Merge remote-tracking branch 'origin/main' into sc2-next
Ziktofel
committedMar 11, 2024
Diamondback's range upgrade is only progressive if ext
Ziktofel
committedMar 11, 2024
Fix some items origin
Ziktofel
committedMar 11, 2024

Commits on Mar 12, 2024

Update Terran part of the tracker
Ziktofel
committedMar 12, 2024
Merge pull request #162 from MatthewMarinets/mm/add_more_contributors
Ziktofel
authoredMar 12, 2024

Commits on Mar 13, 2024

sc2: Updating setup docs and top-level description
MatthewMarinets
committedMar 13, 2024
sc2: Fixing a typo in the docs
MatthewMarinets
committedMar 13, 2024
sc2: Updating game info page (based on first draft from genderdruid)
MatthewMarinets
committedMar 13, 2024
Merge pull request #175 from MatthewMarinets/mm/docs
Ziktofel
authoredMar 13, 2024
Fix potential logic hole
Ziktofel
committedMar 13, 2024
Add Zerg part of the tracker
Ziktofel
committedMar 13, 2024
Add Protoss part of the tracker
Ziktofel
committedMar 13, 2024
Cleanup
Ziktofel
committedMar 13, 2024

Commits on Mar 14, 2024

sc2: Tracker updates; using coloured icons; adding player name
MatthewMarinets
committedMar 14, 2024
Merge pull request #176 from MatthewMarinets/mm/tracker_updates
Ziktofel
authoredMar 14, 2024
Typo fix
Ziktofel
committedMar 14, 2024
Tracker: Fix a case when mission has a hyphen in its name
Ziktofel
committedMar 14, 2024
Add mission part of the Tracker
Ziktofel
committedMar 14, 2024
Cleanup
Ziktofel
committedMar 14, 2024
Merge branch 'main' into sc2-next
Ziktofel
authoredMar 14, 2024
Fix non-apworld list with world update
Ziktofel
committedMar 14, 2024
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel
committedMar 14, 2024
Update worlds/sc2/docs/setup_en.md

Ziktofel
and
Exempt-Medic
authoredMar 14, 2024
SC2 apworld works even under Python 3.8
Ziktofel
committedMar 14, 2024
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel
committedMar 14, 2024
Minor formating fix
Ziktofel
committedMar 14, 2024
Use world.random instead of multiworld's one
Ziktofel
committedMar 14, 2024
Switch from multiworld, player API to world API
Ziktofel
committedMar 14, 2024

Commits on Mar 15, 2024

Update worlds/sc2/__init__.py

Ziktofel
and
Berserker66
authoredMar 15, 2024
Update contributors.md
Ziktofel
committedMar 15, 2024
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel
committedMar 15, 2024
Convert relative imports to absolute
Ziktofel
committedMar 15, 2024
Clean up not working test launchers
Ziktofel
committedMar 15, 2024
Merge branch 'main' into sc2-next
Ziktofel
authoredMar 15, 2024