aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-07-14 18:20:05 +0200
committermetamuffin <metamuffin@disroot.org>2024-07-14 18:20:05 +0200
commit52f422a01be059a120908a8d1f63335116ccf0e1 (patch)
tree842583c89e8e179969133c8cee6c8a5a7127c237
parentbebbe65f7dfe276521fec438b70d77800bf98d18 (diff)
downloadhurrycurry-52f422a01be059a120908a8d1f63335116ccf0e1.tar
hurrycurry-52f422a01be059a120908a8d1f63335116ccf0e1.tar.bz2
hurrycurry-52f422a01be059a120908a8d1f63335116ccf0e1.tar.zst
imrove sushibar
-rw-r--r--data/maps/sushibar.yaml20
-rw-r--r--server/src/data/mod.rs17
-rw-r--r--server/src/entity/portal.rs17
-rw-r--r--server/src/state.rs3
4 files changed, 45 insertions, 12 deletions
diff --git a/data/maps/sushibar.yaml b/data/maps/sushibar.yaml
index b96dcafb..3dee515a 100644
--- a/data/maps/sushibar.yaml
+++ b/data/maps/sushibar.yaml
@@ -17,16 +17,16 @@ map:
- "*''''*''''*''''''''*''"
- "'''*'''''''**''''''''*"
- "''█████████████'X'''*'"
- - "''█R.....#c...█'''''**"
- - "''█T.....#c...d____'''"
- - "'*█F..S..#c...d____'*'"
- - "*'█L..S..#c...█''__'''"
- - "''█f..⌷..#c...█''__''*"
- - "*'█f..⌷..#c.~.█''__'*'"
- - "'*█o..C..#c...█''__''*"
- - "''█o..C..███d██''__'''"
- - "*'█s..........█''__'*'"
- - "'*█⌷ZZ⌷⌷⌷ggg⌷⌷█''__''*"
+ - "''█f.....#c...█'''''**"
+ - "''█f..⌷⌷.#c...d____'''"
+ - "'*█o..S⌷.#c...d____'*'"
+ - "*'█o..S⌷.#c...█''__'''"
+ - "''█R.....#c...█''__''*"
+ - "*'█T..⌷⌷.#c.~.█''__'*'"
+ - "'*█F..C⌷.#c...█''__''*"
+ - "''█L..C⌷.███d██''__'''"
+ - "*'█Z..........█''__'*'"
+ - "'*█Z⌷s⌷ggggg⌷⌷█''__''*"
- "*'█████████████''__'''"
- "'''*'''''''''''''_!'''"
- "'*''''''''''''''''''''"
diff --git a/server/src/data/mod.rs b/server/src/data/mod.rs
index 6df60535..0f1976b9 100644
--- a/server/src/data/mod.rs
+++ b/server/src/data/mod.rs
@@ -369,3 +369,20 @@ impl Gamedata {
.map(|(i, e)| (RecipeIndex(i), e))
}
}
+/*
+ Hurry Curry! - 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/>.
+
+*/ \ No newline at end of file
diff --git a/server/src/entity/portal.rs b/server/src/entity/portal.rs
index e0195b9f..092a8da5 100644
--- a/server/src/entity/portal.rs
+++ b/server/src/entity/portal.rs
@@ -1,3 +1,20 @@
+/*
+ Hurry Curry! - 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 super::EntityT;
use crate::{
data::Gamedata,
diff --git a/server/src/state.rs b/server/src/state.rs
index 215f9a1b..347e2a92 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -15,13 +15,12 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-use std::time::Duration;
-
use crate::{data::DataIndex, game::Game};
use anyhow::{anyhow, bail, Result};
use clap::{Parser, ValueEnum};
use hurrycurry_protocol::{Message, PacketC, PacketS, PlayerID};
use log::{debug, trace};
+use std::time::Duration;
use tokio::sync::broadcast::Sender;
pub struct State {