krampus
/
gfolf2
generated from krampus/template-godot4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed gold club to `SPECIAL`

This commit is contained in:
Rob Kelly 2024-11-11 13:44:23 -07:00
parent 2db529b34a
commit 1d86d49c7d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.godot
View File

@ -128,7 +128,7 @@ select_wedge={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null)
] ]
} }
select_gold={ select_special={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"location":0,"echo":false,"script":null)
] ]

8
src/player/shot_setup/club_selector/club_selector.gd
View File

@ -11,7 +11,7 @@ const CLUB_ROTATION := {
T.Club.DRIVER: 0.0, T.Club.DRIVER: 0.0,
T.Club.IRON: -16.0, T.Club.IRON: -16.0,
T.Club.WEDGE: -32.0, T.Club.WEDGE: -32.0,
T.Club.GOLD: -48.0, T.Club.SPECIAL: -48.0,
T.Club.PUTTER: -64.0, T.Club.PUTTER: -64.0,
} }
@ -23,7 +23,7 @@ const CLUB_ROTATION := {
@onready var driver_label: Label = %DriverLabel @onready var driver_label: Label = %DriverLabel
@onready var iron_label: Label = %IronLabel @onready var iron_label: Label = %IronLabel
@onready var wedge_label: Label = %WedgeLabel @onready var wedge_label: Label = %WedgeLabel
@onready var gold_label: Label = %GoldLabel @onready var special_label: Label = %SpecialLabel
@onready var putter_label: Label = %PutterLabel @onready var putter_label: Label = %PutterLabel
@ -35,8 +35,8 @@ func _get_club_label(club: T.Club) -> Label:
return iron_label return iron_label
T.Club.WEDGE: T.Club.WEDGE:
return wedge_label return wedge_label
T.Club.GOLD: T.Club.SPECIAL:
return gold_label return special_label
T.Club.PUTTER: T.Club.PUTTER:
return putter_label return putter_label
assert(false, "Unknown club %d" % club) assert(false, "Unknown club %d" % club)

4
src/player/shot_setup/club_selector/club_selector.tscn
View File

@ -145,7 +145,7 @@ pivot_offset = Vector2(0, 20)
theme_type_variation = &"ClubSelectLabel" theme_type_variation = &"ClubSelectLabel"
text = "WEDGE" text = "WEDGE"
[node name="GoldLabel" type="Label" parent="ClubHub"] [node name="SpecialLabel" type="Label" parent="ClubHub"]
unique_name_in_owner = true unique_name_in_owner = true
texture_filter = 6 texture_filter = 6
layout_mode = 1 layout_mode = 1
@ -162,7 +162,7 @@ grow_vertical = 2
scale = Vector2(0.618, 0.618) scale = Vector2(0.618, 0.618)
pivot_offset = Vector2(0, 20) pivot_offset = Vector2(0, 20)
theme_type_variation = &"ClubSelectLabel" theme_type_variation = &"ClubSelectLabel"
text = "GOLD" text = "SPECIAL"
[node name="PutterLabel" type="Label" parent="ClubHub"] [node name="PutterLabel" type="Label" parent="ClubHub"]
unique_name_in_owner = true unique_name_in_owner = true

4
src/player/shot_setup/shot_setup.gd
View File

@ -335,8 +335,8 @@ func _process(delta: float) -> void:
club = T.Club.IRON club = T.Club.IRON
if Input.is_action_just_pressed("select_wedge"): if Input.is_action_just_pressed("select_wedge"):
club = T.Club.WEDGE club = T.Club.WEDGE
if Input.is_action_just_pressed("select_gold"): if Input.is_action_just_pressed("select_special"):
club = T.Club.GOLD club = T.Club.SPECIAL
if Input.is_action_just_pressed("select_putter"): if Input.is_action_just_pressed("select_putter"):
club = T.Club.PUTTER club = T.Club.PUTTER

2
src/util/types.gd
View File

@ -4,7 +4,7 @@ class_name T extends Object
enum Club { enum Club {
DRIVER, DRIVER,
IRON, IRON,
GOLD, SPECIAL,
WEDGE, WEDGE,
PUTTER, PUTTER,
} }