diff options
author | metamuffin <metamuffin@noreply.codeberg.org> | 2024-09-07 13:37:23 +0000 |
---|---|---|
committer | metamuffin <metamuffin@noreply.codeberg.org> | 2024-09-07 13:37:23 +0000 |
commit | 091f8ff9acf04cedf14765e9db5540c876fd7375 (patch) | |
tree | 4c115d6cb14df5d68bc72785f1020ed4ad2fb8e2 /client/map/tiles | |
parent | af108805c8fd87a9d20a8df02072f224d2cd3417 (diff) | |
parent | 3ef379fb07df126ea09cb112801a0bef371f8811 (diff) | |
download | hurrycurry-091f8ff9acf04cedf14765e9db5540c876fd7375.tar hurrycurry-091f8ff9acf04cedf14765e9db5540c876fd7375.tar.bz2 hurrycurry-091f8ff9acf04cedf14765e9db5540c876fd7375.tar.zst |
Merge pull request 'Refactor settings system and localization' (#123) from new-settings into master
Reviewed-on: https://codeberg.org/hurrycurry/hurrycurry/pulls/123
Diffstat (limited to 'client/map/tiles')
-rw-r--r-- | client/map/tiles/exterior_tree.gd | 2 | ||||
-rw-r--r-- | client/map/tiles/grass.gd | 2 | ||||
-rw-r--r-- | client/map/tiles/light_tile.gd | 11 |
3 files changed, 4 insertions, 11 deletions
diff --git a/client/map/tiles/exterior_tree.gd b/client/map/tiles/exterior_tree.gd index edc08df3..9054cbaa 100644 --- a/client/map/tiles/exterior_tree.gd +++ b/client/map/tiles/exterior_tree.gd @@ -27,7 +27,7 @@ func _init(rename: String, _neighbors: Array): var trunk: Mesh = load("res://map/tiles/tree/trunk_%d.res" % tree) var leaves: Mesh = load("res://map/tiles/tree/leaves_%d_%s.res" % [ tree, - "lq" if Global.get_setting("lq_trees") else "hq" + "lq" if Global.get_setting("graphics.lq_trees") else "hq" ]) var trunk_instance: MeshInstance3D = MeshInstance3D.new() trunk_instance.mesh = trunk diff --git a/client/map/tiles/grass.gd b/client/map/tiles/grass.gd index b33642a3..4bd3587c 100644 --- a/client/map/tiles/grass.gd +++ b/client/map/tiles/grass.gd @@ -25,7 +25,7 @@ func _init(rename: String, _neighbors: Array): var random = RandomNumberGenerator.new() random.seed = rename.hash() - for _i in Global.get_setting("grass_amount"): + for _i in Global.get_setting("graphics.grass_amount"): var g: Node3D = GRASS_SIDE.instantiate() base_mesh.add_child(g) g.position = Vector3(random.randf_range(-.5, .5), 0, random.randf_range(-.5, .5)) diff --git a/client/map/tiles/light_tile.gd b/client/map/tiles/light_tile.gd index fac3ee39..346cc3bb 100644 --- a/client/map/tiles/light_tile.gd +++ b/client/map/tiles/light_tile.gd @@ -18,12 +18,5 @@ extends Node3D @export var lights: Array[Light3D] func _ready(): - Global.settings_changed.connect(func(): - for l in lights: - update_shadows() - ) - update_shadows() - -func update_shadows(): - for l in lights: - l.shadow_enabled = Global.get_setting("shadows") + # TODO hook settings + for l in lights: l.shadow_enabled = Global.get_setting("graphics.shadows") |