Skip to content

Commit

Permalink
Fix wrong compatibility indicator.
Browse files Browse the repository at this point in the history
  • Loading branch information
HielkeMaps committed Mar 20, 2019
1 parent 71224df commit d060f08
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions scripts/control_draw/control_draw.gml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ if (delay < 0) delay = 0
work_mins += 1 / (room_speed * 60)

if (selected = 0) {
if(tempo = 10 || tempo = 5 ||tempo = 2.5 && (block_outside = 0 && block_custom = 0))compatible = 1
else if (tempo = 20 || tempo = 6.66 || tempo = 4|| tempo = 3.33 || tempo = 2.86 && (block_outside = 0 && block_custom = 0))compatible = 2
if((tempo = 10 || tempo = 5 ||tempo = 2.5) && (block_outside = 0 && block_custom = 0))compatible = 1
else if ((tempo = 20 || tempo = 6.66 || tempo = 4|| tempo = 3.33 || tempo = 2.86) && (block_outside = 0 && block_custom = 0))compatible = 2
else compatible = 0
}

Expand Down Expand Up @@ -805,18 +805,18 @@ break
// Compatible
draw_set_font(fnt_mainbold)
if(compatible = 0){
draw_sprite(spr_minecraft, 1, rw - 120, 24)
draw_sprite(spr_minecraft, 1, rw - 130, 24)
draw_set_color(c_red)
draw_text(rw - 95, 28, "Not compatible")
draw_text(rw - 105, 28, "Not compatible")
draw_set_color(0)
draw_set_font(fnt_main)
popup_set(rw - compx, 24, compx, 25, "This song is not compatible with Minecraft.\n(Click for more info.)")

}else if (compatible = 2){
compx = 155
draw_sprite(spr_minecraft, 2, rw - 155, 24)
draw_sprite(spr_minecraft, 2, rw - 165, 24)
draw_set_color(c_orange)
draw_text(rw - 130, 28, "Datapack compatible")
draw_text(rw - 140, 28, "Datapack compatible")
draw_set_color(0)
draw_set_font(fnt_main)
popup_set(rw - compx, 24, compx, 25, "This song is compatible with Minecraft Datapacks.\n(Click for more info.)")
Expand Down
4 changes: 2 additions & 2 deletions scripts/draw_window_minecraft/draw_window_minecraft.gml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (tempo = 10 || tempo = 5 || tempo = 2.5) {
} else if(tempo = 20 || tempo = 6.66 || tempo = 4 || tempo = 3.33 || tempo = 2.86){
draw_set_color(c_orange)
draw_text(x1 + 40, yy + 45, "The tempo is datapack compatible")
if (draw_button2(x1 + 40, yy + 65, 120, "Fix tempo for schematic")) {
if (draw_button2(x1 + 40, yy + 65, 145, "Fix tempo for schematic")) {
var otempo;
otempo = tempo
if (otempo > 10) tempo = 10
Expand All @@ -43,7 +43,7 @@ if (tempo = 10 || tempo = 5 || tempo = 2.5) {
}else{
draw_set_color(c_red)
draw_text(x1 + 40, yy + 45, "The tempo is " + string(tempo) + " ticks per second.")
if (draw_button2(x1 + 40, yy + 65, 120, "Fix tempo for datapack")) {
if (draw_button2(x1 + 40, yy + 65, 140, "Fix tempo for datapack")) {
var otempo;
otempo = tempo
if (otempo > 20) tempo = 20
Expand Down

0 comments on commit d060f08

Please sign in to comment.