diff options
46 files changed, 53 insertions, 55 deletions
diff --git a/client/gui/menus/main/background.gd b/client/gui/menus/main/background.gd index 4abb84b4..3964dc9b 100644 --- a/client/gui/menus/main/background.gd +++ b/client/gui/menus/main/background.gd @@ -16,7 +16,7 @@ extends Node3D const CRATES = ["tomato-crate", "steak-crate", "cheese-crate", "lettuce-crate", "flour-crate", "coconut-crate"] -const TOOLS = ["stove", "stove", "stove", "sink", "cuttingboard", "sink", "cuttingboard", "oven", "freezer"] +const TOOLS = ["stove", "stove", "stove", "sink", "cutting-board", "sink", "cutting-board", "oven", "freezer"] @onready var environment: WorldEnvironment = $Environment @onready var map: Map = $Map diff --git a/client/map/tile_factory.gd b/client/map/tile_factory.gd index b1dc8993..4049ea47 100644 --- a/client/map/tile_factory.gd +++ b/client/map/tile_factory.gd @@ -45,7 +45,7 @@ func produce(tile_name: String, position: Vector2i, neighbors: Array) -> Tile: "conveyor": return Conveyor.new(ctx) "counter-window": return CounterWindow.new(ctx) "counter": return CounterBase.new(ctx) - "cuttingboard": return CuttingBoard.new(ctx) + "cutting-board": return CuttingBoard.new(ctx) "door": return Door.new(ctx) "fence": return Fence.new(ctx) "floor": return Floor.new(ctx) diff --git a/data/maps/5star.yaml b/data/maps/5star.yaml index 10af0630..f6ce9cd6 100644 --- a/data/maps/5star.yaml +++ b/data/maps/5star.yaml @@ -58,7 +58,7 @@ tiles: "S": stove "Y": stove "f": freezer - "C": cuttingboard + "C": cutting-board "X": trash "R": steak-crate diff --git a/data/maps/anticurry.yaml b/data/maps/anticurry.yaml index ee5e5ddd..c519fd6f 100644 --- a/data/maps/anticurry.yaml +++ b/data/maps/anticurry.yaml @@ -37,7 +37,7 @@ tiles: "h": freezer "S": stove "P": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "D": coconut-crate "V": strawberry-crate diff --git a/data/maps/auto_sushi.yaml b/data/maps/auto_sushi.yaml index 5c8304bc..bb5cb1a9 100644 --- a/data/maps/auto_sushi.yaml +++ b/data/maps/auto_sushi.yaml @@ -51,7 +51,7 @@ tiles: "s": sink "o": oven "S": stove - "C": cuttingboard + "C": cutting-board "R": fish-crate "T": tomato-crate "F": rice-crate diff --git a/data/maps/bar.yaml b/data/maps/bar.yaml index 00849344..6b817096 100644 --- a/data/maps/bar.yaml +++ b/data/maps/bar.yaml @@ -43,7 +43,7 @@ tiles: "S": stove "P": stove "b": book - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/bbq.yaml b/data/maps/bbq.yaml index df5eea7e..5d1bfbb7 100644 --- a/data/maps/bbq.yaml +++ b/data/maps/bbq.yaml @@ -39,7 +39,7 @@ tiles: "s": sink "o": oven "S": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/bus.yaml b/data/maps/bus.yaml index 36f234f8..50d58ab9 100644 --- a/data/maps/bus.yaml +++ b/data/maps/bus.yaml @@ -56,7 +56,7 @@ tiles: "o": oven "S": stove "Y": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/campaign/01.yaml b/data/maps/campaign/01.yaml index 22236dbf..0541846e 100644 --- a/data/maps/campaign/01.yaml +++ b/data/maps/campaign/01.yaml @@ -33,7 +33,7 @@ tiles: "p": counter "t": table "s": sink - "C": cuttingboard + "C": cutting-board "L": lettuce-crate "X": trash diff --git a/data/maps/debug.yaml b/data/maps/debug.yaml index 0275a3c9..5baf06aa 100644 --- a/data/maps/debug.yaml +++ b/data/maps/debug.yaml @@ -46,8 +46,8 @@ tiles: "S": stove "T": stove "b": book - "C": cuttingboard - "R": rollingboard + "C": cutting-board + "R": rolling-board "0": rice-crate "1": steak-crate "2": tomato-crate diff --git a/data/maps/debug2.yaml b/data/maps/debug2.yaml index 7f099da1..54f7e3cf 100644 --- a/data/maps/debug2.yaml +++ b/data/maps/debug2.yaml @@ -48,7 +48,7 @@ tiles: "z": freezer "S": stove "b": book - "C": cuttingboard + "C": cutting-board "0": rice-crate "1": steak-crate "2": tomato-crate diff --git a/data/maps/duplex.yaml b/data/maps/duplex.yaml index f7d5decf..e4829d4a 100644 --- a/data/maps/duplex.yaml +++ b/data/maps/duplex.yaml @@ -48,7 +48,7 @@ tiles: "s": sink "o": oven "S": stove - "C": cuttingboard + "C": cutting-board "R": rice-crate "D": coconut-crate "T": tomato-crate diff --git a/data/maps/junior.yaml b/data/maps/junior.yaml index bfae7c92..1d246627 100644 --- a/data/maps/junior.yaml +++ b/data/maps/junior.yaml @@ -42,7 +42,7 @@ tiles: "o": oven "S": stove "b": book - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/line.yaml b/data/maps/line.yaml index d970e9c1..02140870 100644 --- a/data/maps/line.yaml +++ b/data/maps/line.yaml @@ -34,7 +34,7 @@ tiles: "o": oven "S": stove "P": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/paris.yaml b/data/maps/paris.yaml index 17529fab..1dfd5576 100644 --- a/data/maps/paris.yaml +++ b/data/maps/paris.yaml @@ -46,7 +46,7 @@ tiles: "o": oven "S": stove "Y": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/ring.yaml b/data/maps/ring.yaml index 42668a77..307db866 100644 --- a/data/maps/ring.yaml +++ b/data/maps/ring.yaml @@ -45,20 +45,18 @@ tiles: "p": stove "a": stove "g": freezer - "e": cuttingboard - "r": rollingboard + "e": cutting-board + "r": rolling-board "X": trash "A": steak-crate "B": coconut-crate - "C": strawberry-crate - "D": fish-crate + "C": cheese-crate + "D": lettuce-crate "E": rice-crate "F": tomato-crate "G": flour-crate "H": leek-crate - "I": lettuce-crate - "J": cheese-crate ".": floor ",": floor diff --git a/data/maps/rivalry.yaml b/data/maps/rivalry.yaml index acc04aa1..b3bb81a4 100644 --- a/data/maps/rivalry.yaml +++ b/data/maps/rivalry.yaml @@ -40,7 +40,7 @@ tiles: "o": oven "S": stove "P": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/salad.yaml b/data/maps/salad.yaml index 431c55a9..ecd99a85 100644 --- a/data/maps/salad.yaml +++ b/data/maps/salad.yaml @@ -42,7 +42,7 @@ tiles: "t": table "w": counter-window "s": sink - "C": cuttingboard + "C": cutting-board "T": tomato-crate "L": lettuce-crate "X": trash diff --git a/data/maps/senior.yaml b/data/maps/senior.yaml index 7bc9cd66..161f4c64 100644 --- a/data/maps/senior.yaml +++ b/data/maps/senior.yaml @@ -43,7 +43,7 @@ tiles: "o": oven "S": stove "W": stove - "C": cuttingboard + "C": cutting-board "R": rice-crate "D": coconut-crate "T": tomato-crate diff --git a/data/maps/sophomore.yaml b/data/maps/sophomore.yaml index fc3a2b94..0602b6ff 100644 --- a/data/maps/sophomore.yaml +++ b/data/maps/sophomore.yaml @@ -40,7 +40,7 @@ tiles: "o": oven "S": stove "P": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/station.yaml b/data/maps/station.yaml index dc8307ee..d69eee85 100644 --- a/data/maps/station.yaml +++ b/data/maps/station.yaml @@ -40,7 +40,7 @@ tiles: "s": sink "o": oven "P": stove - "C": cuttingboard + "C": cutting-board "A": lettuce-crate "R": steak-crate "D": cheese-crate diff --git a/data/maps/streetfood.yaml b/data/maps/streetfood.yaml index f15cb8f1..b9a954cb 100644 --- a/data/maps/streetfood.yaml +++ b/data/maps/streetfood.yaml @@ -37,7 +37,7 @@ tiles: "t": table "s": sink "Y": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/sushibar.yaml b/data/maps/sushibar.yaml index ddbdcaf7..59aeeb3f 100644 --- a/data/maps/sushibar.yaml +++ b/data/maps/sushibar.yaml @@ -43,7 +43,7 @@ tiles: "o": oven "S": stove "b": book - "C": cuttingboard + "C": cutting-board "R": rice-crate "G": flour-crate "H": steak-crate diff --git a/data/maps/teeny.yaml b/data/maps/teeny.yaml index fc064a8d..5d2e6ade 100644 --- a/data/maps/teeny.yaml +++ b/data/maps/teeny.yaml @@ -41,7 +41,7 @@ tiles: "s": sink "o": oven "P": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/village.yaml b/data/maps/village.yaml index 9d99bf32..aea209b3 100644 --- a/data/maps/village.yaml +++ b/data/maps/village.yaml @@ -50,7 +50,7 @@ tiles: "o": oven "S": stove "U": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/maps/zigzag.yaml b/data/maps/zigzag.yaml index 826c49bc..a13da9d6 100644 --- a/data/maps/zigzag.yaml +++ b/data/maps/zigzag.yaml @@ -47,7 +47,7 @@ tiles: "o": oven "S": stove "P": stove - "C": cuttingboard + "C": cutting-board "R": steak-crate "T": tomato-crate "F": flour-crate diff --git a/data/recipes/default.js b/data/recipes/default.js index f70adf6b..cc2dfab4 100644 --- a/data/recipes/default.js +++ b/data/recipes/default.js @@ -119,12 +119,12 @@ function crate(s) { } function cut(s, two) { const o = new Item(`sliced-${s.name}`, s.container) - out({ action: "active", inputs: [s], outputs: [o, two ? o : null], tile: "cuttingboard", duration: 2 }) + out({ action: "active", inputs: [s], outputs: [o, two ? o : null], tile: "cutting-board", duration: 2 }) return o } function roll(s, two) { const o = new Item(`rolled-${s.name}`, s.container) - out({ action: "active", inputs: [s], outputs: [o, two ? o : null], tile: "rollingboard", duration: 2 }) + out({ action: "active", inputs: [s], outputs: [o, two ? o : null], tile: "rolling-board", duration: 2 }) return o } function cook(s, duration = 20) { diff --git a/locale/de.ini b/locale/de.ini index 43888884..04ca6778 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -241,7 +241,7 @@ s.state.game_aborted = Spiel wurde von {0} abgebrochen. s.state.overflow_resubscribe = Im Rückstand. Einige clientgebundene Pakete wurden verworfen. s.tutorial.accept_order = Nähere dich dem Kunden, um dessen Bestellung anzunehmen s.tutorial.active = Interagiere hier für {0}s -s.tutorial.active_cuttingboard = Schneide den Gegenstand hier in Scheiben +s.tutorial.active_cutting_board = Schneide den Gegenstand hier in Scheiben s.tutorial.clear_tile = Leere diese Kachel s.tutorial.error = Der Tutorial-Code kann mit diesem Rezept noch nicht umgehen. s.tutorial.finished = Tutorial abgeschlossen! diff --git a/locale/el.ini b/locale/el.ini index 099b1ef9..e2b50327 100644 --- a/locale/el.ini +++ b/locale/el.ini @@ -162,7 +162,7 @@ c.setup.frank_signature = Φ. Μίλλερ c.setup.user_signature = Πατήστε εδώ για να υπογράψετε s.error.item_not_found = Το αντικείμενο «{0}» δεν υπάρχει. s.state.game_aborted = Το παιχνίδι ακυρώθηκε από τον παίκτη {0}. -s.tutorial.active_cuttingboard = Κόψε το συστατικό σε κομμάτια εδώ +s.tutorial.active_cutting_board = Κόψε το συστατικό σε κομμάτια εδώ s.tutorial.active = Αλληλεπίδρασε εδώ για {0}δ s.tutorial.clear_tile = Άδειασε το πλακάκι s.tutorial.error = Ο κώδικας του tutorial δεν μπορεί να ανταπεξέλθει ακόμα στην συνταγή αυτή. diff --git a/locale/en.ini b/locale/en.ini index c0cd47f8..1fce58c7 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -282,7 +282,7 @@ s.state.game_aborted=Game was aborted by {0}. s.state.overflow_resubscribe=Lagging behind. Some clientbound packets were dropped. s.state.paused=Game paused s.tutorial.accept_order=Approach the customer take their order -s.tutorial.active_cuttingboard=Cut the item to slices here +s.tutorial.active_cutting_board=Cut the item to slices here s.tutorial.active=Interact here for {0}s s.tutorial.clear_tile=Clear this tile s.tutorial.error=Tutorial code cannot handle this recipe yet. diff --git a/locale/es.ini b/locale/es.ini index 0bf2c0b8..42ed52d5 100644 --- a/locale/es.ini +++ b/locale/es.ini @@ -229,7 +229,7 @@ s.state.game_aborted = La partida fue abortada por {0}. s.state.overflow_resubscribe = Hay cierto retraso. Se han perdido algunos paquetes. s.tutorial.accept_order = Acércate al cliente y toma su pedido s.tutorial.active = Interactúa aquí {0}s -s.tutorial.active_cuttingboard = Corta el objeto en rodajas aquí +s.tutorial.active_cutting_board = Corta el objeto en rodajas aquí s.tutorial.clear_tile = Limpia este azulejo s.tutorial.error = El código del tutorial maneja esta receta todavía. s.tutorial.finished = ¡Tutorial terminado! diff --git a/locale/eu.ini b/locale/eu.ini index 681b4af2..4bbfab24 100644 --- a/locale/eu.ini +++ b/locale/eu.ini @@ -227,7 +227,7 @@ s.state.game_aborted = {0}k partida bertan behera utzi du. s.state.overflow_resubscribe = Atzerapena dago. Bezero batzuen paketeak baztertu egin dira. s.tutorial.accept_order = Hurbildu bezeroarengana eskaria hartzera s.tutorial.active = Elkarreragin hemen {0}s -s.tutorial.active_cuttingboard = Moztu elementua xerratan hemen +s.tutorial.active_cutting_board = Moztu elementua xerratan hemen s.tutorial.clear_tile = Garbitu lauza hau s.tutorial.error = Tutorialean ezin da errezeta hau erabili oraindik. s.tutorial.finished = Tutoriala bukatuta! diff --git a/locale/fi.ini b/locale/fi.ini index f167cba5..f285426c 100644 --- a/locale/fi.ini +++ b/locale/fi.ini @@ -227,7 +227,7 @@ s.tutorial.finished = Opetusohjelma päättynyt! s.tutorial.hold_interact = Pysy vuorovaikutuksessa s.tutorial.interact_empty = Ole vuorovaikutuksessa tyhjän laskurin kanssa s.state.overflow_resubscribe = Jäljelle jääminen. Jotkut asiakkaalle sidotut paketit pudotettiin. -s.tutorial.active_cuttingboard = Leikkaa tuote viipaleiksi tästä +s.tutorial.active_cutting_board = Leikkaa tuote viipaleiksi tästä s.tutorial.error = Opetusohjelmakoodi ei vielä pysty käsittelemään tätä reseptiä. c.settings.online.discover_binary = mDNS-löydön binaaripolku c.settings.online.registry_url = Rekisterin URL-osoite diff --git a/locale/fr.ini b/locale/fr.ini index a3ebc728..f81d2ef8 100644 --- a/locale/fr.ini +++ b/locale/fr.ini @@ -278,7 +278,7 @@ c.menu.play.server_start = Démarrer le serveur c.menu.play.server_stop = Arrêter le serveur c.menu.play.server_testing = Serveur (test) c.menu.play.server_unavailable = Serveur (indisponible) -s.tutorial.active_cuttingboard = Coupez l'article en tranches ici +s.tutorial.active_cutting_board = Coupez l'article en tranches ici s.tutorial.accept_order = Approchez le client et prenez sa commande c.menu.about.legal = Légal c.menu.about.source = Code source diff --git a/locale/it.ini b/locale/it.ini index 763c7463..051ed51a 100644 --- a/locale/it.ini +++ b/locale/it.ini @@ -218,7 +218,7 @@ unknown336 = Torna al Menù Principale s.state.abort_no_players = Partita interrotta a causa di giocatori insufficienti. s.state.game_aborted = Partita interrotta da {0}. s.tutorial.accept_order = Avvicinati al cliente per prendere il suo ordine -s.tutorial.active_cuttingboard = Taglia a fette l'oggetto qui +s.tutorial.active_cutting_board = Taglia a fette l'oggetto qui s.error.must_be_alone = Devi essere da solo in questo server per ricaricare s.error.no_info = Nessuna informazione disponibile. s.error.no_player = Il giocatore non esiste. diff --git a/locale/ja.ini b/locale/ja.ini index 704004e5..6e39f581 100644 --- a/locale/ja.ini +++ b/locale/ja.ini @@ -236,7 +236,7 @@ c.settings.ui.touch_controls.automatic = 自動 c.settings.ui.scale_mode.disabled = 無効 c.settings.ui.touch_controls.disabled = 無効 c.settings.ui.touch_controls.enabled = 有効 -s.tutorial.active_cuttingboard = ここでアイテムをスライスに切ります +s.tutorial.active_cutting_board = ここでアイテムをスライスに切ります s.tutorial.active = ここで{0}秒間やりとりしてください s.tutorial.clear_tile = このタイルをクリア s.tutorial.error = チュートリアル コードはこのレシピをまだ処理していません。 diff --git a/locale/nl.ini b/locale/nl.ini index 6b58ae3c..3a64826e 100644 --- a/locale/nl.ini +++ b/locale/nl.ini @@ -226,7 +226,7 @@ s.state.game_aborted = Het spel is afgebroken door {0}. s.state.overflow_resubscribe = Je loopt achter, omdat er clientpakketten verloren zijn gegaan. s.tutorial.accept_order = Benader de klant en neem de bestelling op s.tutorial.active = Voer hier een actie uit voor {0}s -s.tutorial.active_cuttingboard = Hak hier het item in ringen +s.tutorial.active_cutting_board = Hak hier het item in ringen s.tutorial.clear_tile = Maak deze tegel schoon s.tutorial.error = De rondleiding heeft nog geen recept hiervoor. s.tutorial.finished = Afgerond! diff --git a/locale/pl.ini b/locale/pl.ini index eecf57e2..f511a617 100644 --- a/locale/pl.ini +++ b/locale/pl.ini @@ -163,7 +163,7 @@ s.bot.simple=Zwykły kucharz s.bot.waiter=Kelner s.replay.cannot_join = Nie można dołączać do powtórek. s.tutorial.accept_order = Podejdź do gościa i przyjmij zamówienie -s.tutorial.active_cuttingboard = Tu pokrój ten przedmiot na plasterki +s.tutorial.active_cutting_board = Tu pokrój ten przedmiot na plasterki s.tutorial.finished = Samouczek zakończony! s.tutorial.hold_interact = Przytrzymaj przycisk interakcji s.tutorial.interact = Tu użyj interakcji diff --git a/locale/ru.ini b/locale/ru.ini index 49b1839e..485c327b 100644 --- a/locale/ru.ini +++ b/locale/ru.ini @@ -271,7 +271,7 @@ c.settings.ui.touch_controls.disabled = Отключено s.tutorial.accept_order = Подойдите к клиенту и примите его заказ c.settings.input.zoom_out = Отдалить c.settings.online.use_registry = Использовать глобальный регистр серверов -s.tutorial.active_cuttingboard = Порежьте предмет на ломтики здесь +s.tutorial.active_cutting_board = Порежьте предмет на ломтики здесь c.settings.input.zoom_out_discrete = Отдалить (дискретно) s.tutorial.error = Этот рецепт ещё не доступен в обучении. c.menu.about.legal = Юридическая информация diff --git a/locale/tr.ini b/locale/tr.ini index 6edeb73e..32f77db5 100644 --- a/locale/tr.ini +++ b/locale/tr.ini @@ -192,7 +192,7 @@ unknown518 = sağ yön çubuğu unknown736 = Sonraki unknown732 = Önceki unknown622 = İstenen tüm alanları doldurmanız gerekmektedir. -s.tutorial.active_cuttingboard = Öğeyi buradan dilimlere ayırın +s.tutorial.active_cutting_board = Öğeyi buradan dilimlere ayırın s.tutorial.accept_order = Müşteriye yaklaşıp siparişini alın s.tutorial.interact_plate = Öğeyi bu tabağa ekleyin s.tutorial.interact = Burada etkileşime geçin diff --git a/locale/zh_Hans.ini b/locale/zh_Hans.ini index 89ae76b1..8c5e077b 100644 --- a/locale/zh_Hans.ini +++ b/locale/zh_Hans.ini @@ -241,7 +241,7 @@ s.state.game_aborted = 游戏被 {0} 中止。 s.state.overflow_resubscribe = 落后。一些客户端数据包被丢弃。 s.tutorial.accept_order = 上前接受顾客的订单 s.tutorial.active = 在此互动 {0}s -s.tutorial.active_cuttingboard = 在此处把物品切成片 +s.tutorial.active_cutting_board = 在此处把物品切成片 s.tutorial.clear_tile = 清除此地块 s.tutorial.error = 教程代码还不能处理此食谱。 s.tutorial.finished = 教程完成！ diff --git a/locale/zh_Hant.ini b/locale/zh_Hant.ini index eba0beac..e5215be0 100644 --- a/locale/zh_Hant.ini +++ b/locale/zh_Hant.ini @@ -220,7 +220,7 @@ s.state.abort_no_players = 由於缺少玩家，遊戲被中止。 s.state.game_aborted = 遊戲被 {0} 中止。 s.tutorial.accept_order = 接近顧客以接受他們的訂單 s.tutorial.active = 在此互動 {0} 秒 -s.tutorial.active_cuttingboard = 在此處將物品切成片狀 +s.tutorial.active_cutting_board = 在此處將物品切成片狀 s.tutorial.clear_tile = 清除此地塊 s.tutorial.error = 教程代碼還不能處理此食譜。 s.tutorial.finished = 教程已完成！ diff --git a/pixel-client/assets/tiles.ini b/pixel-client/assets/tiles.ini index f07840f8..8aa1c4d5 100644 --- a/pixel-client/assets/tiles.ini +++ b/pixel-client/assets/tiles.ini @@ -46,7 +46,7 @@ strawberry-crate=crate_back,strawberry~x8~y6,strawberry~y12~vflip~hflip,crate_fr counter=counter book=counter,book~x9~y17 -cuttingboard=counter,cutting_board +cutting-board=counter,cutting_board sink=counter,sink stove=counter,stove freezer=freezer diff --git a/server/editor/src/main.rs b/server/editor/src/main.rs index 4cba9e4a..506d79cf 100644 --- a/server/editor/src/main.rs +++ b/server/editor/src/main.rs @@ -75,7 +75,7 @@ const TILES: &[(&str, char, u8)] = &[ ("counter", 'c', 0), ("oven", 'd', 0), ("stove", 'e', 0), - ("cuttingboard", 'f', 0), + ("cutting-board", 'f', 0), ("chair", 'g', 1), ("table", 'h', 0), ("wall", 'i', 2), diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs index d0a45077..43df28f5 100644 --- a/server/src/entity/tutorial.rs +++ b/server/src/entity/tutorial.rs @@ -307,8 +307,8 @@ impl StepContext<'_> { self.aquire_item(*input)?; return Err(( Some(pos), - if self.ent.game.data.tile_name(*tile) == "cuttingboard" { - trm!("s.tutorial.active_cuttingboard") + if self.ent.game.data.tile_name(*tile) == "cutting-board" { + trm!("s.tutorial.active_cutting_board") } else { trm!("s.tutorial.active", s = format!("{:.01}", 1. / speed)) }, diff --git a/test-client/tiles.ts b/test-client/tiles.ts index 780af73f..0f5d34bb 100644 --- a/test-client/tiles.ts +++ b/test-client/tiles.ts @@ -127,7 +127,7 @@ const iref = (name: ItemName): Component => c => draw_item_sprite(c, name) const tref = (name: TileName): Component => c => TILES[name].forEach(f => f(c)) export type ItemName = string -export type TileName = "sink" | "conveyor" | "book" | "lettuce-crate" | "cheese-crate" | "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" +export type TileName = "sink" | "conveyor" | "book" | "lettuce-crate" | "cheese-crate" | "tomato-crate" | "steak-crate" | "flour-crate" | "leek-crate" | "rice-crate" | "fish-crate" | "coconut-crate" | "strawberry-crate" | "oven" | "cutting-board" | "stove" | "freezer" | "trash" | "grass" | "tree" | "wall" | "chair" | "floor" | "door" | "counter" | "wall-window" | "table" | "counter-window" | "path" | "lamp" | "street" const ITEMS: { [key in ItemName]: (c: string[]) => Component } = { "bun": () => circle(0.3, "#853e20"), @@ -191,7 +191,7 @@ const TILES: { [key in TileName]: Component[] } = { "path": [base("rgb(100, 80, 55)")], "conveyor": [base("rgb(107, 62, 128)")], "tree": [base("rgb(1, 82, 4)")], - "cuttingboard": [counter, rect(0.3, "rgb(158, 236, 68)", "rgb(158, 236, 68)", 0.2)], + "cutting-board": [counter, rect(0.3, "rgb(158, 236, 68)", "rgb(158, 236, 68)", 0.2)], "trash": [floor, circle(0.4, "rgb(20, 20, 20)"), cross(0.3, "rgb(90, 36, 36)")], "sink": [base("rgb(131, 129, 161)", "rgb(177, 174, 226)", 0.2)], "oven": [base("rgb(241, 97, 61)", "rgb(109, 84, 84)", 0.3)], |