Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SC2: Multi-campaign #2954

Merged
merged 1,215 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1215 commits
Select commit Hold shift + click to select a range
d13a337
Fix locking progressive upgrades due to upgrade amount config restric…
Ziktofel Nov 23, 2023
d87f75f
Merge pull request #84 from MatthewMarinets/sc2/valkyrie_upgrades
Ziktofel Nov 24, 2023
8a1b095
Fix Valkyrie upgrades to have the recent changes
Ziktofel Nov 24, 2023
b219bea
Add Valkyrie Resource Efficiency
Ziktofel Nov 24, 2023
2a7d91f
Add Scourge
Ziktofel Dec 4, 2023
ad625f7
Add Predator's Fury
Ziktofel Dec 4, 2023
fe22c0f
Fix Scourge origin
Ziktofel Dec 5, 2023
7d6f06b
Add Protoss unit upgrades
Ziktofel Dec 13, 2023
08fd7dd
Reorganized location types and balanced the default inclusion options
Magnemania Dec 14, 2023
6783aa2
Fixed important_for_filtering item field
Magnemania Dec 14, 2023
c45595f
Fix item important_for_filtering
Ziktofel Dec 14, 2023
f6deca6
remove High Archon from logical inventory if it was removed by advanc…
Ziktofel Dec 14, 2023
1f9cbb9
Cleanup
Ziktofel Dec 14, 2023
bfae7cd
Discard Power Overwhelming if Supplicant is not roll'd
Ziktofel Dec 15, 2023
87e707e
Revert "Fixed important_for_filtering item field"
Magnemania Dec 15, 2023
4392ffe
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago in…
Magnemania Dec 15, 2023
3f113f6
Make starting resource amounts configurable
Ziktofel Dec 15, 2023
6dcdf25
Finished MasteryLocations description.
Magnemania Dec 15, 2023
0f6b777
More description for ExtraLocations
Magnemania Dec 15, 2023
d65bea9
Use ItemNames for parent_item
Ziktofel Dec 15, 2023
4cd169c
Avoid aliasing Kerrigan's Primal Form with Kinetic Blast
Ziktofel Dec 15, 2023
c80224a
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago in…
Magnemania Dec 15, 2023
d9dbdeb
Changed classifications on Gates of Hell and Loki
Magnemania Dec 15, 2023
c625dd9
Update Last Stand Requirements
Ziktofel Dec 15, 2023
986cb29
Merge remote-tracking branch 'magnemania/sc2-next-location-relabel' i…
Ziktofel Dec 15, 2023
a7b5b26
Make all optional locations enabled as we don't have in-game objectiv…
Ziktofel Dec 15, 2023
6a70fbd
Add an another blink varinat into blink logic
Ziktofel Dec 19, 2023
bff6541
Cleanup
Ziktofel Dec 19, 2023
4e89c4a
SC2: fixing QoL commands
EnvyDragon Dec 21, 2023
dbb4b1a
Merge pull request #119 from EnvyDragon/sc2-next
Ziktofel Dec 21, 2023
5a6901d
Add additional Zerg upgrades
Ziktofel Dec 21, 2023
2ae7b28
Update list of items that can be put back safely after pulling out fi…
Ziktofel Dec 21, 2023
be0b39e
Add HERC and Warhound items
Ziktofel Dec 21, 2023
8d8c95c
Cleanup strain/mutation ocunts from init
Ziktofel Dec 23, 2023
fd11a04
Fix Logical inventory set filtering for Archon upgrade rule
Ziktofel Dec 23, 2023
c991e89
Fix typo in pool filter filtering T3 items
Ziktofel Dec 24, 2023
e411da5
Item names fixes
Ziktofel Jan 7, 2024
4320f7d
sc2: Added Protoss item groups for the different factions
MatthewMarinets Jan 7, 2024
152ea3e
sc2: Added Warp Prism attack to Tal'Darim item group
MatthewMarinets Jan 7, 2024
8cb9784
sc2: Fixed a typo in item variable name
MatthewMarinets Jan 7, 2024
a838ac8
sc2: Removed Dark Templar meld from Nerazim group as item filtering s…
MatthewMarinets Jan 7, 2024
38c646d
Merge pull request #124 from MatthewMarinets/sc2/protoss_item_groups
Ziktofel Jan 7, 2024
1c6158c
Add initial NCO implementation
Ziktofel Jan 7, 2024
37adf99
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel Jan 7, 2024
91ff4f1
Some unit-test related fixes
Ziktofel Jan 7, 2024
8321b9d
Merge remote-tracking branch 'origin/main' into sc2-next
Ziktofel Jan 7, 2024
e4808bb
Fix some dumb bugs in item exclusions
Ziktofel Jan 7, 2024
cd95322
Attempt to fix pre-3.10 unit tests
Ziktofel Jan 7, 2024
f4f1fed
Additional attempt to fix for pre-3.10 Python
Ziktofel Jan 7, 2024
b3c905c
Remove deprecation warning from SC2 option access
Ziktofel Jan 7, 2024
0c8f29e
Allow to connect to legacy games
Ziktofel Jan 7, 2024
b7cb42d
Set In the Enemy's Shadow as a starter if Grant Story Tech is on
Ziktofel Jan 7, 2024
7bf0d80
Update Evil Awoken logic
Ziktofel Jan 7, 2024
a21d504
Add some Terran locations
Ziktofel Jan 8, 2024
aaad9ed
Add a second level to BC Missile Pods
Ziktofel Jan 8, 2024
cdcf9b8
Typing cleanup
Ziktofel Jan 8, 2024
83aad63
Small fix for Missile Pods
Ziktofel Jan 8, 2024
7a7b781
Remove nerfed Banshee Rocket Barrage from logic
Ziktofel Jan 9, 2024
5833c54
Add HotS locations
Ziktofel Jan 9, 2024
f9d0433
Typo fix
Ziktofel Jan 10, 2024
7e225ad
Yet Another Typo Fix
Ziktofel Jan 10, 2024
0e53316
Fix Engine of Destruction requirement
Ziktofel Jan 11, 2024
a20ebf2
Fix missiing return
Ziktofel Jan 11, 2024
8d35c3a
Merge branch 'main' of github.com:ArchipelagoMW/Archipelago into sc2-…
Ziktofel Jan 11, 2024
c796e57
Remove Nova equipmnet from pool if no NCO mission is generated. Fix #127
Ziktofel Jan 12, 2024
88f9ab6
Update Items.py
hopop201 Jan 13, 2024
260f281
Make the escape rule more clear
Ziktofel Jan 14, 2024
0ceb87b
Fix brackets in escape logic
Ziktofel Jan 14, 2024
ef7efad
Typo fix
Ziktofel Jan 14, 2024
97ac115
Fix another logic hole
Ziktofel Jan 15, 2024
043a768
Add a requirement having Detectors
Ziktofel Jan 15, 2024
e4532e7
Fix location name
Ziktofel Jan 15, 2024
5197449
sc2: Added a small handful of item descriptions
MatthewMarinets Jan 16, 2024
df9ed26
sc2: Fixing capitalization in description
MatthewMarinets Jan 16, 2024
611c349
Merge pull request #128 from hopop201/patch-1
Ziktofel Jan 16, 2024
3d13e0d
Fix item quantity
Ziktofel Jan 16, 2024
3595af5
Attempt to fix more progressive upgrades handling
Ziktofel Jan 16, 2024
8940b9c
sc2: Updated new descriptions with review feedback
MatthewMarinets Jan 16, 2024
8280eef
sc2: One final clarification on Repair Beam
MatthewMarinets Jan 16, 2024
ec387c5
Merge pull request #131 from MatthewMarinets/sc2/few_item_descriptions
Ziktofel Jan 16, 2024
91d5355
Generator: Clarify "too many items excluded" error
Salzkorn Jan 16, 2024
55b4ac1
Merge pull request #132 from Salzkorn/sc2-next
Ziktofel Jan 16, 2024
ce86f0f
Fix a logic hole for Into the Void
Ziktofel Jan 17, 2024
28a73b8
sc2: fixed a couple of item descriptions
MatthewMarinets Jan 20, 2024
a41bf3c
sc2: Updated colour command to accept a faction parameter; passed col…
MatthewMarinets Jan 20, 2024
3600730
sc2: Allow changing color mid-mission
MatthewMarinets Jan 20, 2024
224f3d9
Merge pull request #133 from MatthewMarinets/sc2/improved_colour_command
Ziktofel Jan 20, 2024
b103544
Fix Vanilla mission order goal for Epilogue
Ziktofel Jan 20, 2024
e5d1831
sc2: Added a bit of extra height to the multi-campaign scrollable region
MatthewMarinets Jan 21, 2024
44b52d6
sc2: Changing line-feed type on starcraft2.kv in case that's what's c…
MatthewMarinets Jan 21, 2024
c548a9f
Merge pull request #137 from MatthewMarinets/mm/fix_launcher_scrolling
Ziktofel Jan 21, 2024
f933c0e
Fix `/available` and `/unfinished` Fix #136
Ziktofel Jan 21, 2024
d344228
Add an option to exclude Very Hard missions. Cleaned up some option d…
Ziktofel Jan 21, 2024
4b9e483
SC2: Fine-tuning mission gui
EnvyDragon Jan 21, 2024
dcd356d
SC2: Made grid layout spacing consistent
EnvyDragon Jan 21, 2024
88ff77f
SC2: left-side padding increase for layout screen
EnvyDragon Jan 21, 2024
d6f0fa1
SC2: using enum for campaign check
EnvyDragon Jan 21, 2024
b69ccbe
Merge pull request #139 from EnvyDragon/sc2-next
Ziktofel Jan 21, 2024
5bda448
added descriptions for a few proposs units to make sure I understood …
ArchonofFail Jan 22, 2024
53cf00d
Added descriptions for the WoL protoss units based on the in-game des…
ArchonofFail Jan 22, 2024
ae0466b
added descriptions for all of the remaining Protoss units.
ArchonofFail Jan 23, 2024
508784d
added descriptions for all WoL and LotV protoss units mostly based on…
ArchonofFail Jan 23, 2024
1cc513b
updated descriptions for starting mineral/gas/supply upgrades to refl…
ArchonofFail Jan 23, 2024
157c38e
minor edits to the nothing item's description
ArchonofFail Jan 23, 2024
30e6eb2
Minor unit descriptions fixes
ArchonofFail Jan 23, 2024
f46a4f3
sc2: Added contributors.md
MatthewMarinets Jan 23, 2024
fc2b774
sc2: Updating contributors doc with more github usernames, and respon…
MatthewMarinets Jan 23, 2024
c1530b8
sc2: Updated entry in contributors.md with new PR contributor
MatthewMarinets Jan 23, 2024
f73fa33
sc2: Added a client command to change starting resources per check
MatthewMarinets Jan 24, 2024
d075dab
sc2: Turn echo_commands on for the starcraft 2 command processor; rem…
MatthewMarinets Jan 24, 2024
1e49657
sc2: Adding a client toggle for taking over AI ally option
MatthewMarinets Jan 25, 2024
ddb35a8
sc2: Added new bug reporter to contributors.md
MatthewMarinets Jan 25, 2024
c4ed13f
sc2: Added another bug reporter
MatthewMarinets Jan 25, 2024
da4b3e7
sc2: Fixed a typo and incorrect difficulty rating for Devil's Playgro…
MatthewMarinets Jan 25, 2024
51a4db3
added desciptions for the basic zerg units loosely based on the ingam…
ArchonofFail Jan 25, 2024
587c9e4
Merge pull request #146 from MatthewMarinets/mm/location_typo
Ziktofel Jan 25, 2024
92abf6b
Merge pull request #143 from MatthewMarinets/mm/contibutors_doc
Ziktofel Jan 25, 2024
1a96fc3
sc2: Updated toggle ally control comment
MatthewMarinets Jan 25, 2024
7eadab9
Merge pull request #142 from ArchonofFail/master
Ziktofel Jan 25, 2024
3c7cdb2
Merge pull request #144 from MatthewMarinets/mm/utility_commands
Ziktofel Jan 25, 2024
2c3c11a
Merge branch 'Ziktofel:sc2-next' into master
ArchonofFail Jan 25, 2024
b9c9efd
Merge branch 'genderdruid'
ArchonofFail Jan 25, 2024
fea6c9b
updated a few descriptions based on feedback
ArchonofFail Jan 25, 2024
fde94c6
Merge branch 'hopop/patch2' of https://github.com/ArchonofFail/Workin…
ArchonofFail Jan 25, 2024
8693fe3
Merge branch 'sc2-next' of https://github.com/ArchonofFail/Working-on…
ArchonofFail Jan 25, 2024
0aebc56
Merge branch 'master' of https://github.com/ArchonofFail/Working-on-d…
ArchonofFail Jan 25, 2024
7636132
Merge pull request #148 from ArchonofFail/master
Ziktofel Jan 26, 2024
9e0b1c1
sc2: Added another bug reporter to contributors list
MatthewMarinets Jan 28, 2024
a840c90
Merge pull request #150 from MatthewMarinets/mm/update_contributors
Ziktofel Jan 28, 2024
494300d
Update possible starting missions for LotV
Ziktofel Jan 28, 2024
db7a1f5
Add Amon's Reach as an additional possible starter mission
Ziktofel Jan 28, 2024
4a72e9c
Add a code to prevent missing the logic by a cascade item removal
Ziktofel Jan 29, 2024
2705b9c
Always generate the initial mission order for each world to generate.
Ziktofel Jan 29, 2024
d649586
Alter the Vent logic in Enemy Within in order to match map changes
Ziktofel Jan 29, 2024
dd89c76
Update options documentation
Ziktofel Jan 29, 2024
f965625
Get rid of KeyError in logic
Ziktofel Jan 29, 2024
0f920c9
Force Kerrigan level update if a Kerrigan level item is given
Ziktofel Jan 29, 2024
7271cb2
Fix some NCO-only starter items
Ziktofel Jan 29, 2024
de33844
Fix item filtering bug
Ziktofel Jan 30, 2024
c3d2257
Set Kerrigan levels from mission completed (instead of checks)
Ziktofel Jan 31, 2024
07afddc
Update option documentation
Ziktofel Jan 31, 2024
62042f6
Option documentation update
Ziktofel Jan 31, 2024
0f87224
Disable Kerrigan if HotS campaign is disabled
Ziktofel Jan 31, 2024
fd31471
Cleanup
Ziktofel Jan 31, 2024
94a35a6
Option documentation cleanup
Ziktofel Jan 31, 2024
b3dce7e
Reformat imports in the client
Ziktofel Jan 31, 2024
73d3ced
Merge pull request #153 from Ziktofel/kerrigan_disable_if_not_hots
Ziktofel Jan 31, 2024
26bd2ef
Fix csircular import
Ziktofel Jan 31, 2024
a08b587
Fix Kerrigan level on start
Ziktofel Jan 31, 2024
cd0c8b0
Remove unneeded await
Ziktofel Jan 31, 2024
d61a376
Use greater or equal for terran def score
Ziktofel Jan 31, 2024
eb551c7
Declare No Logic Protoss Starting units
Ziktofel Jan 31, 2024
503d574
Fix type hinting
Ziktofel Feb 1, 2024
2ff0f2f
Additional Kerrigan level options; description cleanup; levels per be…
Salzkorn Feb 1, 2024
7eaae57
Merge pull request #154 from Salzkorn/sc2-next
Ziktofel Feb 1, 2024
d705574
Fix NCO vanilla shuffled mission removals
Ziktofel Feb 2, 2024
d682e72
Change LOTV to not Require LOTV Prologue to be completed to start
MadiMadsen Feb 2, 2024
5352a8d
sc2: Added a sorted and formatted /received command; moved many misc …
MatthewMarinets Feb 2, 2024
a1de7d8
These missions require Story Levels too to be starters
Ziktofel Feb 3, 2024
d469965
sc2: Switched style and colouring method of /received to use NetUtils…
MatthewMarinets Feb 3, 2024
0df17e3
sc2: Added some configurable options for SOA presence
MatthewMarinets Feb 3, 2024
6af1a90
sc2: Compacted /options implementation down
MatthewMarinets Feb 3, 2024
8bd4c80
sc2: Added option mapping for boolean options; cleanup
MatthewMarinets Feb 3, 2024
c9ccd69
sc2: Removed old markup writer; added a simple one to print with bold…
MatthewMarinets Feb 3, 2024
21c5423
sc2: Support showing multiple same items with /received; minor type/d…
MatthewMarinets Feb 3, 2024
e2e89c2
sc2: Fixed indentation and a typing issue
MatthewMarinets Feb 3, 2024
e8df8a1
sc2: Fixed child item indentation and broken item colours
MatthewMarinets Feb 3, 2024
b3e8003
Merge pull request #155 from MatthewMarinets/mm/client_commands
Ziktofel Feb 3, 2024
fb13c9a
Generation: Add reusable items to second pass item placement
Salzkorn Feb 3, 2024
e0ca956
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago in…
Salzkorn Feb 3, 2024
9718845
Merge pull request #158 from Salzkorn/sc2-next
Ziktofel Feb 3, 2024
0fcae6d
Merge pull request #156 from MadiMadsen/sc2-next
Ziktofel Feb 3, 2024
8892937
Fix location classifiaction in Harvest of Screams. See #157
Ziktofel Feb 3, 2024
e1d4fe1
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel Feb 3, 2024
caf068b
Refactor item name groups
Salzkorn Feb 3, 2024
19409b0
Rework /received filtering
Salzkorn Feb 3, 2024
530c845
Merge branch 'sc2-next' of https://github.com/Ziktofel/Archipelago in…
Salzkorn Feb 3, 2024
50b6d74
Fix flaggroup item name groups
Salzkorn Feb 3, 2024
f29aa26
Merge pull request #159 from Salzkorn/sc2-next
Ziktofel Feb 3, 2024
6493e2a
Fix certain items with brackets not being in parent/race item groups
Salzkorn Feb 4, 2024
b8c1ab3
Merge pull request #161 from Salzkorn/sc2-next
Ziktofel Feb 4, 2024
85fbf30
Add Viking as a valid starting unit for Sudden Strike
Ziktofel Feb 9, 2024
b06a1bc
Add Banshee to a valid starters for Sudden Strike
Ziktofel Feb 9, 2024
85a381e
Fix handling legacy games
Ziktofel Feb 9, 2024
069453a
Fix location name
Ziktofel Feb 10, 2024
3426abe
Fix several exclusion options not working
Salzkorn Feb 13, 2024
7f37bac
Re-fix NCO/Kerrigan passives & Primal Form
Salzkorn Feb 13, 2024
302332a
Merge pull request #170 from Salzkorn/sc2-next
Ziktofel Feb 13, 2024
3102140
Typo fix
Ziktofel Feb 14, 2024
85c720c
Fix exclude_very_hard_missions not doing what it should
Ziktofel Feb 15, 2024
bffd3e6
Remove some redundant code
Salzkorn Feb 23, 2024
852e22f
Merge pull request #171 from Salzkorn/sc2-next
Ziktofel Feb 23, 2024
f7d69c6
Update Raid Liberator name
Ziktofel Feb 23, 2024
a1e1353
sc2: Added descriptions for Nova items; updated Thor Immortality Prot…
MatthewMarinets Mar 3, 2024
02a30fd
sc2: Added descriptions for half of zerg upgrades
MatthewMarinets Mar 3, 2024
84fd7ea
sc2: Fixing a typo
MatthewMarinets Mar 3, 2024
1c0d048
sc2: Responding to PR feedback
MatthewMarinets Mar 3, 2024
4cf02a9
sc2: Spelling corrections
MatthewMarinets Mar 3, 2024
801faac
Check all the required mods
Ziktofel Mar 5, 2024
31ed0bf
Fix veryfiyng not checking LotV/NCO maps
Ziktofel Mar 5, 2024
45533ad
Merge pull request #172 from MatthewMarinets/mm/more_descriptions
Ziktofel Mar 9, 2024
ee5bfcd
Reformat Items.py. Fix some typos
Ziktofel Mar 9, 2024
9f20a01
Unify Mutalisk upgrade names with those present in the game
Ziktofel Mar 10, 2024
1219ac8
Fixed maximum number upgrades, type in var name, remove a no longer r…
neocerber Mar 10, 2024
b843beb
Merge pull request #173 from neocerber/fix/maxNbUpgrades
Ziktofel Mar 10, 2024
11a0543
Classify End Game as Very Hard mission
Ziktofel Mar 10, 2024
7abdd2f
Update Diamondback upgrades. See #168
Ziktofel Mar 10, 2024
b3a2098
sc2: Added more contributors from the beta async
MatthewMarinets Feb 4, 2024
a68343e
sc2: Fixing inconsistent formatting in contributors.md
MatthewMarinets Feb 4, 2024
25cf800
sc2: Added another contributor
MatthewMarinets Feb 4, 2024
52f276e
sc2: Added Figment and eudai to bug reporters contributors list for I…
MatthewMarinets Feb 18, 2024
1db8991
sc2: Updated contributors per PR request
MatthewMarinets Mar 10, 2024
c61c0f8
Warhound rebalance. See #167
Ziktofel Mar 10, 2024
d38162b
Fix typo Glave -> Glaive
Ziktofel Mar 10, 2024
ad97eec
Add HERC upgrades. See #166
Ziktofel Mar 10, 2024
a6cd6e0
Fix Tri-Lithium Power Cell item quantity
Ziktofel Mar 10, 2024
73b10e7
Merge remote-tracking branch 'origin/main' into sc2-next
Ziktofel Mar 11, 2024
1545c73
Diamondback's range upgrade is only progressive if ext
Ziktofel Mar 11, 2024
c5a0e9e
Fix some items origin
Ziktofel Mar 11, 2024
c510d2c
Update Terran part of the tracker
Ziktofel Mar 12, 2024
dd2e96e
Merge pull request #162 from MatthewMarinets/mm/add_more_contributors
Ziktofel Mar 12, 2024
2126220
sc2: Updating setup docs and top-level description
MatthewMarinets Mar 13, 2024
39393de
sc2: Fixing a typo in the docs
MatthewMarinets Mar 13, 2024
db37a38
sc2: Updating game info page (based on first draft from genderdruid)
MatthewMarinets Mar 13, 2024
de0d08a
Merge pull request #175 from MatthewMarinets/mm/docs
Ziktofel Mar 13, 2024
d409350
Fix potential logic hole
Ziktofel Mar 13, 2024
8ccf53a
Add Zerg part of the tracker
Ziktofel Mar 13, 2024
643629e
Add Protoss part of the tracker
Ziktofel Mar 13, 2024
6ee05f9
Cleanup
Ziktofel Mar 13, 2024
71a74d4
sc2: Tracker updates; using coloured icons; adding player name
MatthewMarinets Mar 14, 2024
44436dd
Merge pull request #176 from MatthewMarinets/mm/tracker_updates
Ziktofel Mar 14, 2024
2577944
Typo fix
Ziktofel Mar 14, 2024
a3852ed
Tracker: Fix a case when mission has a hyphen in its name
Ziktofel Mar 14, 2024
97fecfa
Add mission part of the Tracker
Ziktofel Mar 14, 2024
cdc65a0
Cleanup
Ziktofel Mar 14, 2024
99f4623
Merge branch 'main' into sc2-next
Ziktofel Mar 14, 2024
ea2b2b1
Fix non-apworld list with world update
Ziktofel Mar 14, 2024
2d403f4
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel Mar 14, 2024
f3307c3
Update worlds/sc2/docs/setup_en.md
Ziktofel Mar 14, 2024
99721b3
SC2 apworld works even under Python 3.8
Ziktofel Mar 14, 2024
9653493
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel Mar 14, 2024
13ebfe2
Minor formating fix
Ziktofel Mar 14, 2024
f18678d
Use world.random instead of multiworld's one
Ziktofel Mar 14, 2024
54c1be3
Switch from multiworld, player API to world API
Ziktofel Mar 14, 2024
1b16738
Update worlds/sc2/__init__.py
Ziktofel Mar 15, 2024
c9db70f
Update contributors.md
Ziktofel Mar 15, 2024
131da27
Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago into sc2-next
Ziktofel Mar 15, 2024
416ffee
Convert relative imports to absolute
Ziktofel Mar 15, 2024
70f8d6d
Clean up not working test launchers
Ziktofel Mar 15, 2024
06b8bd4
Merge branch 'main' into sc2-next
Ziktofel Mar 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Currently, the following games are supported:
* Hollow Knight
* The Witness
* Sonic Adventure 2: Battle
* Starcraft 2: Wings of Liberty
* Starcraft 2
* Donkey Kong Country 3
* Dark Souls 3
* Super Mario World
Expand Down
2 changes: 1 addition & 1 deletion Starcraft2Client.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import ModuleUpdate
ModuleUpdate.update()

from worlds.sc2wol.Client import launch
from worlds.sc2.Client import launch
import Utils

if __name__ == "__main__":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ window.addEventListener('load', () => {

// Collapsible advancement sections
const categories = document.getElementsByClassName("location-category");
for (let i = 0; i < categories.length; i++) {
let hide_id = categories[i].id.split('-')[0];
if (hide_id == 'Total') {
for (let category of categories) {
let hide_id = category.id.split('_')[0];
if (hide_id === 'Total') {
continue;
}
categories[i].addEventListener('click', function() {
category.addEventListener('click', function() {
// Toggle the advancement list
document.getElementById(hide_id).classList.toggle("hide");
// Change text of the header
const tab_header = document.getElementById(hide_id+'-header').children[0];
const tab_header = document.getElementById(hide_id+'_header').children[0];
const orig_text = tab_header.innerHTML;
let new_text;
if (orig_text.includes("▼")) {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/cyclone.png
Binary file not shown.
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/drillingclaws.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/hyperfluxor.png
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/impalerrounds.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/jotunboosters.png
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/jumpjets.png
Binary file not shown.
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/liberator.png
Binary file not shown.
Binary file removed WebHostLib/static/static/icons/sc2/lockdown.png
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/opticalflare.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/restoration.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/spidermine.png
Diff not rendered.
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/superstimpack.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/thorsiegemode.png
Diff not rendered.
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/valkyrie.png
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/warpjump.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed WebHostLib/static/static/icons/sc2/widowmine.png
Diff not rendered.
Diff not rendered.
160 changes: 160 additions & 0 deletions WebHostLib/static/styles/sc2Tracker.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
#player-tracker-wrapper{
margin: 0;
}

#tracker-table td {
vertical-align: top;
}

.inventory-table-area{
border: 2px solid #000000;
border-radius: 4px;
padding: 3px 10px 3px 10px;
}

.inventory-table-area:has(.inventory-table-terran) {
width: 690px;
background-color: #525494;
}

.inventory-table-area:has(.inventory-table-zerg) {
width: 360px;
background-color: #9d60d2;
}

.inventory-table-area:has(.inventory-table-protoss) {
width: 400px;
background-color: #d2b260;
}

#tracker-table .inventory-table td{
width: 40px;
height: 40px;
text-align: center;
vertical-align: middle;
}

.inventory-table td.title{
padding-top: 10px;
height: 20px;
font-family: "JuraBook", monospace;
font-size: 16px;
font-weight: bold;
}

.inventory-table img{
height: 100%;
max-width: 40px;
max-height: 40px;
border: 1px solid #000000;
filter: grayscale(100%) contrast(75%) brightness(20%);
background-color: black;
}

.inventory-table img.acquired{
filter: none;
background-color: black;
}

.inventory-table .tint-terran img.acquired {
filter: sepia(100%) saturate(300%) brightness(130%) hue-rotate(120deg)
}

.inventory-table .tint-protoss img.acquired {
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(180deg)
}

.inventory-table .tint-level-1 img.acquired {
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg)
}

.inventory-table .tint-level-2 img.acquired {
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(120deg)
}

.inventory-table .tint-level-3 img.acquired {
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(240deg)
}

.inventory-table div.counted-item {
position: relative;
}

.inventory-table div.item-count {
width: 160px;
text-align: left;
color: black;
font-family: "JuraBook", monospace;
font-weight: bold;
}

#location-table{
border: 2px solid #000000;
border-radius: 4px;
background-color: #87b678;
padding: 10px 3px 3px;
font-family: "JuraBook", monospace;
font-size: 16px;
font-weight: bold;
cursor: default;
}

#location-table table{
width: 100%;
}

#location-table th{
vertical-align: middle;
text-align: left;
padding-right: 10px;
}

#location-table td{
padding-top: 2px;
padding-bottom: 2px;
line-height: 20px;
}

#location-table td.counter {
text-align: right;
font-size: 14px;
}

#location-table td.toggle-arrow {
text-align: right;
}

#location-table tr#Total-header {
font-weight: bold;
}

#location-table img{
height: 100%;
max-width: 30px;
max-height: 30px;
}

#location-table tbody.locations {
font-size: 16px;
}

#location-table td.location-name {
padding-left: 16px;
}

#location-table td:has(.location-column) {
vertical-align: top;
}

#location-table .location-column {
width: 100%;
height: 100%;
}

#location-table .location-column .spacer {
min-height: 24px;
}

.hide {
display: none;
}
112 changes: 0 additions & 112 deletions WebHostLib/static/styles/sc2wolTracker.css

This file was deleted.

Loading
Loading