Skip to content

Commit

Permalink
SC2: Multi-campaign (ArchipelagoMW#2954)
Browse files Browse the repository at this point in the history
Adds HotS, LotV and NCO campaigns to SC2 game.
The world's name has changed to reflect that (it's not only Wings of Liberty now)
The client was patched in a way that can still join to games generated prior this change
---------

Co-authored-by: Magnemania <[email protected]>
Co-authored-by: EnvyDragon <[email protected]>
Co-authored-by: Matthew <[email protected]>
Co-authored-by: hopop201 <[email protected]>
Co-authored-by: Salzkorn <[email protected]>
Co-authored-by: genderdruid <[email protected]>
Co-authored-by: MadiMadsen <[email protected]>
Co-authored-by: neocerber <[email protected]>
Co-authored-by: Exempt-Medic <[email protected]>
Co-authored-by: Fabian Dill <[email protected]>
  • Loading branch information
11 people authored and EmilyV99 committed Apr 15, 2024
1 parent 7addbc7 commit 5053f72
Show file tree
Hide file tree
Showing 97 changed files with 13,712 additions and 4,743 deletions.
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

0 comments on commit 5053f72

Please sign in to comment.