diff options
| -rw-r--r-- | client/export_presets.cfg | 70 | ||||
| -rw-r--r-- | data/map.yaml | 69 | ||||
| -rw-r--r-- | server/src/data.rs | 10 |
3 files changed, 106 insertions, 43 deletions
diff --git a/client/export_presets.cfg b/client/export_presets.cfg index 7a6cc0c4..c475e4b6 100644 --- a/client/export_presets.cfg +++ b/client/export_presets.cfg @@ -35,3 +35,73 @@ progressive_web_app/icon_144x144="" progressive_web_app/icon_180x180="" progressive_web_app/icon_512x512="" progressive_web_app/background_color=Color(0, 0, 0, 1) + +[preset.1] + +name="native-x86_64" +platform="Linux/X11" +runnable=true +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../../../../../tmp/undercooked.x86_64" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="" +ssh_remote_deploy/port="" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="" +ssh_remote_deploy/cleanup_script="" + +[preset.2] + +name="native-aarch64" +platform="Linux/X11" +runnable=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false + +[preset.2.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +binary_format/architecture="arm64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="" +ssh_remote_deploy/port="" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="" +ssh_remote_deploy/cleanup_script="" diff --git a/data/map.yaml b/data/map.yaml index 5ebf7a8b..8db4b753 100644 --- a/data/map.yaml +++ b/data/map.yaml @@ -1,49 +1,38 @@ # Undercooked - a game about cooking # Copyright 2024 metamuffin -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, version 3 of the License only. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -# +# map: - - "+-------------------+------|" - - "|ctc.ctc.ctc.ctc.ctc|#....s|" - - "|.....c.............|#....s|" - - "|c...c...+---www--dd+#.#.##|" - - "|tc.ctc..|#.C...ff..d..#..H|" - - "|c...c...|#.C.....~.d..#..R|" - - "|c.......w..########|#.#..T|" - - "|tc......w..........d..#..F|" - - "|c.....ct|#S#S#S##oo|###..X|" - - "+---dd---+----------+------|" - - "............................" - - ".........!.................." - - "............................" -# map: -# - "+--------------------+" -# - "|ctc.ctc.ctc.ctc.ctc.|" -# - "|.....c..............|" -# - "|c...c...+--www---dd-+" -# - "|tc.ctc..|ss...CC#..H|" -# - "|c...c...w........~.R|" -# - "|c.......w..######..T|" -# - "|tc......w..........F|" -# - "|c.....ct|#foo##SSS#X|" -# - "+---dd---+-----------+" -# - "......................" -# - ".........!............" -# - "......................" + - "'''''*'''*'''''*'''*'''*'''*''*'" + - "'''*''''*'*'**'''*''**''**''*'''" + - "''████████████████████████████*'" + - "''█ctc.ctc.ctc.ctc.ctc█⌷....s█**" + - "''█.....c.............█⌷....s█''" + - "'*█c...c...████www██dd█⌷.⌷.⌷⌷█*'" + - "*'█tc.ctc..█⌷.C...ff..d..⌷..H█''" + - "''█c...c...█⌷.C.....~.d..⌷..R█'*" + - "*'█c.......w..⌷⌷⌷⌷⌷⌷⌷⌷█⌷.⌷..T█*'" + - "'*█tc......w..........d..⌷..F█*'" + - "''█c.....ct█⌷S⌷S⌷S⌷⌷oo█⌷⌷⌷..X█*'" + - "*'████dd██████████████████████*'" + - "''''''__''''''''''''''''''''''''" + - "*'''''___________________!______" + - "''''''__________________________" + - "''''''''''''''''''''''''''''''''" tiles: - "#": counter + "⌷": counter "f": counter "t": table "w": window @@ -56,16 +45,16 @@ tiles: "F": flour-crate "H": leek-crate "X": trash - + "c": chair "~": floor - "!": floor ".": floor + "'": grass + "*": tree + "!": way + "_": way "d": door - - "+": wall - "-": wall - "|": wall + "█": wall items: "S": pot @@ -79,5 +68,9 @@ walkable: - door - floor - chair + - grass + - way + collider: - wall + - tree diff --git a/server/src/data.rs b/server/src/data.rs index a8b712b0..64509f37 100644 --- a/server/src/data.rs +++ b/server/src/data.rs @@ -1,19 +1,19 @@ /* Undercooked - a game about cooking Copyright 2024 metamuffin - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3 of the License only. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. - + */ use crate::{ interaction::Recipe, @@ -151,7 +151,7 @@ pub fn build_gamedata( let mut customer_spawn = Vec2::new(0., 0.); let mut initial_map = HashMap::new(); for (y, line) in map_in.map.iter().enumerate() { - for (x, tile) in line.trim().char_indices() { + for (x, tile) in line.trim().chars().enumerate() { let pos = IVec2::new(x as i32, y as i32); if tile == map_in.chef_spawn { chef_spawn = pos.as_vec2() + Vec2::splat(0.5); |