mirror of
https://github.com/Relintai/broken_seals_2ds.git
synced 2024-11-18 12:57:21 +01:00
145 lines
4.4 KiB
Plaintext
145 lines
4.4 KiB
Plaintext
--- project.godot
|
|
+++ project.godot
|
|
@@ -835,3 +835,8 @@ quality/directional_shadow/size.mobile=1024
|
|
quality/shading/force_vertex_shading=true
|
|
quality/2d/use_batching=true
|
|
quality/shadows/enabled=false
|
|
+
|
|
+[ui]
|
|
+
|
|
+actionbar/show_keybind_text=true
|
|
+actionbar/show_cooldown_text=true
|
|
--- ActionBarEntry.gd
|
|
+++ ActionBarEntry.gd
|
|
@@ -44,6 +44,9 @@ var categ_cd : float = 0
|
|
var has_gcd : bool = false
|
|
var gcd : float = 0.0
|
|
|
|
+var show_keybind_text : bool = true
|
|
+var show_cooldown_text : bool = true
|
|
+
|
|
func _ready() -> void:
|
|
button = get_node(button_path) as Button
|
|
icon_rect = get_node(icon_path) as TextureRect
|
|
@@ -56,6 +59,19 @@ func _ready() -> void:
|
|
|
|
ProfileManager.connect("keybinds_changed", self, "on_keybinds_changed")
|
|
|
|
+ show_keybind_text = Settings.get_value("ui", "actionbar_show_keybind_text")
|
|
+ show_cooldown_text = Settings.get_value("ui", "actionbar_show_coldown_text")
|
|
+
|
|
+ Settings.connect("setting_changed", self, "on_setting_changed")
|
|
+
|
|
+ if show_keybind_text:
|
|
+ keybind_text.show()
|
|
+ else:
|
|
+ keybind_text.hide()
|
|
+
|
|
+ if !show_cooldown_text:
|
|
+ cooldown_text.hide()
|
|
+
|
|
func _exit_tree():
|
|
if icon_rect.texture != null:
|
|
ThemeAtlas.unref_texture(icon_rect.texture)
|
|
@@ -90,7 +106,9 @@ func _process(delta : float) -> void:
|
|
|
|
func set_cooldown_time(time : float) -> void:
|
|
cooldown_indicator.value = time
|
|
- cooldown_text.text = str(int(time))
|
|
+
|
|
+ if show_cooldown_text:
|
|
+ cooldown_text.text = str(int(time))
|
|
|
|
func show_cooldown_timer(max_time : float) -> void:
|
|
if cooldown_indicator.visible and cooldown_indicator.max_value < max_time:
|
|
@@ -100,11 +118,15 @@ func show_cooldown_timer(max_time : float) -> void:
|
|
cooldown_indicator.max_value = max_time
|
|
|
|
cooldown_indicator.show()
|
|
- cooldown_text.show()
|
|
+
|
|
+ if show_cooldown_text:
|
|
+ cooldown_text.show()
|
|
|
|
func hide_cooldown_timer() -> void:
|
|
cooldown_indicator.hide()
|
|
- cooldown_text.hide()
|
|
+
|
|
+ if show_cooldown_text:
|
|
+ cooldown_text.hide()
|
|
|
|
func set_button_entry(action_bar_button_entry: ActionBarButtonEntry, p_player: Entity) -> void:
|
|
player = p_player
|
|
@@ -386,3 +408,24 @@ func _cgcd_started(e : Entity, value :float) -> void:
|
|
|
|
func _cgcd_finished(val) -> void:
|
|
gcd = 0
|
|
+
|
|
+func on_setting_changed(section, key, value):
|
|
+ if section == "ui":
|
|
+ if key == "actionbar_show_keybind_text":
|
|
+ show_keybind_text = value
|
|
+
|
|
+ if show_keybind_text:
|
|
+ keybind_text.show()
|
|
+ else:
|
|
+ keybind_text.hide()
|
|
+
|
|
+ elif key == "actionbar_show_coldown_text":
|
|
+ show_cooldown_text = value
|
|
+
|
|
+ if cd > 0.2 || categ_cd > 0.2:
|
|
+ #The update loop should take care of the rest
|
|
+ if show_cooldown_text:
|
|
+ cooldown_text.show()
|
|
+ else:
|
|
+ cooldown_text.hide()
|
|
+
|
|
--- SettingsManager.gd
|
|
+++ SettingsManager.gd
|
|
@@ -51,6 +51,8 @@ var _settings : Dictionary = {
|
|
"touchscreen_mode" : OS.has_touchscreen_ui_hint(),
|
|
"ui_scale" : ProjectSettings.get("display/window/size/ui_scale"),
|
|
"ui_scale_touch" : ProjectSettings.get("display/window/size/ui_scale_touch"),
|
|
+ "actionbar_show_keybind_text" : ProjectSettings.get("ui/actionbar/show_keybind_text"),
|
|
+ "actionbar_show_coldown_text" : ProjectSettings.get("ui/actionbar/show_cooldown_text"),
|
|
},
|
|
"debug" : {
|
|
"debug_info" : false
|
|
@@ -188,6 +190,12 @@ func set_ui_ui_scale_touch(value : float) -> void:
|
|
ProjectSettings.set("rendering/window/size/ui_scale_touch", value)
|
|
set_stretch()
|
|
|
|
+func set_ui_actionbar_show_keybind_text(value : bool) -> void:
|
|
+ ProjectSettings.set("ui/actionbar/show_keybind_text", value)
|
|
+
|
|
+func set_ui_actionbar_show_coldown_text(value : bool) -> void:
|
|
+ ProjectSettings.set("ui/actionbar/show_cooldown_text", value)
|
|
+
|
|
func set_stretch():
|
|
if !loaded:
|
|
return
|
|
--- Options.tscn
|
|
+++ Options.tscn
|
|
@@ -205,6 +205,20 @@ max_value = 2.4
|
|
step = 0.01
|
|
rounded = false
|
|
|
|
+[node name="OptionToggleRow2" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 4 )]
|
|
+margin_top = 98.0
|
|
+margin_bottom = 124.0
|
|
+property_category = "ui"
|
|
+property_name = "actionbar_show_keybind_text"
|
|
+property_label = "Show Keybind Text"
|
|
+
|
|
+[node name="OptionToggleRow3" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 4 )]
|
|
+margin_top = 132.0
|
|
+margin_bottom = 158.0
|
|
+property_category = "ui"
|
|
+property_name = "actionbar_show_coldown_text"
|
|
+property_label = "Show Cooldown Text"
|
|
+
|
|
[node name="Debug" type="VBoxContainer" parent="PanelContainer/VBoxContainer/TabContainer"]
|
|
visible = false
|
|
anchor_right = 1.0
|