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

Small Fixes #22

Merged
dkanus merged 6 commits from :dev into master 2022-07-19 22:43:03 +03:00
Conversation 0 Commits 6 Files Changed 5 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 288aa99416 - Show all commits

16
sources/NicePack.uc
View File

@ -35,10 +35,10 @@ var config bool bNoLateFFIncrease; // Disables FF increase through
// Configuration variables that store whether or not to replace the specimen with it's mean counterpart // Configuration variables that store whether or not to replace the specimen with it's mean counterpart
var config bool bReplaceCrawler, bReplaceStalker, bReplaceClot, bReplaceGorefast, bReplaceBloat, bReplaceSiren, bReplaceHusk, bReplaceScrake, bReplaceFleshpound; var config bool bReplaceCrawler, bReplaceStalker, bReplaceClot, bReplaceGorefast, bReplaceBloat, bReplaceSiren, bReplaceHusk, bReplaceScrake, bReplaceFleshpound;
var config int bigZedMinHealth; // If zed's base Health >= this value, zed counts as Big var config int bigZedMinHealth; // If zed's base Health >= this value, zed counts as Big
var config int mediumZedMinHealth; var config int mediumZedMinHealth;
var int maxPlayersInGame; var int maxPlayersInGame;
// 'Adrenaline junkie' zed-time extensions // 'Adrenaline junkie' zed-time extensions
var int junkieDoneGoals; // How many times we collected enough head-shots to trigger zed-time extension var int junkieDoneGoals; // How many times we collected enough head-shots to trigger zed-time extension
var int junkieNextGoal; // How many head-shots we need for next zed-time extension var int junkieNextGoal; // How many head-shots we need for next zed-time extension
@ -131,7 +131,7 @@ static final function NicePack Myself(LevelInfo Level){
local Mutator M; local Mutator M;
local NicePack NicePackMutator; local NicePack NicePackMutator;
if(default.Mut != none) if(default.Mut != none)
return default.Mut; return default.Mut;
// server-side // server-side
if(Level != none && Level.Game != none){ if(Level != none && Level.Game != none){
for(M = Level.Game.BaseMutator;M != none;M = M.NextMutator){ for(M = Level.Game.BaseMutator;M != none;M = M.NextMutator){
@ -186,7 +186,7 @@ simulated function PostBeginPlay()
default.serverStorage = serverStorage; default.serverStorage = serverStorage;
serverStorage.events.static.AddAdapter(class'NiceRemoteDataAdapter', Level); serverStorage.events.static.AddAdapter(class'NiceRemoteDataAdapter', Level);
// Find game type and ScrN mutator // Find game type and ScrN mutator
ScrnGT = ScrnGameType(Level.Game); ScrnGT = ScrnGameType(Level.Game);
NiceGT = NiceGameType(Level.Game); NiceGT = NiceGameType(Level.Game);
if (NiceGT == none) if (NiceGT == none)
{ {
@ -195,7 +195,7 @@ simulated function PostBeginPlay()
return; return;
} }
// FIXME poosh forces this variable in his mutator... // FIXME poosh forces this variable in his mutator...
NiceGT.LoginMenuClass = "NicePack.NiceInvasionLoginMenu"; NiceGT.LoginMenuClass = string(class'NiceInvasionLoginMenu');
NiceGT.RegisterMutator(self); NiceGT.RegisterMutator(self);
ScrnMut = NiceGT.ScrnBalanceMut; ScrnMut = NiceGT.ScrnBalanceMut;
if(bReplacePickups) if(bReplacePickups)
@ -244,7 +244,7 @@ simulated function PostBeginPlay()
if(FFVO != none) if(FFVO != none)
FFVO.Mut = self; FFVO.Mut = self;
} }
else else
log("Unable to spawn voting handler mutator", class.outer.name); log("Unable to spawn voting handler mutator", class.outer.name);
} }
@ -438,7 +438,7 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){
currNumPlayers++; currNumPlayers++;
if(boss == none) { if(boss == none) {
niceMonster.Health *= hpScale(niceMonster.PlayerCountHealthScale) / niceMonster.NumPlayersHealthModifer(); niceMonster.Health *= hpScale(niceMonster.PlayerCountHealthScale) / niceMonster.NumPlayersHealthModifer();
niceMonster.HealthMax = niceMonster.Health; niceMonster.HealthMax = niceMonster.Health;
niceMonster.HeadHealth *= hpScale(niceMonster.PlayerNumHeadHealthScale) / niceMonster.NumPlayersHeadHealthModifer(); niceMonster.HeadHealth *= hpScale(niceMonster.PlayerNumHeadHealthScale) / niceMonster.NumPlayersHeadHealthModifer();
niceMonster.HeadHealthMax = niceMonster.HeadHealth; niceMonster.HeadHealthMax = niceMonster.HeadHealth;
if(Level.Game.NumPlayers == 1){ if(Level.Game.NumPlayers == 1){
@ -456,7 +456,7 @@ function int FindPickupReplacementIndex(Pickup item)
{ {
local int i; local int i;
for(i=0; i < pickupReplaceArray.length;i ++){ for(i=0; i < pickupReplaceArray.length;i ++){
if(pickupReplaceArray[i].vanillaClass == item.class || pickupReplaceArray[i].scrnClass == item.class) if(pickupReplaceArray[i].vanillaClass == item.class || pickupReplaceArray[i].scrnClass == item.class)
return i; return i;
} }
return -1; return -1;