Skip to content

Commit 3101b73

Browse files
ryanbarlow97ryanbarlow97
authored
Merge branch 'main' into testaskin
2 parents 9d19396 + 0255a6e commit 3101b73

150 files changed

Lines changed: 9964 additions & 4165 deletions

File tree

Some content is hidden

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

‎index.html‎

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@
7575
defer
7676
></script>
7777

78-
<!-- Publift/Fuse ads -->
79-
<script
80-
async
81-
src="https://cdn.fuseplatform.net/publift/tags/2/4121/fuse.js"
82-
></script>
78+
<script data-cfasync="false">
79+
window.ramp = window.ramp || {};
80+
window.ramp.que = window.ramp.que || [];
81+
window.ramp.passiveMode = true;
82+
</script>
8383

8484
<script>
8585
window.googletag = window.googletag || { cmd: [] };
@@ -133,29 +133,29 @@
133133

134134
<div
135135
id="mobile-menu-backdrop"
136-
class="lg:!hidden [.in-game_&]:hidden hidden pointer-events-none [&.open]:block [&.open]:pointer-events-auto [&.open]:fixed [&.open]:inset-0 [&.open]:bg-black/60 [&.open]:z-[40000] transition-opacity"
136+
class="lg:hidden! in-[.in-game]:hidden hidden pointer-events-none [&.open]:block [&.open]:pointer-events-auto [&.open]:fixed [&.open]:inset-0 [&.open]:bg-black/60 [&.open]:z-[40000] transition-opacity"
137137
role="presentation"
138138
aria-hidden="true"
139139
></div>
140140

141141
<mobile-nav-bar
142142
id="sidebar-menu"
143-
class="peer [.in-game_&]:hidden z-[40001] fixed left-0 top-0 h-full flex flex-col justify-start overflow-visible bg-black/60 backdrop-blur-md transition-transform duration-500 ease-out transform -translate-x-full w-[80%] [&.open]:translate-x-0 lg:hidden"
143+
class="peer in-[.in-game]:hidden z-40001 fixed left-0 top-0 h-full flex flex-col justify-start overflow-visible bg-black/60 backdrop-blur-md transition-transform duration-500 ease-out transform -translate-x-full w-[80%] [&.open]:translate-x-0 lg:hidden"
144144
role="dialog"
145145
data-i18n-aria-label="main.menu"
146146
aria-hidden="true"
147147
></mobile-nav-bar>
148148

149149
<!-- MAIN CONTENT AREA -->
150150
<div
151-
class="[.in-game_&]:hidden flex-1 relative overflow-hidden h-full transition-[margin] duration-500 ease-out will-change-[margin-left] flex flex-col"
151+
class="in-[.in-game]:hidden flex-1 relative overflow-hidden h-full transition-[margin] duration-500 ease-out will-change-[margin-left] flex flex-col"
152152
>
153153
<!-- Desktop Top Bar -->
154154
<desktop-nav-bar></desktop-nav-bar>
155155

156156
<div
157157
id="turnstile-container"
158-
class="fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-[99999]"
158+
class="fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-99999"
159159
></div>
160160

161161
<gutter-ads></gutter-ads>
@@ -179,31 +179,31 @@
179179
inline
180180
class="hidden w-full h-full page-content"
181181
></host-lobby-modal>
182-
<join-private-lobby-modal
183-
id="page-join-private-lobby"
182+
<join-lobby-modal
183+
id="page-join-lobby"
184184
inline
185185
class="hidden w-full h-full page-content"
186-
></join-private-lobby-modal>
186+
></join-lobby-modal>
187187
<territory-patterns-modal
188188
id="page-item-store"
189189
inline
190190
class="hidden w-full h-full page-content"
191191
></territory-patterns-modal>
192-
<matchmaking-modal
193-
id="page-matchmaking"
194-
inline
195-
class="hidden w-full h-full page-content"
196-
></matchmaking-modal>
197192
<user-setting
198193
id="page-settings"
199194
inline
200195
class="hidden w-full h-full page-content"
201196
></user-setting>
202-
<stats-modal
203-
id="page-stats"
197+
<leaderboard-modal
198+
id="page-leaderboard"
204199
inline
205200
class="hidden w-full h-full page-content"
206-
></stats-modal>
201+
></leaderboard-modal>
202+
<troubleshooting-modal
203+
id="page-troubleshooting"
204+
inline
205+
class="hidden w-full h-full page-content"
206+
></troubleshooting-modal>
207207
<account-modal
208208
id="page-account"
209209
inline
@@ -239,17 +239,17 @@
239239
<div id="app"></div>
240240

241241
<div
242-
class="left-0 bottom-0 sm:left-4 sm:bottom-4 w-full flex-col-reverse sm:flex-row z-50 md:w-[320px] fixed pointer-events-none"
242+
class="fixed left-0 bottom-0 min-[1200px]:left-4 min-[1200px]:bottom-4 w-full flex flex-col sm:flex-row sm:items-end z-50 pointer-events-none"
243243
>
244+
<div class="order-2 sm:order-none w-full sm:w-1/2 min-[1200px]:w-auto">
245+
<control-panel></control-panel>
246+
</div>
244247
<div
245-
class="w-full md:w-2/3 md:fixed sm:right-0 md:bottom-0 md:flex flex-col items-end pointer-events-none"
248+
class="order-1 sm:order-none w-full sm:w-1/2 min-[1200px]:w-auto min-[1200px]:fixed min-[1200px]:right-0 min-[1200px]:bottom-0 flex flex-col sm:items-end pointer-events-none"
246249
>
247250
<chat-display></chat-display>
248251
<events-display></events-display>
249252
</div>
250-
<div>
251-
<control-panel></control-panel>
252-
</div>
253253
</div>
254254

255255
<!-- Game modals and overlays -->
@@ -267,6 +267,8 @@
267267
<player-panel></player-panel>
268268
<spawn-timer></spawn-timer>
269269
<immunity-timer></immunity-timer>
270+
<in-game-header-ad></in-game-header-ad>
271+
<spawn-video-ad></spawn-video-ad>
270272
<game-info-modal></game-info-modal>
271273
<alert-frame></alert-frame>
272274
<chat-modal></chat-modal>
@@ -362,5 +364,12 @@
362364
data-cf-beacon='{"token": "03d93e6fefb349c28ee69b408fa25a13"}'
363365
></script>
364366
<script type="module" src="/src/client/Main.ts"></script>
367+
<footer>
368+
<script
369+
data-cfasync="false"
370+
async
371+
src="//cdn.intergient.com/1025558/75940/ramp.js"
372+
></script>
373+
</footer>
365374
</body>
366375
</html>

‎map-generator/assets/maps/britannia/info.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@
9898
},
9999
{
100100
"coordinates": [404, 1146],
101-
"name": "Fermanagh",
102-
"flag": "gb-nir"
101+
"name": "Fermanagh"
103102
}
104103
]
105104
}

‎map-generator/assets/maps/italia/info.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"nations": [
44
{
55
"coordinates": [1038, 993],
6-
"name": "Kingdom of the Two Sicilies",
7-
"flag": "custom:Kingdom of the Two Sicilies"
6+
"name": "Kingdom of the Two Sicilies"
87
},
98
{
109
"coordinates": [370, 1137],
@@ -18,8 +17,7 @@
1817
},
1918
{
2019
"coordinates": [625, 534],
21-
"name": "Tuscany",
22-
"flag": "custom:Tuscany"
20+
"name": "Tuscany"
2321
},
2422
{
2523
"coordinates": [595, 190],
@@ -28,13 +26,11 @@
2826
},
2927
{
3028
"coordinates": [469, 386],
31-
"name": "Modena",
32-
"flag": "custom:Modena"
29+
"name": "Modena"
3330
},
3431
{
3532
"coordinates": [391, 254],
36-
"name": "Parma",
37-
"flag": "custom:Parma"
33+
"name": "Parma"
3834
},
3935
{
4036
"coordinates": [361, 68],
@@ -43,8 +39,7 @@
4339
},
4440
{
4541
"coordinates": [278, 774],
46-
"name": "Kingdom of Sardinia",
47-
"flag": "custom:Kingdom of Sardinia"
42+
"name": "Kingdom of Sardinia"
4843
},
4944
{
5045
"coordinates": [29, 266],
@@ -58,8 +53,7 @@
5853
},
5954
{
6055
"coordinates": [1238, 349],
61-
"name": "Ottoman Empire",
62-
"flag": "custom:Ottoman Empire2"
56+
"name": "Ottoman Empire"
6357
}
6458
]
6559
}

‎map-generator/assets/maps/montreal/info.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"nations": [
44
{
55
"coordinates": [800, 430],
6-
"flag": "quebec",
6+
"flag": "Quebec",
77
"name": "Laval"
88
},
99
{
1010
"coordinates": [1110, 930],
11-
"flag": "quebec",
11+
"flag": "Quebec",
1212
"name": "Royal Mount park"
1313
},
1414
{
1515
"coordinates": [1220, 1360],
16-
"flag": "quebec",
16+
"flag": "Quebec",
1717
"name": "Hochelaga Archipelago"
1818
},
1919
{
@@ -23,42 +23,42 @@
2323
},
2424
{
2525
"coordinates": [1400, 1000],
26-
"flag": "quebec",
26+
"flag": "Quebec",
2727
"name": "Saint-Lambert"
2828
},
2929
{
3030
"coordinates": [500, 130],
31-
"flag": "quebec",
31+
"flag": "Quebec",
3232
"name": "Blainville"
3333
},
3434
{
3535
"coordinates": [350, 650],
36-
"flag": "quebec",
36+
"flag": "Quebec",
3737
"name": "Saint-Eustache"
3838
},
3939
{
4040
"coordinates": [200, 1350],
41-
"flag": "quebec",
41+
"flag": "Quebec",
4242
"name": "Perrot Island"
4343
},
4444
{
4545
"coordinates": [25, 950],
46-
"flag": "quebec",
46+
"flag": "Quebec",
4747
"name": "Kanesatake Lands"
4848
},
4949
{
5050
"coordinates": [50, 450],
51-
"flag": "quebec",
51+
"flag": "Quebec",
5252
"name": "Mirabel"
5353
},
5454
{
5555
"coordinates": [650, 1450],
56-
"flag": "quebec",
56+
"flag": "Quebec",
5757
"name": "Chateauguay"
5858
},
5959
{
6060
"coordinates": [1330, 300],
61-
"flag": "quebec",
61+
"flag": "Quebec",
6262
"name": "Pointe-aux-Trembles"
6363
}
6464
]

‎map-generator/assets/maps/straitofgibraltar/info.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"nations": [
44
{
55
"coordinates": [1941, 1031],
6-
"name": "Rif",
7-
"flag": "Rif"
6+
"name": "Rif"
87
},
98
{
109
"coordinates": [2733, 1190],
@@ -28,13 +27,11 @@
2827
},
2928
{
3029
"coordinates": [1271, 1393],
31-
"name": "Shilha",
32-
"flag": "Shilha"
30+
"name": "Shilha"
3331
},
3432
{
3533
"coordinates": [1555, 258],
36-
"name": "Andalusia",
37-
"flag": "Andalusia"
34+
"name": "Andalusia"
3835
}
3936
]
4037
}

‎map-generator/assets/maps/thebox/image.png‎

7.34 KB
Loading

‎map-generator/assets/maps/thebox/info.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "TheBox",
3+
"nations": [
4+
{ "coordinates": [10, 10], "flag": "", "name": "King of the Corner" },
5+
{ "coordinates": [1024, 300], "flag": "", "name": "Suspicious Ally" },
6+
{ "coordinates": [1650, 400], "flag": "", "name": "Evan The Dev" },
7+
{ "coordinates": [1024, 1024], "flag": "", "name": "Middle Defender" },
8+
{ "coordinates": [350, 1024], "flag": "", "name": "Punch Merchant" },
9+
{ "coordinates": [1700, 1024], "flag": "", "name": "Nuke Thrower" },
10+
{ "coordinates": [400, 1650], "flag": "", "name": "Fullsender" },
11+
{ "coordinates": [1024, 1750], "flag": "", "name": "Factory Builder" },
12+
{ "coordinates": [1650, 1650], "flag": "", "name": "Front Manager" },
13+
{ "coordinates": [700, 700], "flag": "", "name": "Box Fighter" },
14+
{ "coordinates": [1350, 700], "flag": "", "name": "Cage Liberator" },
15+
{ "coordinates": [700, 1350], "flag": "", "name": "Train Trader" },
16+
{ "coordinates": [1350, 1350], "flag": "", "name": "Non-peaceful Bot" }
17+
]
18+
}

‎map-generator/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ var maps = []struct {
6363
{Name: "world"},
6464
{Name: "lemnos"},
6565
{Name: "twolakes"},
66+
{Name: "thebox"},
6667
{Name: "didier"},
6768
{Name: "didierfrance"},
6869
{Name: "amazonriver"},

‎nginx.conf‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,25 +102,6 @@ server {
102102
add_header Cache-Control "public, max-age=86400"; # 24 hours
103103
}
104104

105-
# /api/public_lobbies endpoint - Cache for 1 second to handle high request volume
106-
location = /api/public_lobbies {
107-
proxy_pass http://127.0.0.1:3000;
108-
proxy_http_version 1.1;
109-
110-
# Cache configuration
111-
proxy_cache API_CACHE;
112-
proxy_cache_valid 200 1s;
113-
proxy_cache_use_stale updating error timeout http_500 http_502 http_503 http_504;
114-
proxy_cache_lock on;
115-
add_header X-Cache-Status $upstream_cache_status;
116-
117-
# Standard proxy headers
118-
proxy_set_header Host $host;
119-
proxy_set_header X-Real-IP $remote_addr;
120-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
121-
proxy_set_header X-Forwarded-Proto $scheme;
122-
}
123-
124105
# /api/env endpoint - Cache for 1 hour
125106
location = /api/env {
126107
proxy_pass http://127.0.0.1:3000;

0 commit comments

Comments
 (0)