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

fix: refine game mode state tracking and turn handling

Browse Source 
* Centralize ball state generation in `BaseMode`
* Track turn count, player, and ball state consistently
* Prevent 8-ball, 9-ball, and colored snooker balls from being marked valid when reaped/sunk
* Update mode initialization and ball-state assignment
* Normalize Free Ball mode node name to `freeball`
This commit is contained in:
itdominator
2026-08-11 23:59:30 -05:00
parent e3bdb21cd2
commit 84b3600044
9 changed files with 96 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/game/modes/8_ball.gd
View File

@@ -1,11 +1,15 @@
class_name Ball8 extends BaseMode
func _init() -> void:
pass
func reap_ball(ball: Node3D) -> void:
super(ball)
if ball.name == "08_ball":
# TODO: 8 ball must not be be destroyed. Handle rule...
ball_state[ball.name]["valid_end"] = false
pass
func process_ball(ball: Node3D) -> void:
@@ -13,6 +17,7 @@ func process_ball(ball: Node3D) -> void:
if ball.name == "08_ball":
# TODO: 8 ball must be sunk last. Handle rule...
ball_state[ball.name]["valid_end"] = false
pass
func handle_switch_user() -> void:
@@ -25,9 +30,11 @@ func handle_switch_user() -> void:
if balls_sunk.is_empty():
Globals.game_state.switch_active_player()
turn_count += 1
return
# TODO: Handle points, etc
# Globals.multiplayer_data.current_turn_player_id
balls_sunk.clear()
turn_count += 1

7
controllers/game/modes/9_ball.gd
View File

@@ -1,11 +1,15 @@
class_name Ball9 extends BaseMode
func _init() -> void:
pass
func reap_ball(ball: Node3D) -> void:
super(ball)
if ball.name == "09_ball":
# TODO: 9 ball must not be be destroyed. Handle rule...
ball_state[ball.name]["valid_end"] = false
pass
func process_ball(ball: Node3D) -> void:
@@ -13,6 +17,7 @@ func process_ball(ball: Node3D) -> void:
if ball.name == "09_ball":
# TODO: 9 ball must be sunk last. Handle rule...
ball_state[ball.name]["valid_end"] = false
pass
func handle_switch_user() -> void:
@@ -25,9 +30,11 @@ func handle_switch_user() -> void:
if balls_sunk.is_empty():
Globals.game_state.switch_active_player()
turn_count += 1
return
# TODO: Handle points, etc
# Globals.multiplayer_data.current_turn_player_id
balls_sunk.clear()
turn_count += 1

51
controllers/game/modes/base_mode.gd
View File

@@ -4,37 +4,43 @@ class_name BaseMode extends Node
# these signals to handle game related rules regarding ball sinks.
var player_1_points: int = 0
var player_2_points: int = 0
var turn_count: int = 1
var player_1_points: int = 0
var player_2_points: int = 0
var ball_state := generate_ball_state()
var balls_sunk := []
var balls_reaped := []
# NOTE: Kinda a super tracker of balls. Not all entries
# generated are used depending on the game type.
var ball_state: Dictionary = {}
var STATE: Dictionary = {
"sunk": false,
"reaped": false,
"player": ""
# NOTE: Used to track handoff logic and is cleared after eah switch accordingly.
var balls_sunk: Array = []
var balls_reaped: Array = []
# NOTE: Kinda a super tracker of the state of a ball.
# Not all entries are used depending on the game type.
var BALL_STATE: Dictionary = {
"turn": 0,
"player": "",
"sunk": false,
"reaped": false,
"valid_end": true,
"points": 0,
}
var COLORED_BALLS: Array = [
"yellow_ball", "green_ball", "brown_ball",
"blue_ball", "pink_ball", "black_ball"
]
func _init() -> void:
pass
func generate_ball_state() -> Dictionary:
var state := {}
for ball_name: String in COLORED_BALLS:
state[ball_name] = STATE.duplicate_deep()
for i: int in range(1, 16):
state["%02d_ball" % i] = STATE.duplicate_deep()
var ball_name = "%02d_ball" % i
state[ball_name] = BALL_STATE.duplicate_deep()
state[ball_name]["points"] = i
return state
func is_colored_ball(ball_name: String) -> bool:
return ball_name in COLORED_BALLS
func which_player() -> String:
return \
@@ -46,14 +52,17 @@ func which_player() -> String:
func reap_ball(ball: Node3D) -> void:
balls_reaped.append(ball.name)
ball_state[ball.name]["reaped"] = not ball_state[ball.name]["reaped"]
ball_state[ball.name]["turn"] = turn_count
ball_state[ball.name]["player"] = which_player()
ball_state[ball.name]["reaped"] = not ball_state[ball.name]["reaped"]
func process_ball(ball: Node3D) -> void:
balls_sunk.append(ball.name)
ball_state[ball.name]["sunk"] = not ball_state[ball.name]["sunk"]
ball_state[ball.name]["turn"] = turn_count
ball_state[ball.name]["player"] = which_player()
ball_state[ball.name]["sunk"] = not ball_state[ball.name]["sunk"]
func handle_switch_user() -> void:
assert(false, "This method needs to be overridden...")

5
controllers/game/modes/free_ball.gd
View File

@@ -1,6 +1,9 @@
class_name FreeBall extends BaseMode
func _init() -> void:
pass
func reap_ball(ball: Node3D) -> void:
super(ball)
@@ -17,9 +20,11 @@ func handle_switch_user() -> void:
if balls_sunk.is_empty():
Globals.game_state.switch_active_player()
turn_count += 1
return
# TODO: Handle points, etc
# Globals.multiplayer_data.current_turn_player_id
balls_sunk.clear()
turn_count += 1

4
controllers/game/modes/game_manager_base.gd
View File

@@ -21,5 +21,5 @@ func _balls_stopped_moving() -> void:
mode.handle_switch_user()
func set_mode(game_mode) -> void:
mode = Globals.game_data.GameMode.get(game_mode).new()
mode.generate_ball_state()
mode = Globals.game_data.GameMode.get(game_mode).new()
mode.ball_state = mode.generate_ball_state()

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

@@ -1,16 +1,51 @@
class_name Snooker extends BaseMode
# NOTE: The game is sometimes played with fewer red balls- commonly 6 or 10.
# Normally, 15 red balls (1 point) and 6 balls of different colors:
# yellow (2 points), green (3), brown (4), blue (5), pink (6), black (7).
var COLORED_BALLS: Array[String] = [
"yellow_ball", "green_ball", "brown_ball",
"blue_ball", "pink_ball", "black_ball"
]
var COLORED_BALLS_POINTS: Array[int] = [
2, 3, 4,
5, 6, 7
]
func _init() -> void:
pass
func generate_ball_state() -> 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]["points"] = points
# NOTE: Red balls
for i: int in range(1, 16):
var ball_name = "%02d_ball" % i
state[ball_name] = BALL_STATE.duplicate_deep()
state[ball_name]["points"] = 1
ball_state = state
return state
func is_colored_ball(ball_name: String) -> bool:
return ball_name in COLORED_BALLS
func reap_ball(ball: Node3D) -> void:
super(ball)
if is_colored_ball(ball.name):
# TODO: Colored ball must not be be destroyed. Handle rule...
ball_state[ball.name]["valid_end"] = false
pass
func process_ball(ball: Node3D) -> void:
@@ -19,6 +54,9 @@ func process_ball(ball: Node3D) -> void:
if is_colored_ball(ball.name):
# TODO: Colored ball must not be be processed before red ball sunk.
# Handle rule...
var red_ball_sunk = true
if not red_ball_sunk:
pass
pass
func handle_switch_user() -> void:
@@ -31,9 +69,11 @@ func handle_switch_user() -> void:
if balls_sunk.is_empty():
Globals.game_state.switch_active_player()
turn_count += 1
return
# TODO: Handle points, etc
# Globals.multiplayer_data.current_turn_player_id
balls_sunk.clear()
turn_count += 1

2
scenes/screens/lobby_screen/lobby.tscn
View File

@@ -41,6 +41,6 @@ script = ExtResource("4_glu7g")
[connection signal="pressed" from="ui/body/right_body/vbox/8ball" to="." method="_on_mode_bttn_pressed" flags=18]
[connection signal="pressed" from="ui/body/right_body/vbox/9ball" to="." method="_on_mode_bttn_pressed" flags=18]
[connection signal="pressed" from="ui/body/right_body/vbox/snooker" to="." method="_on_mode_bttn_pressed" flags=18]
[connection signal="pressed" from="ui/body/right_body/vbox/free_ball" to="." method="_on_mode_bttn_pressed" flags=18]
[connection signal="pressed" from="ui/body/right_body/vbox/freeball" to="." method="_on_mode_bttn_pressed" flags=18]
[editable path="ui"]

2
scenes/screens/lobby_screen/lobby_base.gd
View File

@@ -60,4 +60,4 @@ func _on_match_create_bttn_pressed() -> void:
MessageBus.emit_request.rpc("match_list_add_entry", match_entry)
func _on_mode_bttn_pressed(button: Button) -> void:
active_mode = button.name.remove_chars("_").to_lower()
active_mode = button.name.to_lower()

2
scenes/ui_controls/lobby_screen/lobby_ui.tscn
View File

@@ -158,7 +158,7 @@ mouse_default_cursor_shape = 2
disabled = true
text = "Snooker"
[node name="free_ball" type="Button" parent="body/right_body/vbox"]
[node name="freeball" type="Button" parent="body/right_body/vbox"]
layout_mode = 2
mouse_default_cursor_shape = 2
text = "Free Ball"