itdominator/Billiards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(game): refactor ball state and turn handling

Browse Source 
* Replace `valid_end` with `is_foul` for invalid ball sinks
* Rename and centralize ball state tracking
* Add ball finalization and win-condition hooks
* Update turn switching to retain the player after valid sinks
* Apply negative points to reaped balls
* Add active-player indicator to the camera UI
* Emit active-player updates when the turn changes
This commit is contained in:
itdominator
2026-08-12 22:14:03 -05:00
parent 09369d3dd4
commit c95cc511e6
9 changed files with 166 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
controllers/game/modes/snooker.gd
View File

@@ -18,14 +18,14 @@ var COLORED_BALLS_POINTS: Array[int] = [
func _init() -> void:
pass
func generate_ball_state() -> Dictionary:
func generate_ball_states() -> Dictionary:
var state: Dictionary = {}
for i in COLORED_BALLS.size():
var ball_name = COLORED_BALLS[i]
var points = COLORED_BALLS_POINTS[i]
state[ball_name] = BALL_STATE.duplicate_deep()
state[ball_name] = ball_states.duplicate_deep()
state[ball_name]["points"] = points
# NOTE: Red balls
@@ -34,7 +34,7 @@ func generate_ball_state() -> Dictionary:
state[ball_name] = BALL_STATE.duplicate_deep()
state[ball_name]["points"] = 1
ball_state = state
ball_states = state
return state
func is_colored_ball(ball_name: String) -> bool:
@@ -45,8 +45,7 @@ func reap_ball(ball: Node3D) -> void:
if is_colored_ball(ball.name):
# TODO: Colored ball must not be be destroyed. Handle rule...
ball_state[ball.name]["valid_end"] = false
pass
ball_states[ball.name]["is_foul"] = true
func process_ball(ball: Node3D) -> void:
super(ball)
@@ -56,24 +55,34 @@ func process_ball(ball: Node3D) -> void:
# Handle rule...
var red_ball_sunk = true
if not red_ball_sunk:
pass
pass
ball_states[ball.name]["is_foul"] = true
func handle_switch_user() -> void:
push_warning("Balls reaped: ", balls_reaped.size() )
push_warning("Balls sunk: ", balls_sunk.size() )
var switch_player: bool = true
if not balls_reaped.is_empty():
# TODO: Handle points, etc
for ball_name in balls_reaped:
ball_states[ball_name]["points"] = -ball_states[ball_name]["points"]
balls_reaped.clear()
if balls_sunk.is_empty():
Globals.game_state.switch_active_player()
turn_count += 1
if not balls_sunk.is_empty():
# TODO: Handle points, etc, insure color ball not sunk before red ball
switch_player = false
balls_sunk.clear()
if ball_states_finalized():
process_win_condition()
return
# TODO: Handle points, etc
# Globals.multiplayer_data.current_turn_player_id
if switch_player:
Globals.game_state.switch_active_player()
turn_count += 1
else:
turn_count += 1
balls_sunk.clear()
turn_count += 1
func process_win_condition() -> void:
pass