allow using neutrals units and statics

Fixes #65
rkusa · Sep 22, 2020 · 7c1c30a · 7c1c30a
1 parent 4db30d3
commit 7c1c30a
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.0-beta.3] - 2020-09-22
+
+### Fixed
+- Allow using neutral statics and units as ATIS/Weather/Broadcast stations #65
+
 ## [2.2.0-beta.2] - 2020-09-18
 
 ### Fixed

diff --git a/crates/datis-cmd/Cargo.toml b/crates/datis-cmd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datis-cmd"
-version = "2.2.0-beta.2"
+version = "2.2.0-beta.3"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

diff --git a/crates/datis-core/Cargo.toml b/crates/datis-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datis-core"
-version = "2.2.0-beta.2"
+version = "2.2.0-beta.3"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

diff --git a/crates/datis-module/Cargo.toml b/crates/datis-module/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datis"
-version = "2.2.0-beta.2"
+version = "2.2.0-beta.3"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

diff --git a/crates/datis-module/src/mission.rs b/crates/datis-module/src/mission.rs
@@ -86,13 +86,12 @@ pub fn extract(lua: &Lua) -> Result<Info, mlua::Error> {
 
         let mut mission_units = Vec::new();
 
-        let keys = vec!["blue", "red"];
-        for key in keys {
-            let coalition: LuaTable<'_> = coalitions.get(key)?;
+        for key in &["blue", "red", "neutrals"] {
+            let coalition: LuaTable<'_> = coalitions.get(*key)?;
             let countries: LuaTable<'_> = coalition.get("country")?;
 
             for country in countries.sequence_values::<LuaTable<'_>>() {
-                // `_current_mission.mission.coalition.{blue,red}.country[i].{static|plane|helicopter|vehicle|ship}.group[j]
+                // `_current_mission.mission.coalition.{blue,red,neutrals}.country[i].{static|plane|helicopter|vehicle|ship}.group[j]
                 let country = country?;
                 let keys = vec!["static", "plane", "helicopter", "vehicle", "ship"];
                 for key in keys {

diff --git a/crates/radio-station/Cargo.toml b/crates/radio-station/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dcs-radio-station"
-version = "2.2.0-beta.2"
+version = "2.2.0-beta.3"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

diff --git a/crates/srs/Cargo.toml b/crates/srs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "srs"
-version = "2.2.0-beta.2"
+version = "2.2.0-beta.3"
 authors = ["rkusa"]
 edition = "2018"
 

diff --git a/crates/win-media/Cargo.toml b/crates/win-media/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "win-media"
-version = "2.2.0-beta.2"
+version = "2.2.0-beta.3"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

diff --git a/crates/win-tts/Cargo.toml b/crates/win-tts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "win-tts"
-version = "2.2.0-beta.2"
+version = "2.2.0-beta.3"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

diff --git a/mod/Mods/services/DATIS/entry.lua b/mod/Mods/services/DATIS/entry.lua
@@ -5,7 +5,7 @@ declare_plugin("DATIS", {
     "datis.dll",
   },
 
-  version       = "2.2.0-beta.2",
+  version       = "2.2.0-beta.3",
   state         = "installed",
   developerName = "github.com/rkusa",
   info          = _("DATIS enables a DCS server with an SRS server running on the same machine (TCP=127.0.0.1) to get weather from the mission for stations and frequencies set in the mission editor, and then to report same in a standardized format over SRS using either the Amazon or Google text to speech engines."),