diff options
-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 | ||||
-rw-r--r-- | data/maps/auto_sushi.yaml | 2 | ||||
-rw-r--r-- | data/maps/bar.yaml | 2 | ||||
-rw-r--r-- | data/maps/bbq.yaml | 2 | ||||
-rw-r--r-- | data/maps/bus.yaml | 2 | ||||
-rw-r--r-- | data/maps/conveyors_dot_com.yaml | 2 | ||||
-rw-r--r-- | data/maps/debug.yaml | 2 | ||||
-rw-r--r-- | data/maps/depot.yaml | 2 | ||||
-rw-r--r-- | data/maps/factory.yaml | 2 | ||||
-rw-r--r-- | data/maps/junior.yaml | 2 | ||||
-rw-r--r-- | data/maps/line.yaml | 2 | ||||
-rw-r--r-- | data/maps/paris.yaml | 2 | ||||
-rw-r--r-- | data/maps/rivalry.yaml | 2 | ||||
-rw-r--r-- | data/maps/senior.yaml | 2 | ||||
-rw-r--r-- | data/maps/smallest.yaml | 2 | ||||
-rw-r--r-- | data/maps/sophomore.yaml | 2 | ||||
-rw-r--r-- | data/maps/station.yaml | 2 | ||||
-rw-r--r-- | data/maps/sushibar.yaml | 2 | ||||
-rw-r--r-- | data/maps/teeny.yaml | 2 | ||||
-rw-r--r-- | data/maps/village.yaml | 2 | ||||
-rw-r--r-- | data/maps/zigzag.yaml | 2 | ||||
-rw-r--r-- | pixel-client/assets/tiles.ini | 2 | ||||
-rw-r--r-- | pixel-client/src/menu/background.rs | 2 | ||||
-rw-r--r-- | test-client/tiles.ts | 4 |
26 files changed, 30 insertions, 32 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: diff --git a/data/maps/auto_sushi.yaml b/data/maps/auto_sushi.yaml index 99bd13d9..3d7a756d 100644 --- a/data/maps/auto_sushi.yaml +++ b/data/maps/auto_sushi.yaml @@ -48,7 +48,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/bar.yaml b/data/maps/bar.yaml index 7c3706ba..d2fad92c 100644 --- a/data/maps/bar.yaml +++ b/data/maps/bar.yaml @@ -43,7 +43,7 @@ tiles: "S": stove "b": book "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/bbq.yaml b/data/maps/bbq.yaml index 94aa51f4..c0a3b09b 100644 --- a/data/maps/bbq.yaml +++ b/data/maps/bbq.yaml @@ -42,7 +42,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/bus.yaml b/data/maps/bus.yaml index d8467a67..5fe7c246 100644 --- a/data/maps/bus.yaml +++ b/data/maps/bus.yaml @@ -56,7 +56,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/conveyors_dot_com.yaml b/data/maps/conveyors_dot_com.yaml index e0b9230b..92a51371 100644 --- a/data/maps/conveyors_dot_com.yaml +++ b/data/maps/conveyors_dot_com.yaml @@ -54,7 +54,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/debug.yaml b/data/maps/debug.yaml index e292a398..0e44b7b0 100644 --- a/data/maps/debug.yaml +++ b/data/maps/debug.yaml @@ -47,7 +47,7 @@ tiles: "b": book "C": cuttingboard "0": rice-crate - "1": raw-steak-crate + "1": steak-crate "2": tomato-crate "3": leek-crate "4": coconut-crate diff --git a/data/maps/depot.yaml b/data/maps/depot.yaml index 9a9f81c2..3b6c1fc0 100644 --- a/data/maps/depot.yaml +++ b/data/maps/depot.yaml @@ -52,7 +52,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/factory.yaml b/data/maps/factory.yaml index c941ce00..9a87de76 100644 --- a/data/maps/factory.yaml +++ b/data/maps/factory.yaml @@ -44,7 +44,7 @@ tiles: "S": stove "b": book "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/junior.yaml b/data/maps/junior.yaml index f8b316ce..67a1a20a 100644 --- a/data/maps/junior.yaml +++ b/data/maps/junior.yaml @@ -43,7 +43,7 @@ tiles: "S": stove "b": book "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/line.yaml b/data/maps/line.yaml index 51b4d433..f18cf831 100644 --- a/data/maps/line.yaml +++ b/data/maps/line.yaml @@ -34,7 +34,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/paris.yaml b/data/maps/paris.yaml index 4243c179..abc7efbf 100644 --- a/data/maps/paris.yaml +++ b/data/maps/paris.yaml @@ -48,7 +48,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/rivalry.yaml b/data/maps/rivalry.yaml index 3c179a87..7bbe7f3e 100644 --- a/data/maps/rivalry.yaml +++ b/data/maps/rivalry.yaml @@ -40,7 +40,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/senior.yaml b/data/maps/senior.yaml index 67442916..bd9c525f 100644 --- a/data/maps/senior.yaml +++ b/data/maps/senior.yaml @@ -43,7 +43,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/smallest.yaml b/data/maps/smallest.yaml index 6f158e2a..2dae4f29 100644 --- a/data/maps/smallest.yaml +++ b/data/maps/smallest.yaml @@ -32,7 +32,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/sophomore.yaml b/data/maps/sophomore.yaml index e8fa61a3..e9917cc2 100644 --- a/data/maps/sophomore.yaml +++ b/data/maps/sophomore.yaml @@ -40,7 +40,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/station.yaml b/data/maps/station.yaml index ac80a8a5..96384b24 100644 --- a/data/maps/station.yaml +++ b/data/maps/station.yaml @@ -46,7 +46,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/sushibar.yaml b/data/maps/sushibar.yaml index f244d92c..1d316984 100644 --- a/data/maps/sushibar.yaml +++ b/data/maps/sushibar.yaml @@ -46,7 +46,7 @@ tiles: "C": cuttingboard "R": rice-crate "G": flour-crate - "H": raw-steak-crate + "H": steak-crate "I": tomato-crate "T": coconut-crate "F": fish-crate diff --git a/data/maps/teeny.yaml b/data/maps/teeny.yaml index 82e20e4d..f0245563 100644 --- a/data/maps/teeny.yaml +++ b/data/maps/teeny.yaml @@ -42,7 +42,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/village.yaml b/data/maps/village.yaml index ec21d196..155420c0 100644 --- a/data/maps/village.yaml +++ b/data/maps/village.yaml @@ -52,7 +52,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/data/maps/zigzag.yaml b/data/maps/zigzag.yaml index 5bfe939f..b78dfd21 100644 --- a/data/maps/zigzag.yaml +++ b/data/maps/zigzag.yaml @@ -52,7 +52,7 @@ tiles: "o": oven "S": stove "C": cuttingboard - "R": raw-steak-crate + "R": steak-crate "T": tomato-crate "F": flour-crate "L": leek-crate diff --git a/pixel-client/assets/tiles.ini b/pixel-client/assets/tiles.ini index 2d770b6a..f07840f8 100644 --- a/pixel-client/assets/tiles.ini +++ b/pixel-client/assets/tiles.ini @@ -36,7 +36,7 @@ path=path tree=tree tomato-crate=crate_back,tomato~x12~y6,tomato~x1~y13,tomato~x16~y20,crate_front -raw-steak-crate=crate_back,steak_raw~x2~y13,crate_front +steak-crate=crate_back,steak_raw~x2~y13,crate_front flour-crate=crate_back,flour~y19,flour~x11~y22,flour~x10~y5~hflip,crate_front leek-crate=crate_back,leek~x6~y12,leek~x6~y3,leek~x2~y18,leek~x7~y17~hflip,leek~x10~y10,crate_front rice-crate=crate_back,rice~x2~y12,rice~x10~y5,crate_front diff --git a/pixel-client/src/menu/background.rs b/pixel-client/src/menu/background.rs index 9f385d38..84ec3f34 100644 --- a/pixel-client/src/menu/background.rs +++ b/pixel-client/src/menu/background.rs @@ -37,7 +37,7 @@ impl MenuBackground { &[ "floor", "tomato-crate", - "raw-steak-crate", + "steak-crate", "table", "chair", "counter", diff --git a/test-client/tiles.ts b/test-client/tiles.ts index 6bd724f1..d1011cc2 100644 --- a/test-client/tiles.ts +++ b/test-client/tiles.ts @@ -113,7 +113,7 @@ const tref = (name: keyof typeof TILES): Component => c => TILES[name].forEach(f type HelperItemName = "steak" | "milk" | "cooked-rice" | "curry" | "strawberry-icecream" | "strawberry-shake" export type ItemName = HelperItemName | "dirty-plate" | "plate" | "tomato" | "raw-steak" | "flour" | "leek" | "rice" | "fish" | "coconut" | "strawberry" | "foodprocessor" | "flour-foodprocessor" | "dough-foodprocessor" | "dough" | "bread" | "burned" | "bread-slice" | "pot" | "raw-steak-pot" | "steak-pot" | "burned-pot" | "sliced-tomato" | "steak-plate" | "sliced-tomato-plate" | "bread-slice-plate" | "bread-slice-steak-plate" | "bread-slice-sliced-tomato-plate" | "bread-slice-sliced-tomato-steak-plate" | "sliced-tomato-steak-plate" | "tomato-foodprocessor" | "tomato-juice-foodprocessor" | "leek-pot" | "tomato-juice-pot" | "leek-tomato-juice-pot" | "tomato-soup-pot" | "tomato-soup-plate" | "sliced-fish" | "rice-pot" | "cooked-rice-pot" | "nigiri" | "nigiri-plate" | "strawberry-foodprocessor" | "strawberry-puree-foodprocessor" | "coconut-foodprocessor" | "milk-foodprocessor" | "coconut-strawberry-puree-foodprocessor" | "strawberry-shake-foodprocessor" | "milk-strawberry-foodprocessor" | "strawberry-icecream-foodprocessor" | "strawberry-icecream-plate" | "rice-foodprocessor" | "rice-flour-foodprocessor" | "rice-flour-pot" | "mochi-dough-pot" | "strawberry-mochi" | "glass" | "strawberry-shake-glass" | "tomato-juice-glass" | "water-glass" | "milk-pot" | "tomato-pot" | "leek-milk-pot" | "leek-tomato-pot" | "leek-milk-tomato-pot" | "milk-tomato-pot" | "curry-pot" | "cooked-rice-plate" | "curry-plate" | "cooked-rice-curry-plate" -export type TileName = "sink" | "conveyor" | "book" | "tomato-crate" | "raw-steak-crate" | "flour-crate" | "leek-crate" | "rice-crate" | "fish-crate" | "coconut-crate" | "strawberry-crate" | "oven" | "cuttingboard" | "stove" | "freezer" | "trash" | "grass" | "tree" | "wall" | "chair" | "floor" | "door" | "counter" | "wall-window" | "table" | "counter-window" | "path" | "lamp" | "street" +export type TileName = "sink" | "conveyor" | "book" | "tomato-crate" | "steak-crate" | "flour-crate" | "leek-crate" | "rice-crate" | "fish-crate" | "coconut-crate" | "strawberry-crate" | "oven" | "cuttingboard" | "stove" | "freezer" | "trash" | "grass" | "tree" | "wall" | "chair" | "floor" | "door" | "counter" | "wall-window" | "table" | "counter-window" | "path" | "lamp" | "street" const pot = iref("pot") const plate = iref("plate") @@ -227,7 +227,7 @@ const TILES: { [key in TileName]: Component[] } = { "lamp": [tref("grass"), rect(0.3, "rgb(255, 217, 127)", "rgb(32, 32, 32)", 0.1)], "flour-crate": crate("flour"), - "raw-steak-crate": crate("raw-steak"), + "steak-crate": crate("raw-steak"), "tomato-crate": crate("tomato"), "leek-crate": crate("leek"), "rice-crate": crate("rice"), |