diff --git a/autoload/global.gd b/autoload/global.gd index e462b65..5de63e1 100644 --- a/autoload/global.gd +++ b/autoload/global.gd @@ -13,7 +13,7 @@ var animationTick = 0 var filtering = false #Object Selection -var heldSprite = null +var heldSprite: SpriteObject = null var lastArray = [] var i = 0 @@ -48,8 +48,6 @@ var micResetTime = 180 var updatePusherNode = null -var rand = RandomNumberGenerator.new() - func _ready(): spectrum = AudioServer.get_bus_effect_instance(1, 1) @@ -277,10 +275,10 @@ func blinking(): blinkTick += 1 if blinkTick == 0: blink = false - if rand.randf_range(-1.0,1.0) > 0.5: + if randf_range(-1.0,1.0) > 0.5: blinkTick = (420 * blinkSpeed) + 1 if blinkTick > 420 * blinkSpeed: - if rand.randi() % int(blinkChance) == 0: + if randi() % int(blinkChance) == 0: blink = true blinkTick = -12 diff --git a/global-input-reading/.gdignore b/global-input-reading/.gdignore new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/global-input-reading/.gdignore @@ -0,0 +1 @@ + diff --git a/main_scenes/main.gd b/main_scenes/main.gd index f57eefd..519a763 100644 --- a/main_scenes/main.gd +++ b/main_scenes/main.gd @@ -271,9 +271,7 @@ func swapMode(): #Adds sprite object to scene func add_image(path): - - var rand = RandomNumberGenerator.new() - var id = rand.randi() + var id = randi() var sprite = spriteObject.instantiate() sprite.path = path @@ -461,8 +459,7 @@ func _on_replace_dialog_visibility_changed(): func _on_duplicate_button_pressed(): if Global.heldSprite == null: return - var rand = RandomNumberGenerator.new() - var id = rand.randi() + var id = randi() var sprite = spriteObject.instantiate() sprite.path = Global.heldSprite.path diff --git a/ui_scenes/selectedSprite/spriteObject.gd b/ui_scenes/selectedSprite/spriteObject.gd index 9fdebb9..cfc3391 100644 --- a/ui_scenes/selectedSprite/spriteObject.gd +++ b/ui_scenes/selectedSprite/spriteObject.gd @@ -1,4 +1,5 @@ extends Node2D +class_name SpriteObject var type = "sprite" diff --git a/ui_scenes/settings/settings_menu.gd b/ui_scenes/settings/settings_menu.gd index b237072..11d84a3 100644 --- a/ui_scenes/settings/settings_menu.gd +++ b/ui_scenes/settings/settings_menu.gd @@ -126,7 +126,7 @@ func _on_bounce_gravity_value_changed(value): Global.pushUpdate("Bounce gravity value changed.") -func costumeButtonsPressed(label,id): +func costumeButtonsPressed(label: Label, id): label.text = "AWAITING INPUT" await Global.main.emptiedCapture awaitingCostumeInput = id - 1