diff --git a/simulator/conf.toml b/simulator/conf.toml index 7367e98..84ee812 100644 --- a/simulator/conf.toml +++ b/simulator/conf.toml @@ -1,11 +1,11 @@ -food_amount = 120 +food_amount = 920 red_count = 10 blu_count = 10 [weapon] -kills_user = false -model.type = "lazer" -model.range = 120 +kills_user = true +type = "forwardball" +radius = 90 [red_policy] aggressive = true diff --git a/simulator/src/main.rs b/simulator/src/main.rs index 6d22724..cd2f021 100644 --- a/simulator/src/main.rs +++ b/simulator/src/main.rs @@ -223,6 +223,7 @@ impl WeaponType { #[derive(Deserialize, Clone)] struct Weapon { kills_user: bool, + #[serde(flatten)] model: WeaponType, }