diff options
author | metamuffin <metamuffin@disroot.org> | 2024-07-08 15:10:29 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-07-08 15:10:29 +0200 |
commit | ddcf22c1d6054c8571fb9ba4def90f42d6d30240 (patch) | |
tree | df808911a9e4540a5fa186fa956efbac664208b0 | |
parent | b5bd610022dbd4348467af6c1be2135c1dc48f99 (diff) | |
download | hurrycurry-ddcf22c1d6054c8571fb9ba4def90f42d6d30240.tar hurrycurry-ddcf22c1d6054c8571fb9ba4def90f42d6d30240.tar.bz2 hurrycurry-ddcf22c1d6054c8571fb9ba4def90f42d6d30240.tar.zst |
Rebrand to Hurry Curry!
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | COPYING | 2 | ||||
-rw-r--r-- | Cargo.lock | 46 | ||||
-rw-r--r-- | client/export_presets.cfg | 16 | ||||
-rw-r--r-- | client/menu/credits.gd | 2 | ||||
-rw-r--r-- | client/menu/ingame.tscn | 2 | ||||
-rw-r--r-- | client/menu/main.gd | 2 | ||||
-rw-r--r-- | client/menu/main.tscn | 2 | ||||
-rw-r--r-- | client/po/de.po | 8 | ||||
-rw-r--r-- | client/project.godot | 2 | ||||
-rw-r--r-- | client/server.gd | 2 | ||||
-rw-r--r-- | data/makefile | 2 | ||||
-rw-r--r-- | makefile | 2 | ||||
-rw-r--r-- | protocol.md | 2 | ||||
-rw-r--r-- | readme.md | 4 | ||||
-rw-r--r-- | server/Cargo.toml | 6 | ||||
-rw-r--r-- | server/examples/client.rs | 2 | ||||
-rw-r--r-- | server/src/bin/graph.rs | 2 | ||||
-rw-r--r-- | server/src/main.rs | 8 | ||||
-rw-r--r-- | specs/00.Introduction.md | 18 | ||||
-rw-r--r-- | test-client/index.html | 2 |
21 files changed, 67 insertions, 67 deletions
@@ -2,6 +2,6 @@ /test-client/*.js /specs/*.html .godot -undercooked.pot +hurrycurry.pot *.mo /client/menu/book/book_*.svg* @@ -1,4 +1,4 @@ -undercooked - A game +Hurry Curry! - a game about cooking Copyright (C) 2024 metamuffin This program is free software: you can redistribute it and/or modify @@ -131,9 +131,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" +checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2" [[package]] name = "cfg-if" @@ -395,6 +395,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] +name = "hurrycurry-server" +version = "0.2.0" +dependencies = [ + "anyhow", + "clap", + "env_logger", + "fake", + "futures-util", + "glam", + "log", + "pollster", + "rand 0.9.0-alpha.1", + "serde", + "serde_json", + "serde_yaml", + "shlex", + "tokio", + "tokio-tungstenite", +] + +[[package]] name = "indexmap" version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -864,27 +885,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "undercooked" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "env_logger", - "fake", - "futures-util", - "glam", - "log", - "pollster", - "rand 0.9.0-alpha.1", - "serde", - "serde_json", - "serde_yaml", - "shlex", - "tokio", - "tokio-tungstenite", -] - -[[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/client/export_presets.cfg b/client/export_presets.cfg index 15bab5f4..5a1cb7f4 100644 --- a/client/export_presets.cfg +++ b/client/export_presets.cfg @@ -332,8 +332,8 @@ architectures/x86=false architectures/x86_64=false version/code=1 version/name="" -package/unique_name="org.metamuffin.undercooked.client" -package/name="Undercooked" +package/unique_name="org.metamuffin.hurrycurry.client" +package/name="Hurry Curry!" package/signed=true package/app_category=2 package/retain_data_on_uninstall=false @@ -535,8 +535,8 @@ architectures/x86=false architectures/x86_64=false version/code=1 version/name="" -package/unique_name="org.metamuffin.undercooked.client" -package/name="Undercooked" +package/unique_name="org.metamuffin.hurrycurry.client" +package/name="Hurry Curry!" package/signed=true package/app_category=2 package/retain_data_on_uninstall=false @@ -738,8 +738,8 @@ architectures/x86=false architectures/x86_64=true version/code=1 version/name="" -package/unique_name="org.metamuffin.undercooked.client" -package/name="Undercooked" +package/unique_name="org.metamuffin.hurrycurry.client" +package/name="Hurry Curry!" package/signed=true package/app_category=2 package/retain_data_on_uninstall=false @@ -941,8 +941,8 @@ architectures/x86=true architectures/x86_64=false version/code=1 version/name="" -package/unique_name="org.metamuffin.undercooked.client" -package/name="Undercooked" +package/unique_name="org.metamuffin.hurrycurry.client" +package/name="Hurry Curry!" package/signed=true package/app_category=2 package/retain_data_on_uninstall=false diff --git a/client/menu/credits.gd b/client/menu/credits.gd index 059c1ba3..bca320a1 100644 --- a/client/menu/credits.gd +++ b/client/menu/credits.gd @@ -37,7 +37,7 @@ func _ready(): super() contributors.shuffle() label.text = "[center][b]" - label.text += tr("undercooked - a game about cooking") + label.text += tr("Hurry Curry! - a game about cooking") label.text += "[/b]\n\n" label.text += tr("developed by") label.text += "\n\n[b]" diff --git a/client/menu/ingame.tscn b/client/menu/ingame.tscn index 0ed86884..029a4d6a 100644 --- a/client/menu/ingame.tscn +++ b/client/menu/ingame.tscn @@ -91,7 +91,7 @@ theme_override_colors/font_outline_color = Color(0.566408, 0.208917, 0.266045, 1 theme_override_constants/outline_size = 10 theme_override_fonts/font = SubResource("FontVariation_ud3l8") theme_override_font_sizes/font_size = 48 -text = "Undercooked" +text = "Hurry Curry!" [node name="Spacer" type="Control" parent="Side/Margin/Options"] custom_minimum_size = Vector2(0, 10) diff --git a/client/menu/main.gd b/client/menu/main.gd index 5df8f278..9fe026fe 100644 --- a/client/menu/main.gd +++ b/client/menu/main.gd @@ -51,7 +51,7 @@ func _on_quick_connect_pressed(): : `ws://${window.location.hostname}:27032/` """)) else: - connect_to("wss://undercooked.metamuffin.org/") + connect_to("wss://hurrycurry.metamuffin.org/") func connect_to(url): print("Connecting to %s" % url) diff --git a/client/menu/main.tscn b/client/menu/main.tscn index b36e1ddb..ca77c09d 100644 --- a/client/menu/main.tscn +++ b/client/menu/main.tscn @@ -50,7 +50,7 @@ theme_override_colors/font_outline_color = Color(0.566408, 0.208917, 0.266045, 1 theme_override_constants/outline_size = 10 theme_override_fonts/font = SubResource("FontVariation_htgmg") theme_override_font_sizes/font_size = 48 -text = "Undercooked" +text = "Hurry Curry!" [node name="spacer" type="Control" parent="side/margin/options"] custom_minimum_size = Vector2(0, 10) diff --git a/client/po/de.po b/client/po/de.po index 5923ca44..da5ccca2 100644 --- a/client/po/de.po +++ b/client/po/de.po @@ -1,4 +1,4 @@ -# LANGUAGE translation for undercooked for the following files: +# LANGUAGE translation for hurrycurry for the following files: # res://menu/main_menu.tscn # # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: undercooked\n" +"Project-Id-Version: hurrycurry\n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: nokoe\n" @@ -235,8 +235,8 @@ msgid "Back" msgstr "Zurück" #: menu/credits.tscn -msgid "undercooked - a game about cooking" -msgstr "undercooked - ein Spiel rund ums Kochen" +msgid "Hurry Curry! - a game about cooking" +msgstr "Hurry Curry! - ein Spiel rund ums Kochen" #: menu/credits.tscn msgid "developed by" diff --git a/client/project.godot b/client/project.godot index d9267dc9..8305554e 100644 --- a/client/project.godot +++ b/client/project.godot @@ -10,7 +10,7 @@ config_version=5 [application] -config/name="undercooked" +config/name="hurrycurry" run/main_scene="res://menu/entry.tscn" config/quit_on_go_back=false config/features=PackedStringArray("4.2", "Forward Plus") diff --git a/client/server.gd b/client/server.gd index f2d23877..3529e7e4 100644 --- a/client/server.gd +++ b/client/server.gd @@ -89,7 +89,7 @@ func get_server_path() -> String: if path != "": return path else: - return "undercooked-server" + return "hurrycurry-server" func get_server_data(): var path: String = Global.get_setting("server_data") diff --git a/data/makefile b/data/makefile index ce6ac2c2..c9d0ee8a 100644 --- a/data/makefile +++ b/data/makefile @@ -1,4 +1,4 @@ -# Undercooked - a game about cooking +# Hurry Curry! - a game about cooking # Copyright 2024 metamuffin # # This program is free software: you can redistribute it and/or modify @@ -7,4 +7,4 @@ clean: client/menu/book/book_1.svg: @echo Downloading recipe book... @mkdir -p client/menu/book - @curl -L https://s.metamuffin.org/static/undercooked/book.svg.tar.zst | tar -xC client/menu/book + @curl -L https://s.metamuffin.org/static/hurrycurry/book.svg.tar.zst | tar -xC client/menu/book diff --git a/protocol.md b/protocol.md index 3b1fd87b..bfb4ece8 100644 --- a/protocol.md +++ b/protocol.md @@ -16,7 +16,7 @@ --> -# undercooked protocol +# Hurry Curry! protocol The protocol schema is defined in [`protocol.ts`](./test-client/protocol.ts) @@ -1,4 +1,4 @@ -# undercooked +# Hurry Curry! A cooperative multiplayer game about cooking. @@ -23,7 +23,7 @@ A cooperative multiplayer game about cooking. ### Usage -- Run the server: `./target/release/undercooked-server` +- Run the server: `./target/release/hurrycurry-server` ## Test Client diff --git a/server/Cargo.toml b/server/Cargo.toml index 3b1b0a4c..6b9037ac 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "undercooked" -version = "0.1.0" +name = "hurrycurry-server" +version = "0.2.0" edition = "2021" -default-run = "undercooked" +default-run = "hurrycurry-server" [dependencies] glam = { version = "0.28.0", features = ["serde"] } diff --git a/server/examples/client.rs b/server/examples/client.rs index a3c31359..487c9738 100644 --- a/server/examples/client.rs +++ b/server/examples/client.rs @@ -22,7 +22,7 @@ use std::{ }; use glam::Vec2; -use undercooked::protocol::{PacketC, PacketS}; +use hurrycurry_server::protocol::{PacketC, PacketS}; fn main() { let mut sock = TcpStream::connect("127.0.0.1:27031").unwrap(); diff --git a/server/src/bin/graph.rs b/server/src/bin/graph.rs index 8776920f..ace1b676 100644 --- a/server/src/bin/graph.rs +++ b/server/src/bin/graph.rs @@ -16,7 +16,7 @@ */ use anyhow::{anyhow, Result}; -use undercooked::{ +use hurrycurry_server::{ data::{DataIndex, Demand}, interaction::Recipe, protocol::{ItemIndex, RecipeIndex}, diff --git a/server/src/main.rs b/server/src/main.rs index 7f7fe381..99834fbd 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -27,7 +27,7 @@ use tokio::{ time::interval, }; use tokio_tungstenite::tungstenite::Message; -use undercooked::{ +use hurrycurry_server::{ data::DATA_DIR, protocol::{PacketC, PacketS, PlayerID}, state::State, @@ -57,9 +57,9 @@ fn main() -> Result<()> { let data_dir = PathBuf::from_str( [ args.data_dir.to_str().unwrap(), - "/usr/local/share/undercooked/data", - "/usr/share/undercooked/data", - "/opt/undercooked/data", + "/usr/local/share/hurrycurry/data", + "/usr/share/hurrycurry/data", + "/opt/hurrycurry/data", ] .into_iter() .find(|p| PathBuf::from_str(p).unwrap().join("index.yaml").exists()) diff --git a/specs/00.Introduction.md b/specs/00.Introduction.md index 5d7d4bf9..9360ec56 100644 --- a/specs/00.Introduction.md +++ b/specs/00.Introduction.md @@ -16,12 +16,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. --> -# Undercooked
-
-A cooperative fast-paced game about running a restaurant together.
-
-# Alt Names
-- Undercooked
-- Flussigstätte
-- Das Geölterestaurant
-- Counter Strike: Kitchen Offensive
+# Hurry Curry! + +A cooperative fast-paced game about running a restaurant together. + +# Alt Names +- Undercooked +- Flussigstätte +- Das Geölterestaurant +- Counter Strike: Kitchen Offensive diff --git a/test-client/index.html b/test-client/index.html index 5504fb64..5b0fb206 100644 --- a/test-client/index.html +++ b/test-client/index.html @@ -20,7 +20,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Undercooked - Test Client</title> + <title>Hurry Curry - Test Client</title> <script src="./main.js" type="module"></script> <style> body { |