Skip to content

Commit 392320b

Browse files
SemphrissSemphris
and
Semphris
authored
Added worldmap road forking, secret areas, and a semi-visible road that reveals itself when the path is unlocked (ci skip) (#1599)
Co-authored-by: Semphris <[email protected]>
1 parent 17108dd commit 392320b

File tree

9 files changed

+506
-58
lines changed

9 files changed

+506
-58
lines changed

data/AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Most images were created either by grumbel or gwater. Check the log for details.
1010
* images/background/ghostforest_grave.png - jkjkke - https://opengameart.org/content/background-6, edited, licensed under CC-BY 3.0
1111
* images/objects/explosion/explosion*.png - Bleed - http://remusprites.carbonmade.com/ licensed under CC-BY 3.0, see https://opengameart.org/content/simple-explosion-bleeds-game-art
1212
* images/engine/editor/sparkle-file.png - Semphris, licensed CC-BY 4.0 - CONTAINS WORK BY FortAwesome/FontAwesome (the file logo), licensed under CC-BY 4.0
13+
* images/worldmap/shared/rocky_paths[-editor].png - Semphris, released under CC0
1314

1415
== Levels ==
1516

data/images/ice_world.strf

+23-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
(source "autotiles_ice_world.satc")
55
)
66

7-
;; ice tiles- next id: 407
7+
;; ice tiles- next id: 423
88
(tilegroup
99
(name (_ "Forest"))
1010
(tiles
@@ -352,6 +352,11 @@
352352
395 396 397 403
353353
398 399 400 404
354354
0 0 0 405
355+
356+
407 408 409 410
357+
411 412 413 414
358+
415 416 417 418
359+
419 420 421 422
355360
)
356361
)
357362
(tiles
@@ -435,6 +440,23 @@
435440
12 12
436441
)
437442
)
443+
(tiles
444+
(width 4)(height 4)
445+
(images "worldmap/shared/rocky_paths.png")
446+
(editor-images "worldmap/shared/rocky_paths-editor.png")
447+
(ids
448+
407 408 409 410
449+
411 412 413 414
450+
415 416 417 418
451+
419 420 421 422
452+
)
453+
(datas
454+
6 30 10 18
455+
23 31 27 3
456+
5 29 9 17
457+
20 12 24 0
458+
)
459+
)
438460

439461
(tilegroup
440462
(name (_ "Water"))
Loading
6.8 KB
Loading

data/levels/world1/fork_in_the_road.stl

+17
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,22 @@
244244
(x 9440)
245245
(y -128)
246246
)
247+
(scripttrigger
248+
(script "state.fitr_up = true;")
249+
(button #f)
250+
(width 32)
251+
(height 448)
252+
(x 15104)
253+
(y 0)
254+
)
255+
(scripttrigger
256+
(script "state.fitr_down = true;")
257+
(button #f)
258+
(width 32)
259+
(height 448)
260+
(x 15104)
261+
(y 544)
262+
)
247263
(sequencetrigger
248264
(sequence "stoptux")
249265
(width 64)
@@ -1534,6 +1550,7 @@ backclouds2.start_moving();")
15341550
(speed-x 0)
15351551
(speed-y -500)
15361552
(acceleration 100)
1553+
(affects-player #t)
15371554
(width 224)
15381555
(height 220)
15391556
(x 32)

data/levels/world1/icy_valley.stl

+8
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,14 @@
701701
(x 96)
702702
(y 0)
703703
)
704+
(scripttrigger
705+
(script "state.iv_secret = true;")
706+
(button #f)
707+
(width 32)
708+
(height 512)
709+
(x 3488)
710+
(y 0)
711+
)
704712
(sequencetrigger
705713
(sequence "stoptux")
706714
(width 64)

data/levels/world1/underground.nut

-18
This file was deleted.

data/levels/world1/worldmap.nut

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
2+
fade_time <- 0.35;
3+
4+
// ============================================================================
5+
// UNDERGROUND
6+
// ============================================================================
7+
8+
if(! ("underground" in state)){
9+
state.underground <- false;
10+
print("[DEBUG] Underground state initialized\n");
11+
}
12+
13+
function go_underground(under){
14+
Underground_cover.fade(under ? 0 : 1, fade_time);
15+
Land_foreground_1.fade(under ? 0 : 1, fade_time);
16+
Land_foreground_2.fade(under ? 0 : 1, fade_time);
17+
Land_foreground_3.fade(under ? 0 : 1, fade_time);
18+
Land_foreground_4.fade(under ? 0 : 1, fade_time);
19+
Underground_mask.fade(under ? 1 : 0, fade_time);
20+
Underground_darkness.fade(under ? 1 : 0, fade_time);
21+
state.underground <- under;
22+
}
23+
24+
go_underground(state.underground);
25+
26+
27+
28+
// ============================================================================
29+
// ROAD FORKS
30+
// ============================================================================
31+
32+
if(! ("fitr_down" in state)){
33+
state.fitr_down <- false;
34+
print("[DEBUG] 'Fork in the Road' road fork (down) initialized\n");
35+
}
36+
37+
if(! ("fitr_up" in state)){
38+
state.fitr_up <- false;
39+
print("[DEBUG] 'Fork in the Road' road fork (up) initialized\n");
40+
}
41+
42+
fitr_down.set_solid(state.fitr_down);
43+
fitr_up.set_solid(state.fitr_up);
44+
45+
46+
47+
// ============================================================================
48+
// SECRET AREAS
49+
// ============================================================================
50+
51+
if(! ("iv_secret" in state)){
52+
state.iv_secret <- false;
53+
print("[DEBUG] 'Icy Valley' secret road initialized\n");
54+
}
55+
56+
function toggle_secret_road(tilemap, enabled){
57+
tilemap.fade(enabled ? 1 : 0, fade_time);
58+
tilemap.set_solid(enabled);
59+
}
60+
61+
toggle_secret_road(iv_secret, state.iv_secret);

0 commit comments

Comments
 (0)