diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/map/tile_factory.gd | 2 | ||||
| -rw-r--r-- | client/menu/menu_background.gd | 2 | ||||
| -rw-r--r-- | client/settings.gd | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/client/map/tile_factory.gd b/client/map/tile_factory.gd index 9580bd66..0e444a0b 100644 --- a/client/map/tile_factory.gd +++ b/client/map/tile_factory.gd @@ -52,7 +52,7 @@ static func produce(tile_name: String, node_name: String, neighbors: Array) -> T "fish-crate": return FishCrate.new(node_name, neighbors) "flour-crate": return FlourCrate.new(node_name, neighbors) "leek-crate": return LeekCrate.new(node_name, neighbors) - "raw-steak-crate": return RawSteakCrate.new(node_name, neighbors) + "steak-crate": return RawSteakCrate.new(node_name, neighbors) "rice-crate": return RiceCrate.new(node_name, neighbors) "strawberry-crate": return StrawberryCrate.new(node_name, neighbors) "tomato-crate": return TomatoCrate.new(node_name, neighbors) diff --git a/client/menu/menu_background.gd b/client/menu/menu_background.gd index d800c5d7..de5cafea 100644 --- a/client/menu/menu_background.gd +++ b/client/menu/menu_background.gd @@ -18,7 +18,7 @@ extends Node3D const NULLS = [null,null,null,null] -const BUCKETS = [[], ["floor","floor","floor","floor","tomato-crate", "raw-steak-crate"], ["table", "chair", "counter"], ["sink", "stove"]] +const BUCKETS = [[], ["floor","floor","floor","floor","tomato-crate", "steak-crate"], ["table", "chair", "counter"], ["sink", "stove"]] @onready var environment: WorldEnvironment = $Environment @onready var map: Map = $Map diff --git a/client/settings.gd b/client/settings.gd index 8d81f740..f2f4563c 100644 --- a/client/settings.gd +++ b/client/settings.gd @@ -67,8 +67,8 @@ static func get_root(): ]) static func trigger_hook(key: String, value): - if Settings.change_hooks_display.get(key) != null: Settings.change_hooks_display.get(key).call(value) - if Settings.change_hooks_apply.get(key) != null: Settings.change_hooks_apply.get(key).call(value) + if Settings.change_hooks_display.get(key) != null: Settings.change_hooks_display.get(key).callv([value] if value != null else []) + if Settings.change_hooks_apply.get(key) != null: Settings.change_hooks_apply.get(key).callv([value] if value != null else []) if key.find(".") != -1: trigger_hook(key.rsplit(".", false, 1)[0], null) static func hook_changed(key: String, display: bool, callable: Callable): @@ -103,10 +103,8 @@ static var change_hooks_apply = { static func apply_initial(): for key in change_hooks_apply.keys(): - if Global.settings.has(key): - change_hooks_apply[key].call(Global.get_setting(key)) - else: - change_hooks_apply[key].call() + if Global.settings.has(key): change_hooks_apply[key].call(Global.get_setting(key)) + else: change_hooks_apply[key].call() static func h_aa(mode): match mode: |