diff --git a/Cargo.lock b/Cargo.lock
index 54ca045..d4396e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2112,6 +2112,8 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
[[package]]
name = "literustlib"
version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "825b60cfd06131af4ce4fe3ffeb19971828ee0144c2a763ba4ea8038cc2f95af"
dependencies = [
"bytes",
"num_enum 0.7.4",
@@ -2120,6 +2122,8 @@ dependencies = [
[[package]]
name = "literustlib_server"
version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd813608da109eba2f247f1fcb770b5fdadf67b041f3f8fb9d0cc97ba52f6c8"
dependencies = [
"async-recursion",
"async-trait",
@@ -2974,6 +2978,8 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "polariton"
version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dcc388d509743a0419f5a5197a8c79e0f3fd484d5bd0b60e6f361887a8aa301"
dependencies = [
"tokio",
]
@@ -2981,6 +2987,8 @@ dependencies = [
[[package]]
name = "polariton_server"
version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51ea2a26537f7434f154e34d7c522ab10552442241e608e919d7cfc413ac3abc"
dependencies = [
"async-trait",
"log",
diff --git a/Cargo.toml b/Cargo.toml
index da4c730..fb5e181 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,10 +35,10 @@ libfj = { version = "0.8" }
log = "0.4"
env_logger = "0.11"
clap = { version = "4.5", features = [ "derive" ] }
-polariton = { version = "0.4", path = "../polariton", features = [ "tokio-async" ] }
-polariton_server = { version = "0.4", path = "../polariton/server", features = [ "tokio-async" ] }
-#polariton = { version = "0.3", features = [ "tokio-async" ] }
-#polariton_server = { version = "0.3", features = [ "tokio-async" ] }
+#polariton = { version = "0.4", path = "../polariton", features = [ "tokio-async" ] }
+#polariton_server = { version = "0.4", path = "../polariton/server", features = [ "tokio-async" ] }
+polariton = { version = "0.4", features = [ "tokio-async" ] }
+polariton_server = { version = "0.4", features = [ "tokio-async" ] }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"
async-trait = "0.1"
diff --git a/assets/robocraft/servenvmulti.config b/assets/robocraft/servenvmulti.config
index 7325f8c..c190b1a 100644
--- a/assets/robocraft/servenvmulti.config
+++ b/assets/robocraft/servenvmulti.config
@@ -43,9 +43,9 @@
:4539
domain_or_ip_address:4540
:4541
- https://domain_or_ip_address:8001/
- https://domain_or_ip_address:8010/live/data.json
- https://domain_or_ip_address:8011/
+ http://domain_or_ip_address:8001/
+ http://domain_or_ip_address:8010/live/data.json
+ http://domain_or_ip_address:8011/
domain_or_ip_address:4542
diff --git a/rc_core/src/persist/combat.rs b/rc_core/src/persist/combat.rs
index 7b7a9f7..d643a11 100644
--- a/rc_core/src/persist/combat.rs
+++ b/rc_core/src/persist/combat.rs
@@ -258,14 +258,14 @@ fn default_game_modes() -> GameModes {
},
pit: GameMode {
respawn_heal_duration: 20.0,
- respawn_full_heal_duration: 20.0,
+ respawn_full_heal_duration: 0.5,
kill_limit: 0,
game_time_m: 15,
},
team_deathmatch: GameMode {
respawn_heal_duration: 10.0,
respawn_full_heal_duration: 0.5,
- kill_limit: 2,
+ kill_limit: 10,
game_time_m: 10,
},
}
@@ -368,7 +368,7 @@ fn default_rotation() -> GameEventSequence {
GameEventSequence {
strategy: GameRotationStrategy::Sequence,
modes: vec![
- GameEvents {
+ /*GameEvents {
singleplayer: GameEvent {
map: GameMap::Earth1,
visibility: GameVisibility::Good,
@@ -382,8 +382,8 @@ fn default_rotation() -> GameEventSequence {
auto_heal: true,
},
duration_s: 5*60, // 5 minutes
- }
- /*GameEvents {
+ }*/
+ GameEvents {
singleplayer: GameEvent {
map: GameMap::Neptune1,
visibility: GameVisibility::Good,
@@ -393,7 +393,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Earth1,
visibility: GameVisibility::Poor,
- mode: GameType::SuddenDeath,
+ mode: GameType::Pit,
auto_heal: true,
},
duration_s: 5*60, // 5 minutes
@@ -408,7 +408,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Earth2,
visibility: GameVisibility::Good,
- mode: GameType::SuddenDeath,
+ mode: GameType::TeamDeathmatch,
auto_heal: true,
},
duration_s: 5*60,
@@ -423,7 +423,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Mars1,
visibility: GameVisibility::Poor,
- mode: GameType::SuddenDeath,
+ mode: GameType::BattleArena,
auto_heal: true,
},
duration_s: 5*60,
@@ -438,7 +438,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Mars2,
visibility: GameVisibility::Good,
- mode: GameType::SuddenDeath,
+ mode: GameType::TeamDeathmatch,
auto_heal: true,
},
duration_s: 5*60,
@@ -453,7 +453,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Mars3,
visibility: GameVisibility::Poor,
- mode: GameType::SuddenDeath,
+ mode: GameType::BattleArena,
auto_heal: true,
},
duration_s: 5*60,
@@ -468,7 +468,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Neptune1,
visibility: GameVisibility::Good,
- mode: GameType::SuddenDeath,
+ mode: GameType::TeamDeathmatch,
auto_heal: true,
},
duration_s: 5*60,
@@ -483,7 +483,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Neptune2,
visibility: GameVisibility::Poor,
- mode: GameType::SuddenDeath,
+ mode: GameType::BattleArena,
auto_heal: true,
},
duration_s: 5*60,
@@ -498,11 +498,11 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Neptune3,
visibility: GameVisibility::Good,
- mode: GameType::SuddenDeath,
+ mode: GameType::TeamDeathmatch,
auto_heal: true,
},
duration_s: 5*60,
- },*/
+ },
]
}
}
diff --git a/rc_core/src/persist/multiplayer.rs b/rc_core/src/persist/multiplayer.rs
index 6a8a8f6..a92b885 100644
--- a/rc_core/src/persist/multiplayer.rs
+++ b/rc_core/src/persist/multiplayer.rs
@@ -66,8 +66,8 @@ pub struct FakePlayerConf {
}
pub(super) fn default_fake_users() -> Vec {
- //Vec::default()
- vec![
+ Vec::default()
+ /*vec![
FakePlayerConf {
team: 1,
vehicle: super::garage::PrefabVehicle {
@@ -104,7 +104,7 @@ pub(super) fn default_fake_users() -> Vec {
},
implementation: ClientEmulation::ClientAI,
},
- ]
+ ]*/
}
#[derive(Serialize, Deserialize, Clone, Debug)]
diff --git a/rc_multiplayer/Cargo.toml b/rc_multiplayer/Cargo.toml
index 04d1ea8..9c223f3 100644
--- a/rc_multiplayer/Cargo.toml
+++ b/rc_multiplayer/Cargo.toml
@@ -21,8 +21,8 @@ atomic_float = "1.1"
num-quaternion.workspace = true
rand.workspace = true
-literustlib_server = { version = "0.2", path = "../../LiteRustLib/server" }
-literustlib = { version = "0.2", path = "../../LiteRustLib" }
-#literustlib_server = { version = "0.2" }
-#literustlib = { version = "0.2" }
+#literustlib_server = { version = "0.2", path = "../../LiteRustLib/server" }
+#literustlib = { version = "0.2", path = "../../LiteRustLib" }
+literustlib_server = { version = "0.2" }
+literustlib = { version = "0.2" }
rlnl = { version = "0.1", path = "../../rlnl" }