diff options
| -rw-r--r-- | data/demands.yaml | 2 | ||||
| -rw-r--r-- | data/map.yaml | 6 | ||||
| -rw-r--r-- | data/recipes.ts | 11 | ||||
| -rw-r--r-- | test-client/tiles.ts | 15 |
4 files changed, 24 insertions, 10 deletions
diff --git a/data/demands.yaml b/data/demands.yaml index d7211be4..5752ab52 100644 --- a/data/demands.yaml +++ b/data/demands.yaml @@ -8,4 +8,4 @@ - { from: bread-sliced-tomato-steak-plate, to: dirty-plate, duration: 20 } -- { from: tomato-soop-plate, to: dirty-plate, duration: 15 } +- { from: tomato-soop-plate, to: dirty-plate, duration: 20 } diff --git a/data/map.yaml b/data/map.yaml index 61e31e40..94150de0 100644 --- a/data/map.yaml +++ b/data/map.yaml @@ -3,11 +3,11 @@ map: - "|ctc.ctc.ctc.ctc.ctc.|" - "|.....c..............|" - "|c...c...+--www---dd-+" - - "|tc.ctc..|ss...CC#..X|" + - "|tc.ctc..|ss...CC#..H|" - "|c...c...w........~.R|" - "|c.......w..######..T|" - "|tc......w..........F|" - - "|c.....ct|#moo##SSS##|" + - "|c.....ct|#moo##SSS#X|" - "+---dd---+-----------+" - "......................" - ".........!............" @@ -25,7 +25,7 @@ tiles: "R": raw-steak-crate "T": tomato-crate "F": flour-crate - "D": dirty-plate-crate + "H": herbs-crate "X": trash "c": chair diff --git a/data/recipes.ts b/data/recipes.ts index c5569a58..04cccf16 100644 --- a/data/recipes.ts +++ b/data/recipes.ts @@ -61,7 +61,7 @@ function crate(item: string) { function get_container(ifull: string): [string, string | null] { const iparts = ifull.split("-") const ic = iparts.pop() - if (ic && iparts.length && ["pot", "plate"].includes(ic)) return [iparts.join("-"), ic] + if (ic && iparts.length && ["pot", "plate", "mixer"].includes(ic)) return [iparts.join("-"), ic] return [ifull, null] } @@ -96,16 +96,16 @@ function combine(container: string, ...inputs: string[]) { } } -out({ action: "active", duration: 3, inputs: ["flour"], outputs: ["dough"] }) out({ action: "active", duration: 2, tile: "sink", inputs: ["dirty-plate"], outputs: ["plate"] }) crate("tomato") crate("raw-steak") -crate("dirty-plate") +crate("flour") +crate("herbs") + cut("tomato") cook("raw-steak", "steak") combine("plate", "steak-pot", "sliced-tomato", "bread") -auto_trash() mix("flour", "dough") out({ action: "instant", inputs: ["dough-mixer"], outputs: ["mixer", "dough"] }) @@ -114,5 +114,6 @@ bake("dough", "bread") mix("tomato") combine("pot", "herbs", "tomato-juice-mixer") cook("herbs-tomato-juice-pot", "tomato-soop") -out({ action: "instant", tile: "sink", inputs: ["tomato-soop-pot", "plate"], outputs: ["pot", "tomato-soop-plate"] }) +out({ action: "instant", inputs: ["tomato-soop-pot", "plate"], outputs: ["pot", "tomato-soop-plate"] }) +auto_trash() diff --git a/test-client/tiles.ts b/test-client/tiles.ts index 42fba268..618d6573 100644 --- a/test-client/tiles.ts +++ b/test-client/tiles.ts @@ -93,20 +93,32 @@ const door: Component = c => { const plate = [circle(0.4, "#b6b6b6", "#f7f7f7", 0.02)]; const pot = [circle(0.35, "rgb(29, 29, 29)", "rgb(39, 39, 39)", 0.04)]; +const mixer = [circle(0.35, "rgb(86, 168, 189)", "rgb(88, 222, 255)", 0.04)]; const burned = [circle(0.3, "rgb(61, 18, 0)"), cross(0.2, "red", 0.02)] export const FALLBACK_ITEM: Component[] = [circle(0.3, "#f0f")]; export const ITEMS: { [key: string]: Component[] } = { "pot": pot, + "mixer": mixer, + "herbs": [circle(0.3, "rgb(50, 133, 17)")], + "herbs-mixer": [...mixer, circle(0.3, "rgb(50, 133, 17)")], "raw-steak": [circle(0.3, "#cc3705")], "raw-steak-pot": [...pot, circle(0.3, "#cc3705")], "steak-pot": [...pot, circle(0.3, "#702200")], "burned-pot": [...pot, ...burned], "steak": [circle(0.3, "#702200")], "flour": [circle(0.3, "#d8c9c2")], + "flour-mixer": [...mixer, circle(0.3, "#d8c9c2")], "dough": [circle(0.3, "#b38d7d")], + "dough-mixer": [...mixer, circle(0.3, "#b38d7d")], "bread": [circle(0.3, "#853e20")], "tomato": [circle(0.3, "#d63838")], + "tomato-mixer": [...mixer, circle(0.3, "#d63838")], + "tomato-juice-mixer": [...mixer, circle(0.3, "#b80000")], + "tomato-juice-pot": [...pot, circle(0.3, "#b80000")], + "herbs-tomato-juice-pot": [...pot, circle(0.3, "#dd5800")], + "tomato-soop-pot": [...pot, circle(0.3, "#ff2600")], + "tomato-soop-plate": [...plate, circle(0.3, "#ff2600")], "burned": burned, "sliced-tomato": [circle(0.3, "#d16363", "#d63838", 0.08)], "plate": plate, @@ -140,8 +152,9 @@ export const TILES: { [key: string]: Component[] } = { "sink": [base("rgb(131, 129, 161)", "rgb(177, 174, 226)", 0.2)], "oven": [base("rgb(241, 97, 61)", "rgb(109, 84, 84)", 0.3)], "stove": [...counter, circle(0.4, "#444", "#999")], + "flour-crate": crate("flour"), - "dirty-plate-crate": crate("dirty-plate"), "raw-steak-crate": crate("raw-steak"), "tomato-crate": crate("tomato"), + "herbs-crate": crate("herbs"), } |