Change special weapon dropping & disowning logic

wallabra · Feb 3, 2024 · 9aa9b03 · 9aa9b03
1 parent cea76d3
commit 9aa9b03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Classes/MushBeacon.uc b/Classes/MushBeacon.uc
@@ -78,7 +78,7 @@ simulated event Tick(float TimeDelta)
 {    
     Super.Tick(TimeDelta);
 
-    if (IsInState('Pickup') || Owner == None)
+    if (IsInState('Pickup') && Owner == None && Inventory == None)
     {
         Destroy();
         return;
@@ -208,4 +208,5 @@ defaultproperties
      MinBeaconBotRating=400
      MaxBeaconBotRating=2500
      BeaconBotRatingFalloff=12
+     bCanThrow=false
 }
diff --git a/Classes/Sporifier.uc b/Classes/Sporifier.uc
@@ -177,8 +177,8 @@ simulated function FindMMI() {
 simulated function Tick(float TimeDelta)
 {   
     Super.Tick(TimeDelta);
-        
-    if (IsInState('Pickup') || Owner == None)
+
+    if (IsInState('Pickup') && Owner == None && Inventory == None)
     {
         Destroy();
         return;
@@ -218,10 +218,7 @@ simulated function Tick(float TimeDelta)
                 Warn("Sporifier"@ self @"had a non-Mush owner,"@ Owner);
             }
 
-            if (!PRL.bDead) {
-                Pawn(Owner).TossWeapon();
-            }
-
+            Pawn(Owner).DeleteInventory(Self);
             Destroy();
             return;
         }
@@ -332,4 +329,5 @@ defaultproperties
      bWarnTarget=false
      SporifierFirerate=1.5
      bAlwaysAutoSpot=false
+     bCanThrow=false
 }
diff --git a/buildconfig.sh b/buildconfig.sh
@@ -5,8 +5,8 @@
 
 export name="Mush Match"
 export package=MushMatch
-export version=1.3.5-pre2
-export build=20235101
+export version=1.3.5-pre3
+export build=20240601
 export debug=1
 export makeint=1
 export incl_readme=1