Skip to content

Commit 4bb9403

Browse files
committed
fixed tween issue
1 parent 2c09ef4 commit 4bb9403

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

enums.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const APP_VER:String = "0.1.0"
44
const APP_BLD:String = "2040510"
55
const TWEEN_TIME:float = 0.25
66
const EXPLODE_DELAY:int = 1
7-
var current_debug_level = DEBUG_LEVEL.DEBUG # Global variable to set the current debug level
7+
var current_debug_level = DEBUG_LEVEL.INFO # Global variable to set the current debug level
88

99
# =========================================================
1010

game.tscn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ scale = Vector2(0.6, 0.6)
3333
texture = ExtResource("1_h8otn")
3434

3535
[node name="BkgdTextRect" type="Panel" parent="."]
36-
visible = false
3736
offset_right = 1154.0
3837
offset_bottom = 652.0
3938
theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")

game_board/GameBoard.gd

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,12 @@ func _on_cell_click(gem_cell:GemCell):
193193
# DEBUG
194194
if selected_cell_1:
195195
Enums.debug_print("[_on_cell_click] selected_cell_1: " + JSON.stringify(find_gem_indices(selected_cell_1)), Enums.DEBUG_LEVEL.INFO)
196-
selected_cell_1.debug_show_selnum(1)
196+
if Enums.current_debug_level == Enums.DEBUG_LEVEL.DEBUG:
197+
selected_cell_1.debug_show_selnum(1)
197198
if selected_cell_2:
198199
Enums.debug_print("[_on_cell_click] selected_cell_2: " + JSON.stringify(find_gem_indices(selected_cell_2)), Enums.DEBUG_LEVEL.INFO)
199-
selected_cell_2.debug_show_selnum(2)
200+
if Enums.current_debug_level == Enums.DEBUG_LEVEL.DEBUG:
201+
selected_cell_2.debug_show_selnum(2)
200202

201203
# STEP 2: effect
202204
if selected_cell_1:
@@ -229,18 +231,18 @@ func swap_gem_cells(swap_cell_1:GemCell, swap_cell_2:GemCell):
229231
#debug_print_ascii_table([swap_cell_1,swap_cell_2])
230232

231233
# D: get position to restore to after move so tween sets/flows smoothly
232-
var orig_pos_cell_1 = swap_cell_1.sprite.position
233-
var orig_pos_cell_2 = swap_cell_2.sprite.position
234+
var orig_pos_cell_1 = swap_cell_1.sprite.global_position
235+
var orig_pos_cell_2 = swap_cell_2.sprite.global_position
234236

235237
# E: re-position and tween
236238
call_deferred("setup_tween", swap_cell_2, orig_pos_cell_1, orig_pos_cell_2)
237239
call_deferred("setup_tween", swap_cell_1, orig_pos_cell_2, orig_pos_cell_1)
238240

239241
func setup_tween(gem_cell:GemCell, start_pos:Vector2, end_pos:Vector2):
240-
gem_cell.sprite.position = start_pos # NOTE: Set initial position right before tweening
242+
gem_cell.sprite.global_position = start_pos # NOTE: Set initial position right before tweening
241243
tweens_running += 1
242244
var tween = get_tree().create_tween()
243-
tween.tween_property(gem_cell.sprite, "position", end_pos, Enums.TWEEN_TIME)
245+
tween.tween_property(gem_cell.sprite, "global_position", end_pos, Enums.TWEEN_TIME)
244246
tween.tween_callback(tween_completed)
245247

246248
# STEP 3: Tween complete: clear vars/scan board

0 commit comments

Comments
 (0)