Commit d5c9bcb

committed

fix: no longer unmutes after switching data types

1 parent 26c84e9 commit d5c9bcbCopy full SHA for d5c9bcb

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,9 @@ func _input(event):`
`108`	`108`	`if event.is_action_pressed("slower"):`
`109`	`109`	`$Timer.wait_time = min($Timer.wait_time * 4, MAX_WAIT)`
`110`	`110`	`if event.is_action_pressed("change_data"):`
`111`		`- AudioServer.set_bus_mute(AudioServer.get_bus_index("Master"), true)`
`112`	`111`	`var display = $Level/Right/Display if $Level.visible else $BigDisplay`
`113`	`112`	`display.get_node("HBoxContainer").hide()`
	`113`	`+ display.get_node("HBoxContainer").sound.set_process(false)`
`114`	`114`	`display.get_node("TypesContainer").show()`
`115`	`115`	`$Timer.stop()`
`116`	`116`	`display.get_node("TypesContainer/Types").get_child(0).grab_focus()`
`@@ -133,7 +133,6 @@ func _on_Current_pressed():`
`133`	`133`	`{"level": LEVELS[_index], "size": _size, "data_type": _data_type})`
`134`	`134`
`135`	`135`	`func _on_Button_pressed(data_type):`
`136`		`- AudioServer.set_bus_mute(AudioServer.get_bus_index("Master"), false)`
`137`	`136`	`var display = $Level/Right/Display if $Level.visible else $BigDisplay`
`138`	`137`	`display.get_node("TypesContainer").hide()`
`139`	`138`	`display.get_node("HBoxContainer").show()`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@ var _rects = []`
`16`	`16`	`var _positions = []`
`17`	`17`	`var _pointer = Polygon2D.new()`
`18`	`18`	`var _pointer_size: int`
`19`		`-var _sound = ArraySound.new()`
	`19`	`+var sound = ArraySound.new()`
`20`	`20`	`onready var _separation = 128 / _level.array.size`
`21`	`21`
`22`	`22`	`func _init(level):`
`23`	`23`	`_level = level`
`24`	`24`	`add_child(_level) # NOTE: This is necessary for it to read input`
`25`	`25`	`add_child(_tween) # NOTE: This is necessary for it to animate`
`26`	`26`	`add_child(_pointer)`
`27`		`- add_child(_sound)`
	`27`	`+ add_child(sound)`
`28`	`28`	`_pointer.hide()`
`29`	`29`
`30`	`30`	`func _ready():`
`@@ -67,7 +67,7 @@ func _ready():`
`67`	`67`	`_pointer.show()`
`68`	`68`
`69`	`69`	`func _process(delta):`
`70`		`- _sound.frac = _level.get_frac()`
	`70`	`+ sound.frac = _level.get_frac()`
`71`	`71`	`if _pointer.visible:`
`72`	`72`	`var pointed = _level.get_pointer()`
`73`	`73`	`var height = rect_size.y - _pointer_size * 2`
`@@ -79,7 +79,7 @@ func _process(delta):`
`79`	`79`
`80`	`80`	`func _on_ComparisonSort_done():`
`81`	`81`	`set_process(false)`
`82`		`- _sound.player.stop()`
	`82`	`+ sound.player.stop()`
`83`	`83`	`_pointer.hide()`
`84`	`84`	`for i in range(_rects.size()):`
`85`	`85`	`_rects[i].color = ComparisonSort.EFFECTS.NONE`

Comments

(0)