Skip to content

Commit 06cef63

Browse files
ZiktofelMagnemaniaEnvyDragonMatthewMarinetshopop201
authored andcommitted
SC2: Multi-campaign (ArchipelagoMW#2954)
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]>
1 parent 6203344 commit 06cef63

File tree

97 files changed

+13712
-4743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+13712
-4743
lines changed

README.md

+1-1

Starcraft2Client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import ModuleUpdate
44
ModuleUpdate.update()
55

6-
from worlds.sc2wol.Client import launch
6+
from worlds.sc2.Client import launch
77
import Utils
88

99
if __name__ == "__main__":

WebHostLib/static/assets/sc2wolTracker.js renamed to WebHostLib/static/assets/sc2Tracker.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ window.addEventListener('load', () => {
2525

2626
// Collapsible advancement sections
2727
const categories = document.getElementsByClassName("location-category");
28-
for (let i = 0; i < categories.length; i++) {
29-
let hide_id = categories[i].id.split('-')[0];
30-
if (hide_id == 'Total') {
28+
for (let category of categories) {
29+
let hide_id = category.id.split('_')[0];
30+
if (hide_id === 'Total') {
3131
continue;
3232
}
33-
categories[i].addEventListener('click', function() {
33+
category.addEventListener('click', function() {
3434
// Toggle the advancement list
3535
document.getElementById(hide_id).classList.toggle("hide");
3636
// Change text of the header
37-
const tab_header = document.getElementById(hide_id+'-header').children[0];
37+
const tab_header = document.getElementById(hide_id+'_header').children[0];
3838
const orig_text = tab_header.innerHTML;
3939
let new_text;
4040
if (orig_text.includes("▼")) {
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.
-8.32 KB
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 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.
-17.5 KB
Binary file not shown.
Binary file not shown.
-8.8 KB
Binary file not shown.
-8.09 KB
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 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.
-3.78 KB
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 not shown.
Binary file not shown.
-7.31 KB
Binary file not shown.
-8.46 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
-5.54 KB
Binary file not shown.
Binary file not shown.
+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
#player-tracker-wrapper{
2+
margin: 0;
3+
}
4+
5+
#tracker-table td {
6+
vertical-align: top;
7+
}
8+
9+
.inventory-table-area{
10+
border: 2px solid #000000;
11+
border-radius: 4px;
12+
padding: 3px 10px 3px 10px;
13+
}
14+
15+
.inventory-table-area:has(.inventory-table-terran) {
16+
width: 690px;
17+
background-color: #525494;
18+
}
19+
20+
.inventory-table-area:has(.inventory-table-zerg) {
21+
width: 360px;
22+
background-color: #9d60d2;
23+
}
24+
25+
.inventory-table-area:has(.inventory-table-protoss) {
26+
width: 400px;
27+
background-color: #d2b260;
28+
}
29+
30+
#tracker-table .inventory-table td{
31+
width: 40px;
32+
height: 40px;
33+
text-align: center;
34+
vertical-align: middle;
35+
}
36+
37+
.inventory-table td.title{
38+
padding-top: 10px;
39+
height: 20px;
40+
font-family: "JuraBook", monospace;
41+
font-size: 16px;
42+
font-weight: bold;
43+
}
44+
45+
.inventory-table img{
46+
height: 100%;
47+
max-width: 40px;
48+
max-height: 40px;
49+
border: 1px solid #000000;
50+
filter: grayscale(100%) contrast(75%) brightness(20%);
51+
background-color: black;
52+
}
53+
54+
.inventory-table img.acquired{
55+
filter: none;
56+
background-color: black;
57+
}
58+
59+
.inventory-table .tint-terran img.acquired {
60+
filter: sepia(100%) saturate(300%) brightness(130%) hue-rotate(120deg)
61+
}
62+
63+
.inventory-table .tint-protoss img.acquired {
64+
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(180deg)
65+
}
66+
67+
.inventory-table .tint-level-1 img.acquired {
68+
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg)
69+
}
70+
71+
.inventory-table .tint-level-2 img.acquired {
72+
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(120deg)
73+
}
74+
75+
.inventory-table .tint-level-3 img.acquired {
76+
filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(240deg)
77+
}
78+
79+
.inventory-table div.counted-item {
80+
position: relative;
81+
}
82+
83+
.inventory-table div.item-count {
84+
width: 160px;
85+
text-align: left;
86+
color: black;
87+
font-family: "JuraBook", monospace;
88+
font-weight: bold;
89+
}
90+
91+
#location-table{
92+
border: 2px solid #000000;
93+
border-radius: 4px;
94+
background-color: #87b678;
95+
padding: 10px 3px 3px;
96+
font-family: "JuraBook", monospace;
97+
font-size: 16px;
98+
font-weight: bold;
99+
cursor: default;
100+
}
101+
102+
#location-table table{
103+
width: 100%;
104+
}
105+
106+
#location-table th{
107+
vertical-align: middle;
108+
text-align: left;
109+
padding-right: 10px;
110+
}
111+
112+
#location-table td{
113+
padding-top: 2px;
114+
padding-bottom: 2px;
115+
line-height: 20px;
116+
}
117+
118+
#location-table td.counter {
119+
text-align: right;
120+
font-size: 14px;
121+
}
122+
123+
#location-table td.toggle-arrow {
124+
text-align: right;
125+
}
126+
127+
#location-table tr#Total-header {
128+
font-weight: bold;
129+
}
130+
131+
#location-table img{
132+
height: 100%;
133+
max-width: 30px;
134+
max-height: 30px;
135+
}
136+
137+
#location-table tbody.locations {
138+
font-size: 16px;
139+
}
140+
141+
#location-table td.location-name {
142+
padding-left: 16px;
143+
}
144+
145+
#location-table td:has(.location-column) {
146+
vertical-align: top;
147+
}
148+
149+
#location-table .location-column {
150+
width: 100%;
151+
height: 100%;
152+
}
153+
154+
#location-table .location-column .spacer {
155+
min-height: 24px;
156+
}
157+
158+
.hide {
159+
display: none;
160+
}

WebHostLib/static/styles/sc2wolTracker.css

-112
This file was deleted.

0 commit comments

Comments
 (0)