#6: Basic inventory system with network sync, but still cannot gurant…

…ee inventory always sync (include items + ammos). And will cause initial slowness in sync
danilko · Mar 7, 2021 · 2e575b3 · 2e575b3
1 parent 763678b
commit 2e575b3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/ai/TeamMapAI.cs b/ai/TeamMapAI.cs
@@ -78,10 +78,26 @@ public bool ChargeAmount(int chargeAmount)
         {
             _currentUnitUsageAmount = _currentUnitUsageAmount - chargeAmount;
             EmitSignal(nameof(TeamUnitUsageAmountChangeSignal), _currentUnitUsageAmount);
+
+            if (GetTree().NetworkPeer != null && GetTree().IsNetworkServer())
+            {
+                Rpc(nameof(_clientSetAmount), _currentUnitUsageAmount);
+            }
+
             return true;
         }
     }
 
+    [Remote]
+    private void _clientSetAmount(int amount)
+    {
+        if (!GetTree().IsNetworkServer())
+        {
+            _currentUnitUsageAmount = amount;
+            EmitSignal(nameof(TeamUnitUsageAmountChangeSignal), _currentUnitUsageAmount);
+        }
+    }
+
     public bool isUnitUsageAmountAllowed()
     {
         if (_currentUnitUsageAmount < _unitCost || _currentUnitUsageAmount < 0)

diff --git a/inventory/InventoryManager.cs b/inventory/InventoryManager.cs
@@ -251,6 +251,7 @@ private void _createPickUp(ItemResource itemResource, Vector2 itemPosition)
         pickup.GlobalPosition = itemPosition;
     }
 
+    [Remote]
     private void _clientCreatePickUp(String info)
     {
         if (!GetTree().IsNetworkServer())

diff --git a/mono_crash.mem.21892.1.blob b/mono_crash.mem.21892.1.blob
diff --git a/ui/TitleScreen.tscn b/ui/TitleScreen.tscn
@@ -280,7 +280,7 @@ margin_left = 168.411
 margin_top = 111.168
 margin_right = 242.411
 margin_bottom = 135.168
-value = 10.0
+value = 5.0
 __meta__ = {
 "_edit_use_anchors_": false
 }