diff --git a/project.godot b/project.godot index 78d0165..b26d254 100644 --- a/project.godot +++ b/project.godot @@ -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) ] } -select_gold={ +select_special={ "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) ] diff --git a/src/player/shot_setup/club_selector/club_selector.gd b/src/player/shot_setup/club_selector/club_selector.gd index 2a4aa27..45ec3a1 100644 --- a/src/player/shot_setup/club_selector/club_selector.gd +++ b/src/player/shot_setup/club_selector/club_selector.gd @@ -11,7 +11,7 @@ const CLUB_ROTATION := { T.Club.DRIVER: 0.0, T.Club.IRON: -16.0, T.Club.WEDGE: -32.0, - T.Club.GOLD: -48.0, + T.Club.SPECIAL: -48.0, T.Club.PUTTER: -64.0, } @@ -23,7 +23,7 @@ const CLUB_ROTATION := { @onready var driver_label: Label = %DriverLabel @onready var iron_label: Label = %IronLabel @onready var wedge_label: Label = %WedgeLabel -@onready var gold_label: Label = %GoldLabel +@onready var special_label: Label = %SpecialLabel @onready var putter_label: Label = %PutterLabel @@ -35,8 +35,8 @@ func _get_club_label(club: T.Club) -> Label: return iron_label T.Club.WEDGE: return wedge_label - T.Club.GOLD: - return gold_label + T.Club.SPECIAL: + return special_label T.Club.PUTTER: return putter_label assert(false, "Unknown club %d" % club) diff --git a/src/player/shot_setup/club_selector/club_selector.tscn b/src/player/shot_setup/club_selector/club_selector.tscn index 2e9d85c..dd7469e 100644 --- a/src/player/shot_setup/club_selector/club_selector.tscn +++ b/src/player/shot_setup/club_selector/club_selector.tscn @@ -145,7 +145,7 @@ pivot_offset = Vector2(0, 20) theme_type_variation = &"ClubSelectLabel" text = "WEDGE" -[node name="GoldLabel" type="Label" parent="ClubHub"] +[node name="SpecialLabel" type="Label" parent="ClubHub"] unique_name_in_owner = true texture_filter = 6 layout_mode = 1 @@ -162,7 +162,7 @@ grow_vertical = 2 scale = Vector2(0.618, 0.618) pivot_offset = Vector2(0, 20) theme_type_variation = &"ClubSelectLabel" -text = "GOLD" +text = "SPECIAL" [node name="PutterLabel" type="Label" parent="ClubHub"] unique_name_in_owner = true diff --git a/src/player/shot_setup/shot_setup.gd b/src/player/shot_setup/shot_setup.gd index eafa553..ef73d80 100644 --- a/src/player/shot_setup/shot_setup.gd +++ b/src/player/shot_setup/shot_setup.gd @@ -335,8 +335,8 @@ func _process(delta: float) -> void: club = T.Club.IRON if Input.is_action_just_pressed("select_wedge"): club = T.Club.WEDGE - if Input.is_action_just_pressed("select_gold"): - club = T.Club.GOLD + if Input.is_action_just_pressed("select_special"): + club = T.Club.SPECIAL if Input.is_action_just_pressed("select_putter"): club = T.Club.PUTTER diff --git a/src/util/types.gd b/src/util/types.gd index ced07e7..02130ba 100644 --- a/src/util/types.gd +++ b/src/util/types.gd @@ -4,7 +4,7 @@ class_name T extends Object enum Club { DRIVER, IRON, - GOLD, + SPECIAL, WEDGE, PUTTER, }