Skip to content

Commit 4c9d745

Browse files
BentroenBentroen
committed
3.10.0-rgb.1
1 parent 9e145cc commit 4c9d745

File tree

13 files changed

+146
-41
lines changed

13 files changed

+146
-41
lines changed

‎datafiles/Data/changelog.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
Changes in v3.10.0-rgb.1 (2022.04.01):
2+
* Made ~ C O L O R F U L ~ note blocks, buttons, dropdowns, scrollbars,
3+
dragbars, radio buttons, instruments, layers, checkboxes, popups, text
4+
fields, piano keys, windows, backgrounds and the workspace
5+
* Removed boring gray looks from the interface
6+
* Removed all themes, now everything is ~ C O L O R F U L ~
7+
* Removed blackout mode. Why would you want to use that?!?!
8+
* You'll never be bored while composing anymore!
9+
110
Changes in v3.10.0-beta.1 (2022.03.29):
211
* The MP3 export back-end has been reworked from scratch:
312
* Added stereo support! Panning on notes and layers will now be rendered

‎scripts/control_create/control_create.gml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ function control_create() {
9090
update_success = 0
9191
show_welcome = 1
9292
scroll_wheel = 0
93+
temptheme = 0
9394
theme = 3 // Using Fluent as the default theme
9495
fdark = 0 // Fluent dark mode
9596
blackout = 0
97+
blackout_timer = 0
9698
editmode = 0
9799
clickinarea = 0
98100
dontplace = 0
@@ -127,7 +129,7 @@ function control_create() {
127129
nocdrag = 0
128130
resetcolor = 0
129131
rainbow = 0
130-
rainbowtoggle = 0
132+
rainbowtoggle = 1
131133
pingtime = current_time
132134
debug_overlay = 0
133135
debug_option = 0

‎scripts/control_draw/control_draw.gml‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ function control_draw() {
128128
if (theme = 1) window_background = 13160660
129129
if (theme = 2) window_background = c_dark
130130
// if (theme = 3) window_background = c_white
131-
if (theme = 3) window_background = 15987699
132-
if (theme = 3 && fdark) window_background = 2105376
131+
if (theme = 3) window_background = accent[7]
132+
if (theme = 3 && fdark) window_background = accent[8]
133133
draw_clear(window_background)
134134
if (theme = 3 && acrylic && wpaperexist) draw_sprite_tiled_ext(wpaperblur, 0,
135135
0 - window_get_x() * (1 / window_scale) - (sprite_get_width(wpaper) * (display_height / sprite_get_height(wpaper)) - display_width) * (1 / window_scale) * (wpaperside) / 2,
@@ -140,12 +140,20 @@ function control_draw() {
140140
draw_set_color(15790320)
141141
if (theme = 1) draw_set_color(13160660)
142142
if (theme = 2) draw_set_color(c_dark)
143+
if (theme = 3) draw_set_color(accent[7])
144+
if (theme = 3 && acrylic && wpaperexist) draw_set_color(accent[7])
145+
if (theme = 3 && fdark) draw_set_color(accent[8])
146+
if (theme = 3 && fdark && acrylic && wpaperexist) draw_set_color(accent[8])
147+
if (theme = 3 && acrylic && wpaperexist) draw_set_alpha(0.875)
148+
draw_rectangle(0, 0, rw, rh, 0)
149+
143150
if (theme = 3) draw_set_color(15987699)
144151
if (theme = 3 && acrylic && wpaperexist) draw_set_color(15198183)
145152
if (theme = 3 && fdark) draw_set_color(2105376)
146153
if (theme = 3 && fdark && acrylic && wpaperexist) draw_set_color(1315860)
147-
if (theme = 3 && acrylic && wpaperexist) draw_set_alpha(0.875)
154+
draw_set_alpha(0.6)
148155
draw_rectangle(0, 0, rw, rh, 0)
156+
149157
draw_set_alpha(1)
150158
}
151159

@@ -336,6 +344,11 @@ function control_draw() {
336344
draw_set_color(16382457)
337345
if (fdark) draw_set_color(2565927)
338346
draw_rectangle(x1 + 2, y1 + 34, x1 + 2 + 32 * totalcols, y1 + 34 + 32 * totalrows, false)
347+
draw_set_alpha(0.4)
348+
draw_set_color(accent[7])
349+
if (fdark) draw_set_color(accent[8])
350+
draw_rectangle(x1 + 2, y1 + 34, x1 + 2 + 32 * totalcols, y1 + 34 + 32 * totalrows, false)
351+
draw_set_alpha(1)
339352
}
340353
}
341354
note_offset = floor(((marker_pos - floor(marker_pos + 0.5 * !isplayer)) * 32) + 0.5) * ((playing && marker_follow && marker_pagebypage = 2 && (marker_pos - floor(totalcols / 2 + 0.5) < enda + 1 && marker_pos - floor(totalcols / 2 + 0.5) > 0)) || isplayer)
@@ -751,7 +764,7 @@ function control_draw() {
751764
}
752765
// Instrument shortcuts
753766
if (keyboard_check_pressed(vk_f5) && keyboard_check(vk_control) && keyboard_check(vk_shift) && theme = 3) {
754-
rainbowtoggle = !rainbowtoggle
767+
rainbowtoggle = 1
755768
if (language != 1) {
756769
if (rainbowtoggle) {
757770
set_msg("Rainbow mode => ON")
@@ -1135,17 +1148,30 @@ function control_draw() {
11351148
draw_set_color(15790320)
11361149
if (theme = 1) draw_set_color(13160660)
11371150
if (theme = 2) draw_set_color(c_dark)
1151+
if (theme = 3) draw_set_color(accent[7])
1152+
if (theme = 3 && acrylic && wpaperexist) draw_set_color(accent[7])
1153+
if (theme = 3 && fdark) draw_set_color(accent[8])
1154+
if (theme = 3 && fdark && acrylic && wpaperexist) draw_set_color(accent[8])
1155+
if (theme = 3 && acrylic && wpaperexist) draw_set_alpha(0.4)
1156+
else draw_set_alpha(0.3)
1157+
draw_rectangle(0, y1 + 1, x1, rh, 0)
1158+
draw_rectangle(0, 0, rw, y1, 0)
1159+
draw_rectangle(x1 + 1, y1 + totalrows * 32 + 52, rw, rh, 0)
1160+
draw_rectangle(x1 + totalcols * 32 + 20, y1 + 1, rw, y1 + totalrows * 32 + 51, 0)
1161+
draw_rectangle(x1 + totalcols * 32 + 2, y1 + totalrows * 32 + 32, x1 + totalcols * 32 + 2 + 17, y1 + totalrows * 32 + 32 + 18, 0)
1162+
draw_area(x1, y1, x1 + totalcols * 32 + 20, y1 + totalrows * 32 + 52)
1163+
11381164
if (theme = 3) draw_set_color(15987699)
11391165
if (theme = 3 && acrylic && wpaperexist) draw_set_color(c_white)
11401166
if (theme = 3 && fdark) draw_set_color(2105376)
11411167
if (theme = 3 && fdark && acrylic && wpaperexist) draw_set_color(1315860)
1142-
if (theme = 3 && acrylic && wpaperexist) draw_set_alpha(0.875)
1168+
draw_set_alpha(0.6)
11431169
draw_rectangle(0, y1 + 1, x1, rh, 0)
11441170
draw_rectangle(0, 0, rw, y1, 0)
11451171
draw_rectangle(x1 + 1, y1 + totalrows * 32 + 52, rw, rh, 0)
11461172
draw_rectangle(x1 + totalcols * 32 + 20, y1 + 1, rw, y1 + totalrows * 32 + 51, 0)
11471173
draw_rectangle(x1 + totalcols * 32 + 2, y1 + totalrows * 32 + 32, x1 + totalcols * 32 + 2 + 17, y1 + totalrows * 32 + 32 + 18, 0)
1148-
draw_area(x1, y1, x1 + totalcols * 32 + 20, y1 + totalrows * 32 + 52)
1174+
11491175
draw_set_alpha(1)
11501176
}
11511177
draw_theme_color()
@@ -1438,7 +1464,8 @@ function control_draw() {
14381464
} //from the if (!isplayer) up there
14391465

14401466
if (dropmode && theme = 3) {
1441-
draw_set_color(0)
1467+
var col = fdark ? accent[8] : accent[7]
1468+
draw_set_color(col)
14421469
draw_set_alpha(0.2 * dropalpha)
14431470
draw_roundrect_ext(0, 0, 530, 90, 20, 20, 0)
14441471
draw_set_alpha(dropalpha)

‎scripts/draw_block/draw_block.gml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ function draw_block(argument0, argument1, argument2, argument3, argument4, argum
3838
}
3939
}
4040
draw_sprite_ext(sprite, frame, xx, yy, 1, 1, 0, -1, alpha)
41+
draw_set_color(accent[0])
42+
draw_set_alpha(0.2)
43+
draw_rectangle(xx, yy, xx + 31, yy + 31, false)
44+
4145
draw_set_alpha(1)
4246
if (use_icons) {
4347
if (iscustom) {

‎scripts/draw_piano/draw_piano.gml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@ function draw_piano(argument0, argument1, argument2, argument3) {
99
b = 0
1010
d = -1
1111
selectedkey = -1
12+
1213
alpha = max(0, 3 - startkey) * !isplayer + 3 * isplayer
1314
midi_devices = midi_input_devices()
1415
for (a = 0; a < midi_devices; a += 1) {
1516
midi_keys[a] = midi_input_key_presses(a)
1617
midi_releases[a] = midi_input_key_releases(a)
1718
}
1819
for (a = 0; a < k; a += 1) {
20+
21+
var colorful = make_color_hsv((255 - (a * 10) + rainbow * 360/255) % 255, 128, 255)
22+
1923
c = (startkey + a) mod 7
2024
if (a > 0 && c != 2 && c != 5) { // Sharp key to the left
2125
c1 = startkey + sharpkeys + b
@@ -59,9 +63,10 @@ function draw_piano(argument0, argument1, argument2, argument3) {
5963
showclicks2 = !out && show_keynumbers
6064
col = c_white
6165
down[1] = 0
62-
if (!isplayer) {
63-
if (show_outofrange && out) col = 8224255
64-
if (selected_key = c2 && playing = 0) {if (theme != 3) col = 16753828 else col = accent[7]}
66+
if (true) {
67+
//if (show_outofrange && out) col = 8224255
68+
if (selected_key = c2 && playing = 0) {if (theme != 3) col = 16753828 else col = accent[5]}
69+
if (!(selected_key = c2)) col = colorful
6570
}
6671
if (current_time - key_played[c2] < 300) {col = merge_color(col, c_yellow, 1 - (current_time - key_played[c2]) / 300) down[1] = ((current_time - key_played[c2]) / 300) * 2 if (down[1] > 1) down[1] = 2 - down[1] down[1] = floor(down[1] * 3) / 3}
6772
if (key_midipress[c2] || key_press[c2] || key_click[c2]) down[1] = 0.75
@@ -72,9 +77,10 @@ function draw_piano(argument0, argument1, argument2, argument3) {
7277
out = (c1 < 33 || c1 > 57)
7378
showclicks1 = !out && show_keynumbers
7479
col = c_white
75-
if (!isplayer) {
76-
if (show_outofrange && out) col = 8224255
77-
if (selected_key = c1 && playing = 0) {if (theme != 3) col = 16753828 else col = accent[7]}
80+
if (true) {
81+
//if (show_outofrange && out) col = 8224255
82+
if (selected_key = c1 && playing = 0) {if (theme != 3) col = 16753828 else col = accent[5]}
83+
if (!(selected_key = c1)) col = colorful
7884
}
7985
if (current_time - key_played[c1] < 300) {col = merge_color(col, c_yellow, 1 - (current_time - key_played[c1]) / 300) down[0] = ((current_time - key_played[c1]) / 300) * 2 if (down[0] > 1) down[0] = 2 - down[0] down[0] = floor(down[0] * 3) / 3}
8086
if (key_midipress[c1] || key_press[c1] || key_click[c1]) down[0] = 0.75
@@ -106,9 +112,10 @@ function draw_piano(argument0, argument1, argument2, argument3) {
106112
showclicks1 = !out && show_keynumbers
107113
col = c_white
108114
down = 0
109-
if (!isplayer) {
110-
if (show_outofrange && out) col = 8224255
111-
if (selected_key = c1 && playing = 0) {if (theme != 3) col = 16753828 else col = accent[7]}
115+
if (true) {
116+
//if (show_outofrange && out) col = 8224255
117+
if (selected_key = c1 && playing = 0) {if (theme != 3) col = 16753828 else col = accent[5]}
118+
if (!(selected_key = c1)) col = colorful
112119
}
113120
if (current_time - key_played[c1] < 300) {col = merge_color(col, c_yellow, 1 - (current_time - key_played[c1]) / 300) down = ((current_time - key_played[c1]) / 300) * 2 if (down > 1) down = 2 - down down = floor(down * 3) / 3}
114121
if (key_midipress[c1] || key_press[c1] || key_click[c1]) down = 0.75

‎scripts/draw_scrollbar/draw_scrollbar.gml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ function draw_scrollbar(argument0, argument1, argument2, argument3, argument4, a
4141
bpos = floor(bpos)
4242

4343
// Background
44-
draw_sprite_ext(spr_scrollbar_h_background, theme + (fdark && theme = 3), xx, yy, mwh + 32, 1, 0, -1, draw_get_alpha())
44+
var col = fdark ? accent[8] : accent[7]
45+
draw_sprite_ext(spr_scrollbar_h_background, theme + (fdark && theme = 3), xx, yy, mwh + 32, 1, 0, col, draw_get_alpha())
4546

4647
// Bar
4748
if (!locked) {
@@ -57,13 +58,13 @@ function draw_scrollbar(argument0, argument1, argument2, argument3, argument4, a
5758
}
5859
if (sb_drag = i) ind = 2
5960

60-
draw_sprite_ext(spr_scrollbar_h_bar_fill,(theme * 3) + ind + (fdark && theme = 3) * 3, xx + 20 + bpos, yy, floor(bwh) - 4 - 4 * (theme = 3), 1, 0, -1, draw_get_alpha())
61+
draw_sprite_ext(spr_scrollbar_h_bar_fill,(theme * 3) + ind + (fdark && theme = 3) * 3, xx + 20 + bpos, yy, floor(bwh) - 4 - 4 * (theme = 3), 1, 0, col, draw_get_alpha())
6162
if (theme != 3) {
6263
draw_sprite(spr_scrollbar_h_bar_left, (theme * 3) + ind, xx + 17 + bpos, yy)
6364
} else {
64-
draw_sprite(spr_scrollbar_h_bar_left, (theme * 3) + ind + fdark * 3, xx + 17 + bpos - 1, yy)
65+
draw_sprite_ext(spr_scrollbar_h_bar_left, (theme * 3) + ind + fdark * 3, xx + 17 + bpos - 1, yy, 1, 1, 0, col, 1)
6566
}
66-
draw_sprite(spr_scrollbar_h_bar_right, (theme * 3) + ind + (fdark && theme = 3) * 3, xx + 17 + bpos + ceil(bwh - 2) - 4, yy)
67+
draw_sprite_ext(spr_scrollbar_h_bar_right, (theme * 3) + ind + (fdark && theme = 3) * 3, xx + 17 + bpos + ceil(bwh - 2) - 4, yy, 1, 1, 0, col, 1)
6768
if (bwh > 20) draw_sprite(spr_scrollbar_h_bar_handle, (theme * 3) + ind, xx + 17 + floor(bpos + bwh / 2 - 8), yy)
6869

6970
}
@@ -171,7 +172,8 @@ function draw_scrollbar(argument0, argument1, argument2, argument3, argument4, a
171172
sb_val[i] = median(0, sb_val[i], ms - s)
172173
bpos = floor(bpos)
173174
// Background
174-
draw_sprite_ext(spr_scrollbar_v_background, theme + (fdark && theme = 3), xx, yy, 1, mwh + 32, 0, -1, draw_get_alpha())
175+
var col = fdark ? accent[8] : accent[7]
176+
draw_sprite_ext(spr_scrollbar_v_background, theme + (fdark && theme = 3), xx, yy, 1, mwh + 32, 0, col, draw_get_alpha())
175177
// Bar
176178
if (!locked) {
177179
ind = 0
@@ -186,13 +188,13 @@ function draw_scrollbar(argument0, argument1, argument2, argument3, argument4, a
186188
}
187189
if (sb_drag = i) ind = 2
188190

189-
draw_sprite_ext(spr_scrollbar_v_bar_fill,(theme * 3) + ind + (fdark && theme = 3) * 3, xx, yy + 20 + bpos, 1, floor(bwh) - 6, 0, -1, draw_get_alpha())
191+
draw_sprite_ext(spr_scrollbar_v_bar_fill,(theme * 3) + ind + (fdark && theme = 3) * 3, xx, yy + 20 + bpos, 1, floor(bwh) - 6, 0, col, draw_get_alpha())
190192
if (theme != 3) {
191193
draw_sprite(spr_scrollbar_v_bar_up, (theme * 3) + ind, xx, yy + 17 + bpos)
192194
} else {
193-
draw_sprite(spr_scrollbar_v_bar_up, (theme * 3) + ind + fdark * 3, xx, yy + 17 + bpos - 1)
195+
draw_sprite_ext(spr_scrollbar_v_bar_up, (theme * 3) + ind + fdark * 3, xx, yy + 17 + bpos - 1, 1, 1, 0, col, 1)
194196
}
195-
draw_sprite(spr_scrollbar_v_bar_down, (theme * 3) + ind + (fdark && theme = 3) * 3, xx, yy + 17 + bpos + ceil(bwh - 6))
197+
draw_sprite_ext(spr_scrollbar_v_bar_down, (theme * 3) + ind + (fdark && theme = 3) * 3, xx, yy + 17 + bpos + ceil(bwh - 6), 1, 1, 0, col, 1)
196198
if (bwh > 20) draw_sprite(spr_scrollbar_v_bar_handle, (theme * 3) + ind, xx, yy + 17 + bpos + floor(bwh / 2) - 8)
197199

198200
}

‎scripts/draw_window/draw_window.gml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,39 @@ function draw_window() {
99
if (argument_count > 4) {
1010
sml = argument[4]
1111
}
12+
13+
/* Test colors
14+
var xx = x1
15+
var yy = y1 - 100
16+
draw_set_color(accent[0])
17+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
18+
xx += 20
19+
draw_set_color(accent[1])
20+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
21+
xx += 20
22+
draw_set_color(accent[2])
23+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
24+
xx += 20
25+
draw_set_color(accent[3])
26+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
27+
xx += 20
28+
draw_set_color(accent[4])
29+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
30+
xx += 20
31+
draw_set_color(accent[5])
32+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
33+
xx += 20
34+
draw_set_color(accent[6])
35+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
36+
xx += 20
37+
draw_set_color(accent[7])
38+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
39+
xx += 20
40+
draw_set_color(accent[8])
41+
draw_rectangle(xx, yy, xx + 15, yy + 15, false)
42+
xx += 20
43+
*/
44+
1245
draw_set_color(15790320)
1346
if (theme = 1) draw_set_color(13160660)
1447
if (theme = 2) draw_set_color(c_dark)
@@ -25,9 +58,17 @@ function draw_window() {
2558
draw_sprite(spr_shadow, 6 + 8, x2, y1 - 16)
2659
draw_sprite_ext(spr_shadow, 7 + 8, x1, y1 - 16, x2 - x1, 1, 0, -1, draw_get_alpha())
2760
}
61+
62+
if (fdark) draw_set_color(accent[8])
63+
else draw_set_color(accent[7])
64+
draw_roundrect(x1, y1, x2 - 1, y2 - 1, 0)
65+
2866
draw_set_color(15987699)
2967
if (fdark) draw_set_color(2105376)
68+
draw_set_alpha(0.6)
3069
draw_roundrect(x1, y1, x2 - 1, y2 - 1, 0)
70+
draw_set_alpha(1)
71+
3172
//draw_set_color(7368816)
3273
draw_set_color(4144959)
3374
draw_roundrect(x1, y1, x2 - 1, y2 - 1, 1)

‎scripts/draw_window_preferences/draw_window_preferences.gml‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,20 +322,31 @@ function draw_window_preferences() {
322322
if (theme = 3) draw_theme_font(font_main)
323323
draw_area(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 5, x1 + 140, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 5)
324324
if (draw_abutton(x1 + 140 - 17, y1 + 74 + 17 + (theme = 3) * 22 + 5) && wmenu = 0) {
325-
if (language != 1) menu = show_menu_ext("theme", x1 + 40, y1 + 74 + 16 + 21 + (theme = 3) * 22 + 5, check(theme = 0) + "Aqua|" + check(theme = 2) + "Dark|" + check(theme = 1) + "90s|" + check(theme = 3) + "Fluent")
326-
else menu = show_menu_ext("theme", x1 + 40, y1 + 74 + 16 + 21 + (theme = 3) * 22 + 5, check(theme = 0) + "经典|" + check(theme = 2) + "暗黑|" + check(theme = 1) + "复古|" + check(theme = 3) + "Fluent")
325+
if (language != 1) menu = show_menu_ext("theme", x1 + 40, y1 + 74 + 16 + 21 + (theme = 3) * 22 + 5, check(true) + "Rainbow") //|" + check(theme = 2) + "Dark|" + check(theme = 1) + "90s|" + check(theme = 3) + "Fluent")
326+
else menu = show_menu_ext("theme", x1 + 40, y1 + 74 + 16 + 21 + (theme = 3) * 22 + 5, check(true) + "炫彩模式") //+ check(theme = 2) + "暗黑|" + check(theme = 1) + "复古|" + check(theme = 3) + "Fluent")
327327
}
328-
if (language != 1) draw_text_dynamic(x1 + 43, y1 + 74 + 19 + (theme = 3) * 22 + 5, condstr(theme = 0, "Aqua") + condstr(theme = 2, "Dark") + condstr(theme = 1, "90s") + condstr(theme = 3, "Fluent"))
329-
else draw_text_dynamic(x1 + 43, y1 + 74 + 19 + (theme = 3) * 22 + 5, condstr(theme = 0, "经典") + condstr(theme = 2, "暗黑") + condstr(theme = 1, "复古") + condstr(theme = 3, "Fluent"))
328+
if (language != 1) draw_text_dynamic(x1 + 43, y1 + 74 + 19 + (theme = 3) * 22 + 5, condstr(true, "Rainbow"))// + condstr(theme = 2, "Dark") + condstr(theme = 1, "90s") + condstr(theme = 3, "Fluent"))
329+
else draw_text_dynamic(x1 + 43, y1 + 74 + 19 + (theme = 3) * 22 + 5, condstr(true, "炫彩模式"))// + condstr(theme = 2, "暗黑") + condstr(theme = 1, "复古") + condstr(theme = 3, "Fluent"))
330330
//if (draw_radiobox(x1 + 40, y1 + (theme = 3) * 22 + 164 + 16, theme == 0, "Aqua", "Use the aqua theme.")) {theme = 0 change_theme()}
331331
//if (draw_radiobox(x1 + 40, y1 + (theme = 3) * 22 + 164 + 16 + 20, theme == 2, "Dark", "Use the dark theme.")) {theme = 2 change_theme()}
332332
//if (draw_radiobox(x1 + 40, y1 + (theme = 3) * 22 + 164 + 16 + 20 + 20, theme == 1, "90s", "Use the 90s theme.")) {theme = 1 change_theme()}
333333
//if (draw_radiobox(x1 + 40, y1 + (theme = 3) * 22 + 164 + 16 + 20 + 20 + 20, theme == 3, "Fluent", "Use the fluent theme.")) {theme = 3 change_theme()}
334334
if (language != 1) {
335335
if (!isplayer) if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 20 + 25, blackout, "Blackout mode", "Makes the workspace background solid black, so you can\nremove in your video editor when recording the screen.", false, true)) blackout = !blackout
336-
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 25, windowsound, "Navigation sound", "Whether to play sound effects when navigating the interface.\n(Only applies to the Fluent theme.)", (theme != 3), true)) windowsound = !windowsound
337-
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 25, fdark, "Dark mode", "Whether to use darker colors on the interface.\n(Only applies to the Fluent theme.)", (theme != 3), true)) {fdark = !fdark if (fdark) window_set_darkmode() else window_unset_darkmode()}
338-
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 25, acrylic, "Transparency effects", "Whether to show transparency effects on the interface.\n(Only applies to the Fluent theme.)", (theme != 3), true)) {acrylic = !acrylic change_theme()}
336+
337+
if (blackout == 1) {
338+
blackout_timer += 1
339+
}
340+
if (blackout_timer > irandom_range(10, 20)) {
341+
blackout = 0
342+
blackout_timer = 0
343+
play_sound(soundinvoke, 45, 100, 50, 0)
344+
}
345+
346+
347+
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 25, windowsound, "Navigation sound", "Whether to play sound effects when navigating the interface.\n(Only applies to the Rainbow theme.)", (theme != 3), true)) windowsound = !windowsound
348+
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 25, fdark, "Dark mode", "Whether to use darker colors on the interface.\n(Only applies to the Rainbow theme.)", (theme != 3), true)) {fdark = !fdark if (fdark) window_set_darkmode() else window_unset_darkmode()}
349+
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 25, acrylic, "Transparency effects", "Whether to show transparency effects on the interface.\n(Only applies to the Rainbow theme.)", (theme != 3), true)) {acrylic = !acrylic change_theme()}
339350
} else {
340351
if (!isplayer) if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 20 + 25, blackout, "全黑模式", "使背景变为纯黑色，可以用于剪辑时扣掉。", false, true)) blackout = !blackout
341352
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 25, windowsound, "界面音效", "是否在浏览时播放音效。\n（仅限 Fluent 主题）", (theme != 3), true)) windowsound = !windowsound

0 commit comments

Comments
 (0)