#27: Update initial implementation for remote weapon structure

Author: danilko

agents/AIAgent.cs

@@ -43,6 +43,7 @@ public class Agent : KinematicBody2D
 
     public int RightWeaponAction { set; get; }
     public int LeftWeaponAction { set; get; }
+    public int RemoteWeaponAction  { set; get; }
     protected List<Weapon> RightWeapons;
     protected List<Weapon> LeftWeapons;
 
@@ -93,6 +94,8 @@ public class Agent : KinematicBody2D
 
     protected Agent CurrentTargetAgent;
 
+    protected RemoteWeaponManager RemoteWeaponManager = null;
+
     public enum EngineType {
         Battery,
         NuclearReactor
@@ -129,7 +132,7 @@ public override void _Ready()
         CurrentWeaponIndex.Add(Weapon.WeaponOrder.Right, 0);
 
         EmitSignal(nameof(HealthChangedSignal), _health * 100 / MaxHealth);
-        EmitSignal(nameof(EnergyChangedSignal), _health * 100 / MaxHealth);
+        EmitSignal(nameof(EnergyChangedSignal), _energy * 100 / MaxEnergy);
 
         DetectionZone = (DetectionZone)(GetNode("DetectionZone"));
 
@@ -152,15 +155,25 @@ public Inventory GetInventory()
     }
 
     public void SetEngineType(EngineType engineType)
+    {
+        Rpc(nameof(_clientSetEngineTypeClient), engineType);
+    }
+
+    public EngineType GetEngineType()
+    {
+        return CurrentEngineType;
+    }
+
+    [Remote]
+    public void _clientSetEngineTypeClient(EngineType engineType)
     {
         CurrentEngineType = engineType;       
 
         // Reload the current weapon to let it get the benefit
         for(int index = 0; index < Enum.GetNames(typeof(Weapon.WeaponOrder)).Length; index++)
         {
-        ChangeWeapon(GetCurrentWeaponIndex((Weapon.WeaponOrder)index), (Weapon.WeaponOrder)index);
+            ChangeWeapon(GetCurrentWeaponIndex((Weapon.WeaponOrder)index), (Weapon.WeaponOrder)index);
         }
-
     }
 
     public virtual void Initialize(GameWorld gameWorld, String unitID, String displayName, TeamMapAI teamMapAI, PathFinding pathFinding)
@@ -182,6 +195,8 @@ public virtual void Initialize(GameWorld gameWorld, String unitID, String displa
         _initializeWeapon(RightWeapons);
 
         DetectionZone.Initialize(gameWorld, this, DetectionRadius);
+
+        RemoteWeaponManager = _gameWorld.GetRemoteWeaponManager();
     }
 
     public GameWorld GetGameWorld()
@@ -328,6 +343,27 @@ public bool EquipWeapon(PackedScene weaponScene, Weapon.WeaponOrder weaponOrder,
         return true;
     }
 
+    /**
+    AddRemoteWeapon
+    Assign weapon to target weaponOrder and index
+    **/
+    public void AddRemoteWeapon(PackedScene weaponScene)
+    {
+        RemoteWeaponManager.AddRemoteWeaponForAgent(this, weaponScene);
+    }
+
+    public Boolean IsMoreRemoteWeaponUnitsAllowed()
+    {
+        if (RemoteWeaponManager.GetRemoteWeaponUnitsCount(this) < MaxWeaponCount * 2)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
     public List<Weapon> GetWeapons(Weapon.WeaponOrder weaponOrder)
     {
         if (weaponOrder == Weapon.WeaponOrder.Right)
@@ -386,14 +422,11 @@ public Team.TeamCode GetTeam()
         return _team.CurrentTeamCode;
     }
 
-
     public TeamMapAI GetTeamMapAI()
     {
         return _teamMapAI;
     }
 
-
-
     public String GetDisplayName()
     {
         return _displayName;
@@ -450,10 +483,10 @@ protected void slowDownBoostTrail()
     }
 
 
-    public void Sync(Vector2 position, float rotation, int rightWeapon, int leftWeapon)
+    public void Sync(NetworkSnapshotManager.ClientData snapshot)
     {
         // Move effect
-        if (position != Position)
+        if (snapshot.Position != Position)
         {
             //AudioManager audioManager = (AudioManager)GetNode("/root/AUDIOMANAGER");
             //audioManager.playSoundEffect(moveMusicClip);
@@ -465,12 +498,23 @@ public void Sync(Vector2 position, float rotation, int rightWeapon, int leftWeap
             slowDownBoostTrail();
         }
 
-        GlobalPosition = position;
-        GlobalRotation = rotation;
+        GlobalPosition = snapshot.Position;
+        GlobalRotation = snapshot.Rotation;
 
-        Fire(Weapon.WeaponOrder.Right, rightWeapon);
-        Fire(Weapon.WeaponOrder.Left, leftWeapon);
+        SetHealth(snapshot.Health);
+        SetHealth(snapshot.Energy);
 
+        // Update Target Agent
+        DetectionZone.SetTargetAgent(snapshot.TargetAgentUnitID);
+        
+        // Update and fire weapon
+        ChangeWeapon(snapshot.RightWeaponIndex, Weapon.WeaponOrder.Right);
+        ChangeWeapon(snapshot.LeftWeaponIndex, Weapon.WeaponOrder.Left);
+
+        Fire(Weapon.WeaponOrder.Right, snapshot.RightWeaponAction);
+        Fire(Weapon.WeaponOrder.Left,  snapshot.LeftWeaponAction);
+
+        FireRemoteWeapon(snapshot.RemoteWeaponAction);
     }
 
 
@@ -479,6 +523,18 @@ public void RotateToward(Vector2 location, float delta)
         GlobalRotation = Mathf.LerpAngle(GlobalRotation, GlobalPosition.DirectionTo(location).Angle(), RotationSpeed * delta);
     }
 
+    public void FireRemoteWeapon(int weaponAction)
+    {
+        if(weaponAction == (int)NetworkSnapshotManager.PlayerInput.InputAction.TRIGGER)
+        {
+            RemoteWeaponManager.Fire(this);
+        }
+        else if(weaponAction == (int)NetworkSnapshotManager.PlayerInput.InputAction.RELOAD)
+        {
+            RemoteWeaponManager.Reload(this);  
+        }
+    }
+
     public void Fire(Weapon.WeaponOrder weaponOrder, int weaponAction)
     {
         Weapon weapon = GetWeapons(weaponOrder)[CurrentWeaponIndex[weaponOrder]];
@@ -517,23 +573,29 @@ public void ApplyKnockBackForce(Vector2 force)
         MoveAndSlide(force * 100);
     }
 
-    public void setHealth(int health)
+    public void SetHealth(int health)
     {
         _health = health;
         EmitSignal(nameof(HealthChangedSignal), health * 100 / MaxHealth);
     }
 
-    public void setEnergy(int energy)
+    public void SetEnergy(int energy)
     {
         _energy = energy;
-        EmitSignal(nameof(HealthChangedSignal), energy * 100 / MaxEnergy);
+        EmitSignal(nameof(EnergyChangedSignal), energy * 100 / MaxEnergy);
     }
 
-    public int getHealth()
+    public int GetHealth()
     {
         return _health;
     }
 
+    public int GetEnergy()
+    {
+        return _energy;
+    }
+
+
     public void IncrementDefeatedAgentCount()
     {
         defeatedAgentCount++;
@@ -634,6 +696,8 @@ public void Heal(int amount)
 
     public virtual void Explode()
     {
+        RemoteWeaponManager.DeleteRemoteWeaponForAgent(this);
+
         for (int index = 0; index <= (int)Weapon.WeaponOrder.Left; index++)
         {
             List<Weapon> weapons = GetWeapons((Weapon.WeaponOrder)index);
@@ -663,24 +727,39 @@ public virtual void Explode()
 
         AudioManager audioManager = (AudioManager)GetNode("/root/AUDIOMANAGER");
         audioManager.playSoundEffect(explosionMusicClip);
+    }
 
+    // Change to target selection enable/disable
+    public void TriggerTargetAgentSelection()
+    {
+        DetectionZone.TriggerTargetAgentSelection();
+    }
 
+    // Change to next target (if available)
+    public void GetNextTargeAgent()
+    {
+        DetectionZone.GetNextTargetAgent();
+    }
 
+    // Change to previous target (if available)
+    public void GetPreviousTargeAgent()
+    {
+        DetectionZone.GetPreviousTargetAgent();
     }
 
     public virtual void OnTargetAgentChange()
     {
-        CurrentTargetAgent = DetectionZone.getTargetAgent();
+        CurrentTargetAgent = DetectionZone.GetTargetAgent();
     }
 
-    private void _OnExplosionAnimationFinished()
+    public Agent GetTargetAgent()
     {
-        QueueFree();
-        EmitSignal(nameof(DeadSignal));
+        return CurrentTargetAgent;
     }
 
-    public override void _Process(float delta)
+    private void _OnExplosionAnimationFinished()
     {
+        QueueFree();
+        EmitSignal(nameof(DeadSignal));
     }
-
 }

agents/AIAgent.tscn

@@ -26,9 +26,7 @@ blend_mode = 1
 [sub_resource type="CircleShape2D" id=4]
 radius = 50.0
 
-[node name="Agent" type="KinematicBody2D" groups=[
-"Obstacles",
-]]
+[node name="Agent" type="KinematicBody2D" groups=["Obstacles"]]
 collision_layer = 2
 collision_mask = 15
 script = ExtResource( 1 )

agents/Agent.cs

@@ -14,6 +14,17 @@ public class GameCamera : Camera2D
 
     private int _pripority = 0;
 
+    [Export]
+    private int DefaultZoom = 2;
+
+    private int _currentZoom = 2;
+
+    [Export]
+    private int MaxZoom = 6;
+
+    [Export]
+    private int MinZoom = 1;
+
     private Godot.RandomNumberGenerator random;
 
 
@@ -26,6 +37,33 @@ public override void _Ready()
 
         random = new RandomNumberGenerator();
         Current = true;
+
+        _currentZoom = DefaultZoom;
+    }
+
+    
+    public void ZoomIn()
+    {
+        _currentZoom--;
+
+        if(_currentZoom < MinZoom)
+        {
+            _currentZoom = MinZoom;
+        }
+
+        Zoom = new Vector2(_currentZoom, _currentZoom);
+    }
+
+    public void ZoomOut()
+    {
+        _currentZoom++;
+
+        if(_currentZoom > MaxZoom)
+        {
+            _currentZoom = MaxZoom;
+        }
+
+        Zoom = new Vector2(_currentZoom, _currentZoom);
     }
 
     public void StartScreenShake(float duration = 0.2f, float frequency = 15.0f, float amplitude = 15.0f, int pripority = 0)

agents/Agent.tscn

@@ -13,5 +13,6 @@ script = ExtResource( 1 )
 one_shot = true
 
 [node name="DurationTimer" type="Timer" parent="."]
+
 [connection signal="timeout" from="FrequencyTimer" to="." method="FrequencyTimerTimeout"]
 [connection signal="timeout" from="DurationTimer" to="." method="DurationTimerTimeout"]