dkanus/NicePack
dkanus/NicePack
1
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

Menus overhaul #14

Merged
dkanus merged 30 commits from :somechanges into master 2022-01-23 22:14:51 +03:00
Conversation 0 Commits 30 Files Changed 30 +1 -14
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f460b93f2 - Show all commits

3
sources/NicePack.uc
View File

@ -468,7 +468,6 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){
local NicePlayerController playerContr; local NicePlayerController playerContr;
local NiceRepInfoRemoteData remoteRI; local NiceRepInfoRemoteData remoteRI;
local NiceReplicationInfo niceRI; local NiceReplicationInfo niceRI;
local MeanReplicationInfo meanRI;
local PlayerReplicationInfo pri; local PlayerReplicationInfo pri;
// Replace loot on levels // Replace loot on levels
if(Other.class == class'KFRandomItemSpawn' || Other.class == class'ScrnRandomItemSpawn'){ if(Other.class == class'KFRandomItemSpawn' || Other.class == class'ScrnRandomItemSpawn'){
@ -493,8 +492,6 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){
niceRI = spawn(class'NiceReplicationInfo', pri.Owner); niceRI = spawn(class'NiceReplicationInfo', pri.Owner);
niceRI.Mut = self; niceRI.Mut = self;
remoteRI = spawn(class'NiceRepInfoRemoteData', pri.Owner); remoteRI = spawn(class'NiceRepInfoRemoteData', pri.Owner);
meanRI = spawn(class'MeanReplicationInfo', pri.Owner);
meanRI.ownerPRI = pri;
playerContr = NicePlayerController(PlayerReplicationInfo(Other).Owner); playerContr = NicePlayerController(PlayerReplicationInfo(Other).Owner);
playerContr.niceRI = niceRI; playerContr.niceRI = niceRI;
playerContr.remoteRI = remoteRI; playerContr.remoteRI = remoteRI;

12
sources/Zeds/Mean/MeanBleedInventory.uc
View File

@ -32,7 +32,7 @@ event Timer()
maxBleedCount--; maxBleedCount--;
bleedDamage = calcBleedDamage(); bleedDamage = bleedLevel * 7;
if (bleedDamage < 1.0) if (bleedDamage < 1.0)
{ {
maxBleedCount = 0; maxBleedCount = 0;
@ -53,16 +53,6 @@ event Timer()
} }
// Returns bleed damage, corresponding to given bleed level and damage scale.
// Rand(7) should be used as a scale.
// Separate function created to allow for lowest/highest damage value computing.
final private function int calcBleedDamage()
{
return bleedLevel * 7;
}
// cleanup // cleanup
function Destroyed() function Destroyed()
{ {