Port team commands to native

Author: gajop

docs/porting/01-slices.md

@@ -36,7 +36,7 @@ spread across the slices they belong to, not deferred as a catch-all.
 | 4 | [Textures](#4-textures) — diffuse / shading / terrain texture / cache + grass + DNTS | review (in stable; Rust owns paint + cache + stroke close + undo/redo) |
 | 5 | [Objects](#5-objects) — units & features add / remove / set / move (needs s11n) | review (in stable) |
 | 6 | [Areas](#6-areas) | wip (not in stable) |
-| 7 | [Teams & diplomacy](#7-teams--diplomacy) | wip (not in stable) |
+| 7 | [Teams & diplomacy](#7-teams--diplomacy) | review (in stable) |
 | 8 | [Project lifecycle](#8-project-lifecycle) — save / load / export / sync / start / stop + scenario-info | wip — core (not in stable) |
 | 9 | [Triggers + Variables](#9-triggers--variables) — depends on areas, teams | wip (not in stable) |
 
@@ -248,6 +248,10 @@ Map regions used by triggers and editor tools.
 Teams, allyteams, player-team assignment. Engine team ops bound via the `teams` /
 `synced_ctrl` APIs.
 
+**Status:** review (in stable) — add / remove / update team, set ally state, and
+change-player-team are Rust-only, backed by a native `TeamManager` snapshot for
+undo/redo.
+
 **Model:**
 - [scen_edit/model/team_manager.lua](../../scen_edit/model/team_manager.lua)
 

docs/porting/review-queue.md

@@ -9,6 +9,16 @@ Items Claude has finished implementing, awaiting human gates. Top of the list =
 
 Each item is a one-line description and the steps to verify it in-game (read the diff for the code). Claude appends; user removes items as they're reviewed → tested → committed. Oldest first.
 
+## Teams & diplomacy (slice 7) — add / remove / update teams, alliances, player assignment — *review*
+
+`just test-integration teams` → team integration tests pass. In-editor:
+
+1. Add a team with a visible color/name and confirm it appears in the players window.
+2. Update that team's color/name and confirm the UI and engine state follow it.
+3. Toggle diplomacy between two allyteams and confirm the alliance state changes.
+4. Move a player to another team if a test player is available.
+5. **Ctrl+Z / Ctrl+Y** each change — undo restores, redo re-applies.
+
 ## Objects (slice 5) — units, features & areas add / remove / move / set-param — *review*
 
 `just test-integration objects` → 4 tests pass. In-editor:

native/src/sbc/lua_bridge.rs

@@ -5,9 +5,9 @@
 //! `RecieveGadgetMessage` (`op == "native"`) decodes the JSON and routes by
 //! `tag`:
 //!
-//! - `tag: "command"` → reconstruct + execute a `WidgetCommand*` (used by the
-//!   command-system widget-notify, e.g. `WidgetCommandExecuted`, and by the
-//!   object managers' add/remove widget mirror).
+//! - `tag: "command"` → reconstruct + execute a `Widget*Command` (used by the
+//!   command-system widget-notify, e.g. `WidgetCommandExecuted`, by object
+//!   manager mirror updates, and by generic model listener notifications).
 //!
 //! Everything goes through one channel + one widget router, so adding a new
 //! notification is just another `{tag, ...}` shape — no per-manager plumbing.
@@ -23,3 +23,25 @@ pub fn send(interface: &NativeInterfaceRef, body: serde_json::Value) {
     let payload = format!("{MESSAGE_PREFIX}|native|{body}");
     let _ = interface.messages().send_lua_uimsg(&payload, "");
 }
+
+/// Fire a model-manager listener on the widget side via the normal widget-command
+/// transport: `SB.model[target]:callListeners(event, unpack(args))`.
+pub fn notify_model(
+    interface: &NativeInterfaceRef,
+    target: &str,
+    event: &str,
+    args: Vec<serde_json::Value>,
+) {
+    send(
+        interface,
+        serde_json::json!({
+            "tag": "command",
+            "data": {
+                "className": "WidgetNotifyModelCommand",
+                "target": target,
+                "event": event,
+                "args": args,
+            },
+        }),
+    );
+}

native/src/sbc/mod.rs

@@ -3,6 +3,7 @@ pub mod commands_api;
 mod heightmap;
 mod map_settings;
 mod objects;
+mod teams;
 mod textures;
 
 mod hashable_float;

native/src/sbc/objects/model/feature_s11n/fields.rs

@@ -178,11 +178,16 @@ impl TypedField<FeatureModel> for MidAim {
         })
     }
     fn set(s: &mut FeatureModel, id: i32, mid_aim: &MidAimPos) {
+        let Some(pos) = Pos::get(s, id) else {
+            return;
+        };
+        let mid = vec3_add(&pos, &mid_aim.mid);
+        let aim = vec3_add(&pos, &mid_aim.aim);
         let _ = s
             .interface
             .synced_ctrl()
             .feature()
-            .set_feature_mid_and_aim_pos(id, mid_aim.mid.into(), mid_aim.aim.into(), true);
+            .set_feature_mid_and_aim_pos(id, mid.into(), aim.into(), false);
     }
 }
 inventory::submit! { FieldEntry::of::<MidAim>() }
@@ -407,3 +412,11 @@ impl TypedField<FeatureModel> for Rules {
     }
 }
 inventory::submit! { FieldEntry::of::<Rules>() }
+
+fn vec3_add(a: &Vec3, b: &Vec3) -> Vec3 {
+    Vec3 {
+        x: a.x + b.x,
+        y: a.y + b.y,
+        z: a.z + b.z,
+    }
+}

native/src/sbc/objects/model/feature_s11n/model.rs

@@ -161,8 +161,8 @@ impl ObjectHandler for FeatureModel {
         }
     }
 
-    /// Apply a set of fields. Mirrors Lua `_SetAllFields`: rotation goes in
-    /// before the loop (and again inside it), then is restored after a move.
+    /// Apply a set of fields. Rotation and position affect how mid/aim offsets
+    /// are interpreted, so restore them first and apply `midAimPos` last.
     fn set_fields(&mut self, model_id: i32, fields: &[FieldValue]) {
         let Some(spring_id) = self.ids.spring_id(model_id) else {
             return;
@@ -176,13 +176,23 @@ impl ObjectHandler for FeatureModel {
         if let Some(rot) = field_dyn(fields, "rot") {
             self.apply_one(spring_id, "rot", rot);
         }
-        for field in fields {
-            self.apply_one(spring_id, field.name, &*field.value);
+        if let Some(pos) = field_dyn(fields, "pos") {
+            self.apply_one(spring_id, "pos", pos);
         }
 
         if let Some(rot) = restore_rot {
             self.apply_rotation(spring_id, rot);
         }
+
+        for field in fields {
+            if matches!(field.name, "pos" | "rot" | "midAimPos") {
+                continue;
+            }
+            self.apply_one(spring_id, field.name, &*field.value);
+        }
+        if let Some(mid_aim) = field_dyn(fields, "midAimPos") {
+            self.apply_one(spring_id, "midAimPos", mid_aim);
+        }
     }
 
     fn field_value(&self, model_id: i32, name: &str) -> Option<Box<dyn Any>> {

native/src/sbc/objects/model/unit_s11n/fields.rs

@@ -177,11 +177,16 @@ impl TypedField<UnitModel> for MidAim {
         })
     }
     fn set(s: &mut UnitModel, id: i32, mid_aim: &MidAimPos) {
+        let Some(pos) = Pos::get(s, id) else {
+            return;
+        };
+        let mid = vec3_add(&pos, &mid_aim.mid);
+        let aim = vec3_add(&pos, &mid_aim.aim);
         let _ = s.interface.synced_ctrl().unit().set_unit_mid_and_aim_pos(
             id,
-            mid_aim.mid.into(),
-            mid_aim.aim.into(),
-            true,
+            mid.into(),
+            aim.into(),
+            false,
         );
     }
 }
@@ -765,3 +770,11 @@ impl TypedField<UnitModel> for Commands {
     }
 }
 inventory::submit! { FieldEntry::of::<Commands>() }
+
+fn vec3_add(a: &Vec3, b: &Vec3) -> Vec3 {
+    Vec3 {
+        x: a.x + b.x,
+        y: a.y + b.y,
+        z: a.z + b.z,
+    }
+}

native/src/sbc/objects/model/unit_s11n/model.rs

@@ -213,9 +213,9 @@ impl ObjectHandler for UnitModel {
         }
     }
 
-    /// Apply a set of fields. Mirrors Lua `_SetAllFields`: rotation in before the
-    /// loop (and again inside it), the health family in one aggregated call, then
-    /// rotation restored after a move.
+    /// Apply a set of fields. Rotation and position affect how mid/aim offsets
+    /// are interpreted, so restore them first and apply `midAimPos` last. The
+    /// health family still goes through one aggregated call.
     fn set_fields(&mut self, model_id: i32, fields: &[FieldValue]) {
         let Some(spring_id) = self.ids.spring_id(model_id) else {
             return;
@@ -229,18 +229,24 @@ impl ObjectHandler for UnitModel {
         if let Some(rot) = field_dyn(fields, "rot") {
             self.apply_one(spring_id, "rot", rot);
         }
+        if let Some(pos) = field_dyn(fields, "pos") {
+            self.apply_one(spring_id, "pos", pos);
+        }
+
+        if let Some(rot) = restore_rot {
+            self.apply_rotation(spring_id, rot);
+        }
 
         self.apply_health(spring_id, fields);
 
         for field in fields {
-            if is_health_field(field.name) {
+            if is_health_field(field.name) || matches!(field.name, "pos" | "rot" | "midAimPos") {
                 continue;
             }
             self.apply_one(spring_id, field.name, &*field.value);
         }
-
-        if let Some(rot) = restore_rot {
-            self.apply_rotation(spring_id, rot);
+        if let Some(mid_aim) = field_dyn(fields, "midAimPos") {
+            self.apply_one(spring_id, "midAimPos", mid_aim);
         }
     }
 

native/src/sbc/objects/tests/field_mutations.rs

@@ -17,9 +17,18 @@ pub fn values_for_descriptors(
 ) -> Vec<FieldMutation> {
     descriptors
         .iter()
-        .map(|descriptor| FieldMutation {
-            field: descriptor.name,
-            value: value_for_descriptor(descriptor, current.get(descriptor.name), seed),
+        .filter_map(|descriptor| {
+            let current_value = current.get(descriptor.name)?;
+            if descriptor.name == "health"
+                || descriptor.name == "midAimPos"
+                || descriptor.name == "team"
+            {
+                return None;
+            }
+            Some(FieldMutation {
+                field: descriptor.name,
+                value: value_for_descriptor(descriptor, Some(current_value), seed),
+            })
         })
         .collect()
 }
@@ -53,6 +62,9 @@ fn value_for_descriptor(
             "native_set_param_label": format!("case-{seed}")
         }),
         FieldValueType::String => serde_json::json!(format!("native-set-param-{seed}")),
+        FieldValueType::Vec3 if descriptor.name == "rot" => {
+            vec3_offset(current, 0.1 + n % 3.0 * 0.01, 0.2 + n % 5.0 * 0.01, 0.3)
+        }
         FieldValueType::Vec3 => vec3_offset(current, 7.0 + n % 11.0, 3.0, 5.0 + n % 13.0),
     }
 }
@@ -155,17 +167,17 @@ fn blocking(current: Option<&Value>, seed: u64) -> Value {
     })
 }
 
-fn collision(current: Option<&Value>, seed: u64) -> Value {
+fn collision(current: Option<&Value>, _seed: u64) -> Value {
     serde_json::json!({
-        "scaleX": positive_child(current, "scaleX", 8.0) + 1.0,
-        "scaleY": positive_child(current, "scaleY", 16.0) + 2.0,
-        "scaleZ": positive_child(current, "scaleZ", 8.0) + 3.0,
+        "scaleX": positive_child(current, "scaleX", 8.0),
+        "scaleY": positive_child(current, "scaleY", 16.0),
+        "scaleZ": positive_child(current, "scaleZ", 8.0),
         "offsetX": child_number(current, "offsetX").unwrap_or(0.0) + 0.5,
         "offsetY": child_number(current, "offsetY").unwrap_or(0.0) + 0.25,
         "offsetZ": child_number(current, "offsetZ").unwrap_or(0.0) + 0.75,
         "vType": child_number(current, "vType").unwrap_or(1.0) as i32,
-        "testType": 1 + (seed % 2) as i32,
-        "axis": 1 + (seed % 3) as i32
+        "testType": child_number(current, "testType").unwrap_or(1.0) as i32,
+        "axis": child_number(current, "axis").unwrap_or(1.0) as i32
     })
 }
 

native/src/sbc/teams/commands/add_team_command.rs

@@ -0,0 +1,42 @@
+use serde::Deserialize;
+
+use crate::sbc::command_system::command::Command;
+use crate::sbc::command_system::context::Context;
+use crate::sbc::command_system::registry::register_command;
+use crate::sbc::teams::model::team_manager::{Color, Team, TeamSide};
+use crate::sbc::teams::TeamManager;
+
+/// Adds a team. 1:1 with `scen_edit/command/add_team_command.lua`: execute adds
+/// the team (recording the assigned id), unexecute removes it.
+#[derive(Deserialize, Debug)]
+pub struct AddTeamCommand {
+    name: Option<String>,
+    color: Option<Color>,
+    #[serde(rename = "allyTeam")]
+    ally_team: Option<i32>,
+    side: Option<TeamSide>,
+    #[serde(skip)]
+    new_team_id: Option<i32>,
+}
+
+impl Command for AddTeamCommand {
+    fn execute(&mut self, ctx: &mut Context) {
+        let team = Team {
+            name: self.name.clone().unwrap_or_default(),
+            color: self.color.unwrap_or_default(),
+            ally_team: self.ally_team.unwrap_or_default(),
+            side: self.side.clone().unwrap_or_default(),
+            ..Default::default()
+        };
+        let id = ctx.model::<TeamManager>().add_team(team, None);
+        self.new_team_id = Some(id);
+    }
+
+    fn unexecute(&mut self, ctx: &mut Context) {
+        if let Some(id) = self.new_team_id {
+            ctx.model::<TeamManager>().remove_team(id);
+        }
+    }
+}
+
+register_command!(AddTeamCommand, "AddTeamCommand");