v2.5.6

.github/run-tests/action.yml

@@ -13,39 +13,39 @@ runs:
  # download launchers
  - run: mkdir installer/3rdParty
  shell: bash
- # https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/tree/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/Alternative%20EXEs
+ # https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/tree/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/Alternative%20EXEs
  - run: >-
  curl -Lo installer/3rdParty/KentieDeusExe.exe
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/Alternative%20EXEs/Kentie's%20DeusExe.exe"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/Alternative%20EXEs/Kentie's%20DeusExe.exe"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/DeusExe.u
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/DeusExe.u"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/DeusExe.u"
  shell: bash
 
  - run: >-
  curl -Lo installer/3rdParty/Launch.exe
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/Alternative%20EXEs/Launch.exe"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/Alternative%20EXEs/Launch.exe"
  shell: bash
 
  # download D3D9
  - run: >-
  curl -Lo installer/3rdParty/D3D9Drv.dll
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.dll"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.dll"
  shell: bash
  #- run: >-
  # curl -Lo installer/3rdParty/D3D9Drv.hut
- # "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.hut"
+ # "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.hut"
  # shell: bash
  #- run: >-
  # curl -Lo installer/3rdParty/D3D9Drv.int
- # "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.int"
+ # "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.int"
  # shell: bash
 
- # download and extract OpenGL 2.0 https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/tree/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/CommunityUpdateFileArchiveDXPC/OpenGL
+ # download and extract OpenGL 2.0 https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/tree/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/CommunityUpdateFileArchiveDXPC/OpenGL
  - run: >-
  curl -Lo dxglr21.zip
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/CommunityUpdateFileArchiveDXPC/OpenGL/dxglr21.zip"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/CommunityUpdateFileArchiveDXPC/OpenGL/dxglr21.zip"
  shell: bash
  - run: unzip dxglr21.zip
  shell: bash
@@ -58,67 +58,67 @@ runs:
 
  - run: >-
  curl -Lo installer/3rdParty/D3D10Drv.int
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D10Drv.int"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D10Drv.int"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv.dll
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv.dll"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv.dll"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/common.fxh
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/common.fxh"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/common.fxh"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/complexsurface.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/complexsurface.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/complexsurface.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/finalpass.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/finalpass.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/finalpass.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/firstpass.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/firstpass.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/firstpass.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/fogsurface.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/fogsurface.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/fogsurface.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/gouraudpolygon.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/gouraudpolygon.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/gouraudpolygon.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/hdr.original.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/hdr%20(original).fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/hdr%20(original).fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/hdr.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/hdr.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/hdr.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/polyflags.fxh
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/polyflags.fxh"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/polyflags.fxh"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/postprocessing.fxh
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/postprocessing.fxh"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/postprocessing.fxh"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/states.fxh
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/states.fxh"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/states.fxh"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/tile.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/tile.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/tile.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/unreal_pom.fx
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/unreal_pom.fx"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/unreal_pom.fx"
  shell: bash
  - run: >-
  curl -Lo installer/3rdParty/d3d10drv/unrealpool.fxh
- "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/unrealpool.fxh"
+ "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/a662f6ed177dba52ad3a0d8141fa2ac72f8af034/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/d3d10drv/unrealpool.fxh"
  shell: bash
 
  # LDDP minimal install

BingoDisplay.py

@@ -42,7 +42,7 @@ def __init__(self,targetFile):
  self.selectedMod=""
  self.prevLines=None
  self.bingoLineMatch = re.compile(
- r'bingoexport\[(?P<key>\d+)\]=\(Event="(?P<event>.*)",Desc="(?P<desc>.*)",Progress=(?P<progress>\d+),Max=(?P<max>\d+),Active=(?P<active>\d+)\)',
+ r'bingoexport\[(?P<key>\d+)\]=\(Event="(?P<event>.*)",Desc="(?P<desc>.*)",Progress=(?P<progress>\d+),Max=(?P<max>\d+),Active=(?P<active>-?\d+)\)',
  re.IGNORECASE
  )
  self.initDrawnBoard()
@@ -147,7 +147,7 @@ def parseBingoLine(self,bingoLine):
  bingoMatches=self.bingoLineMatch.match(bingoLine)
  if (bingoMatches==None):
  return
- 
+
  bingoNumber=int(bingoMatches.group('key'))
  bingoCoord = self.bingoNumberToCoord(bingoNumber)
 
@@ -216,6 +216,8 @@ def generateBingoStateJson(self):
  square = dict()
  square["x"]=x
  square["y"]=y
+ if self.board[x][y]==None:
+ return {}
  square["name"]=self.board[x][y]["desc"]
  if self.board[x][y]["max"]>1:
  square["name"]+="\n"+str(self.board[x][y]["progress"])+"/"+str(self.board[x][y]["max"])
@@ -265,11 +267,17 @@ def getDefaultPath():
  Path.home() /'.local'/'share'/'Steam'/'steamapps'/'compatdata'/'6910'/'pfx'/'drive_c'/'users'/'steamuser'/'Documents'/'Deus Ex'/'System',
  Path.home() /'.local'/'share'/'Steam'/'steamapps'/'common'/'Deus Ex'/'System',
  ]
- p:Path
+
+ modified_times = {}
  for p in checks:
  f:Path = p / "DXRBingo.ini"
  if f.exists():
- return p
+ modified_times[p] = os.path.getmtime(f)
+ sorted_paths = sorted(modified_times.keys(), key=lambda f: modified_times[f])
+
+ if len(sorted_paths) > 0:
+ return sorted_paths[-1]
+ p:Path
  for p in checks:
  if p.is_dir():
  return p

DXRBalance/DeusEx/Classes/BalancePlayer.uc

@@ -280,6 +280,8 @@ function CatchFire( Pawn burner )
 simulated function DrugEffects(float deltaTime)
 {
  local float olddrugEffectTimer;
+ local DeusExRootWindow root;
+ local bool wasActive;
 
  // set a cap on the effect strength separately from the duration
  olddrugEffectTimer = drugEffectTimer;
@@ -288,9 +290,25 @@ simulated function DrugEffects(float deltaTime)
 
  // calculate duration myself
  drugEffectTimer = FMin(olddrugEffectTimer, 120.0 );
+ wasActive = (drugEffectTimer>0);
  drugEffectTimer -= deltaTime * 1.5;
- if (drugEffectTimer < 0)
+ if (drugEffectTimer < 0) {
  drugEffectTimer = 0;
+ if (wasActive){
+ //This theoretically fixes the issue where the game stays zoomed in
+ //after being drunk until you switch what's in your hands
+ root = DeusExRootWindow(rootWindow);
+ if ((root != None) && (root.hud != None))
+ {
+ if (root.hud.background != None)
+ {
+ root.hud.SetBackground(None);
+ root.hud.SetBackgroundStyle(DSTY_Normal);
+ DesiredFOV = Default.DesiredFOV;
+ }
+ }
+ }
+ }
 }
 
 // ----------------------------------------------------------------------

DXRBalance/DeusEx/Classes/Fish.uc

@@ -0,0 +1,6 @@
+class DXRFish injects #var(prefix)Fish;
+
+defaultproperties
+{
+ Health=1
+}

DXRBalance/DeusEx/Classes/Fish2.uc

@@ -0,0 +1,6 @@
+class DXRFish2 injects #var(prefix)Fish2;
+
+defaultproperties
+{
+ Health=1
+}

DXRBalance/DeusEx/Classes/Pigeon.uc

@@ -0,0 +1,6 @@
+class DXRPigeon injects #var(prefix)Pigeon;
+
+defaultproperties
+{
+ Health=1
+}

DXRBalance/DeusEx/Classes/Rat.uc

@@ -0,0 +1,6 @@
+class DXRRat injects #var(prefix)Rat;
+
+defaultproperties
+{
+ Health=1
+}

DXRBalance/DeusEx/Classes/Seagull.uc

@@ -0,0 +1,6 @@
+class DXRSeagull injects #var(prefix)Seagull;
+
+defaultproperties
+{
+ Health=1
+}

DXRCore/DeusEx/Classes/DXRActorsBase.uc

@@ -245,7 +245,14 @@ static function Inventory GiveExistingItem(Pawn p, Inventory item, optional int
  if( pickup.bCanHaveMultipleCopies && pickup.NumCopies < pickup.MaxCopies ) {
  pickup.NumCopies++;
  item.Destroy();
+ if( player != None )
+ player.UpdateBeltText(pickup);
  return pickup;
+ } else if (pickup.bCanHaveMultipleCopies && pickup.NumCopies >= pickup.MaxCopies) {
+ //Player has some, but can't get more. Don't try to pick it up or set them as the base.
+ //Disown the player entirely, otherwise if they try to pick it up again, it will follow them
+ item.SetOwner(None);
+ return item;
  }
  }
  }
@@ -262,6 +269,7 @@ static function Inventory GiveExistingItem(Pawn p, Inventory item, optional int
 
  if( player != None ) {
  player.FrobTarget = item;
+ item.SetOwner(None);// just in case the right click fails
  player.ParseRightClick();
  } else {
  item.GiveTo(p);
@@ -926,9 +934,10 @@ static function SetActorScale(Actor a, float scale)
 {
  local Vector newloc;
 
+ scale *= a.DrawScale;
  newloc = a.Location + ( (a.CollisionHeight*scale - a.CollisionHeight*a.DrawScale) * vect(0,0,1) );
+ a.SetCollisionSize(a.CollisionRadius / a.DrawScale * scale, a.CollisionHeight / a.DrawScale * scale);
  a.SetLocation(newloc);
- a.SetCollisionSize(a.CollisionRadius, a.CollisionHeight / a.DrawScale * scale);
  a.DrawScale = scale;
 }