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

zedtest3 #3

Merged
dkanus merged 15 commits from :zedtest3 into master 2022-01-21 11:56:43 +03:00
Conversation 0 Commits 15 Files Changed 22 +141 -141
8 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 429a95b863 - Show all commits

2
sources/Effects/NiceFreezeParticlesDirectional.uc
View File

@ -1,7 +1,7 @@
// ScrN copy // ScrN copy
class NiceFreezeParticlesDirectional extends NiceFreezeParticlesBase; class NiceFreezeParticlesDirectional extends NiceFreezeParticlesBase;
simulated function Trigger(Actor other, Pawn eventInstigator){ simulated function Trigger(Actor other, Pawn eventInstigator){
emitters[0].SpawnParticle(1); emitters[0].SpawnParticle(1);
} }
defaultproperties defaultproperties
{ {

4
sources/Effects/NiceIceChunkEmitter.uc
View File

@ -1,8 +1,8 @@
class NiceIceChunkEmitter extends Emitter; class NiceIceChunkEmitter extends Emitter;
var() array<Sound> ImpactSounds; var() array<Sound> ImpactSounds;
simulated function PostBeginPlay(){ simulated function PostBeginPlay(){
if(ImpactSounds.Length > 0) if(ImpactSounds.Length > 0)
PlaySound(ImpactSounds[Rand(ImpactSounds.Length)]); PlaySound(ImpactSounds[Rand(ImpactSounds.Length)]);
} }
// NICETODO: change linksfrom HTeac_A to NicePackSM (and change that file) // NICETODO: change linksfrom HTeac_A to NicePackSM (and change that file)
defaultproperties defaultproperties

242
sources/GUI/NiceGUIBuyMenu.uc
View File

@ -1,87 +1,87 @@
class NiceGUIBuyMenu extends UT2k4MainPage; class NiceGUIBuyMenu extends UT2k4MainPage;
//The "Header" //The "Header"
var automated GUIImage HeaderBG_Left; var automated GUIImage HeaderBG_Left;
var automated GUIImage HeaderBG_Center; var automated GUIImage HeaderBG_Center;
var automated GUIImage HeaderBG_Right; var automated GUIImage HeaderBG_Right;
var automated GUILabel CurrentPerkLabel; var automated GUILabel CurrentPerkLabel;
var automated GUILabel TimeLeftLabel; var automated GUILabel TimeLeftLabel;
var automated GUILabel WaveLabel; var automated GUILabel WaveLabel;
var automated GUILabel HeaderBG_Left_Label; var automated GUILabel HeaderBG_Left_Label;
var automated KFQuickPerkSelect QuickPerkSelect; var automated KFQuickPerkSelect QuickPerkSelect;
var automated KFBuyMenuFilter BuyMenuFilter; var automated KFBuyMenuFilter BuyMenuFilter;
var automated GUIButton StoreTabButton; var automated GUIButton StoreTabButton;
var automated GUIButton PerkTabButton; var automated GUIButton PerkTabButton;
//The "Footer" //The "Footer"
var automated GUIImage WeightBG; var automated GUIImage WeightBG;
var automated GUIImage WeightIcon; var automated GUIImage WeightIcon;
var automated GUIImage WeightIconBG; var automated GUIImage WeightIconBG;
var automated KFWeightBar WeightBar; var automated KFWeightBar WeightBar;
//const BUYLIST_CATS =7; //const BUYLIST_CATS =7;
var() editconst noexport float SavedPitch; var() editconst noexport float SavedPitch;
var color RedColor; var color RedColor;
var color GreenGreyColor; var color GreenGreyColor;
var() UT2K4TabPanel ActivePanel; var() UT2K4TabPanel ActivePanel;
var localized string CurrentPerk; var localized string CurrentPerk;
var localized string NoActivePerk; var localized string NoActivePerk;
var localized string TraderClose; var localized string TraderClose;
var localized string WaveString; var localized string WaveString;
var localized string LvAbbrString; var localized string LvAbbrString;
function InitComponent(GUIController MyC, GUIComponent MyO) function InitComponent(GUIController MyC, GUIComponent MyO)
{ {
local int i; local int i;
super.InitComponent(MyC, MyO); super.InitComponent(MyC, MyO);
c_Tabs.BackgroundImage = none; c_Tabs.BackgroundImage = none;
c_Tabs.BackgroundStyle = none; c_Tabs.BackgroundStyle = none;
InitTabs(); InitTabs();
for ( i = 0; i < c_Tabs.TabStack.Length; i++ ) for ( i = 0; i < c_Tabs.TabStack.Length; i++ )
{ {
c_Tabs.TabStack[i].bVisible = false; c_Tabs.TabStack[i].bVisible = false;
} }
UpdateWeightBar(); UpdateWeightBar();
} }
function InitTabs() function InitTabs()
{ {
local int i; local int i;
for ( i = 0; i < PanelCaption.Length && i < PanelClass.Length && i < PanelHint.Length; i++ ) for ( i = 0; i < PanelCaption.Length && i < PanelClass.Length && i < PanelHint.Length; i++ )
{ {
c_Tabs.AddTab(PanelCaption[i], PanelClass[i],, PanelHint[i]); c_Tabs.AddTab(PanelCaption[i], PanelClass[i],, PanelHint[i]);
} }
} }
function UpdateWeightBar() function UpdateWeightBar()
{ {
if ( KFHumanPawn(PlayerOwner().Pawn) != none ) if ( KFHumanPawn(PlayerOwner().Pawn) != none )
{ {
WeightBar.MaxBoxes = KFHumanPawn(PlayerOwner().Pawn).MaxCarryWeight; WeightBar.MaxBoxes = KFHumanPawn(PlayerOwner().Pawn).MaxCarryWeight;
WeightBar.CurBoxes = KFHumanPawn(PlayerOwner().Pawn).CurrentWeight; WeightBar.CurBoxes = KFHumanPawn(PlayerOwner().Pawn).CurrentWeight;
} }
} }
event Opened(GUIComponent Sender) event Opened(GUIComponent Sender)
{ {
local rotator PlayerRot; local rotator PlayerRot;
super.Opened(Sender); super.Opened(Sender);
c_Tabs.ActivateTabByName(PanelCaption[0], true); c_Tabs.ActivateTabByName(PanelCaption[0], true);
// Tell the controller that he is on a shopping spree // Tell the controller that he is on a shopping spree
if ( KFPlayerController(PlayerOwner()) != none ) if ( KFPlayerController(PlayerOwner()) != none )
{ {
KFPlayerController(PlayerOwner()).bShopping = true; KFPlayerController(PlayerOwner()).bShopping = true;
} }
if ( KFWeapon(KFHumanPawn(PlayerOwner().Pawn).Weapon).bAimingRifle ) if ( KFWeapon(KFHumanPawn(PlayerOwner().Pawn).Weapon).bAimingRifle )
{ {
KFWeapon(KFHumanPawn(PlayerOwner().Pawn).Weapon).IronSightZoomOut(); KFWeapon(KFHumanPawn(PlayerOwner().Pawn).Weapon).IronSightZoomOut();
} }
// Set camera's pitch to zero when menu initialised (otherwise spinny weap goes kooky) // Set camera's pitch to zero when menu initialised (otherwise spinny weap goes kooky)
PlayerRot = PlayerOwner().Rotation; PlayerRot = PlayerOwner().Rotation;
SavedPitch = PlayerRot.Pitch; SavedPitch = PlayerRot.Pitch;
PlayerRot.Yaw = PlayerRot.Yaw % 65536; PlayerRot.Yaw = PlayerRot.Yaw % 65536;
PlayerRot.Pitch = 0; PlayerRot.Pitch = 0;
PlayerRot.Roll = 0; PlayerRot.Roll = 0;
PlayerOwner().SetRotation(PlayerRot); PlayerOwner().SetRotation(PlayerRot);
SetTimer(0.05f, true); SetTimer(0.05f, true);
} }
function Timer() function Timer()
{ {
UpdateHeader(); UpdateHeader();
UpdateWeightBar(); UpdateWeightBar();
} }
function InternalOnClose(optional bool bCanceled) function InternalOnClose(optional bool bCanceled)
{ {
@ -94,81 +94,81 @@ function InternalOnClose(optional bool bCanceled)
} }
function UpdateHeader() function UpdateHeader()
{ {
local int TimeLeftMin, TimeLeftSec; local int TimeLeftMin, TimeLeftSec;
local string TimeString; local string TimeString;
if ( KFPlayerController(PlayerOwner()) == none || PlayerOwner().PlayerReplicationInfo == none || if ( KFPlayerController(PlayerOwner()) == none || PlayerOwner().PlayerReplicationInfo == none ||
PlayerOwner().GameReplicationInfo == none ) PlayerOwner().GameReplicationInfo == none )
{
return;
}
// Current Perk
if ( KFPlayerController(PlayerOwner()).SelectedVeterancy != none )
{ {
CurrentPerkLabel.Caption = CurrentPerk$":" @ KFPlayerController(PlayerOwner()).SelectedVeterancy.default.VeterancyName @ LvAbbrString$KFPlayerReplicationInfo(PlayerOwner().PlayerReplicationInfo).ClientVeteranSkillLevel; return;
} }
// Current Perk
if ( KFPlayerController(PlayerOwner()).SelectedVeterancy != none )
{
CurrentPerkLabel.Caption = CurrentPerk$":" @ KFPlayerController(PlayerOwner()).SelectedVeterancy.default.VeterancyName @ LvAbbrString$KFPlayerReplicationInfo(PlayerOwner().PlayerReplicationInfo).ClientVeteranSkillLevel;
}
else else
{ {
CurrentPerkLabel.Caption = CurrentPerk$":" @ NoActivePerk; CurrentPerkLabel.Caption = CurrentPerk$":" @ NoActivePerk;
} }
// Trader time left // Trader time left
TimeLeftMin = KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).TimeToNextWave / 60; TimeLeftMin = KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).TimeToNextWave / 60;
TimeLeftSec = KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).TimeToNextWave % 60; TimeLeftSec = KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).TimeToNextWave % 60;
if ( TimeLeftMin < 1 ) if ( TimeLeftMin < 1 )
{ {
TimeString = "00:"; TimeString = "00:";
} }
else else
{ {
TimeString = "0" $ TimeLeftMin $ ":"; TimeString = "0" $ TimeLeftMin $ ":";
} }
if ( TimeLeftSec >= 10 ) if ( TimeLeftSec >= 10 )
{ {
TimeString = TimeString $ TimeLeftSec; TimeString = TimeString $ TimeLeftSec;
} }
else else
{ {
TimeString = TimeString $ "0" $ TimeLeftSec; TimeString = TimeString $ "0" $ TimeLeftSec;
} }
TimeLeftLabel.Caption = TraderClose @ TimeString; TimeLeftLabel.Caption = TraderClose @ TimeString;
if ( KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).TimeToNextWave < 10 ) if ( KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).TimeToNextWave < 10 )
{ {
TimeLeftLabel.TextColor = RedColor; TimeLeftLabel.TextColor = RedColor;
} }
else else
{ {
TimeLeftLabel.TextColor = GreenGreyColor; TimeLeftLabel.TextColor = GreenGreyColor;
} }
// Wave Counter // Wave Counter
WaveLabel.Caption = WaveString$":" @ (KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).WaveNumber + 1)$"/"$KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).FinalWave; WaveLabel.Caption = WaveString$":" @ (KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).WaveNumber + 1)$"/"$KFGameReplicationInfo(PlayerOwner().GameReplicationInfo).FinalWave;
} }
function KFBuyMenuClosed(optional bool bCanceled) function KFBuyMenuClosed(optional bool bCanceled)
{ {
local rotator NewRot; local rotator NewRot;
// Reset player // Reset player
NewRot = PlayerOwner().Rotation; NewRot = PlayerOwner().Rotation;
NewRot.Pitch = SavedPitch; NewRot.Pitch = SavedPitch;
PlayerOwner().SetRotation(NewRot); PlayerOwner().SetRotation(NewRot);
Super.OnClose(bCanceled); Super.OnClose(bCanceled);
if ( KFPlayerController(PlayerOwner()) != none ) if ( KFPlayerController(PlayerOwner()) != none )
{ {
KFPlayerController(PlayerOwner()).bShopping = false; KFPlayerController(PlayerOwner()).bShopping = false;
} }
} }
function CloseSale(bool savePurchases) function CloseSale(bool savePurchases)
{ {
Controller.CloseMenu(!savePurchases); Controller.CloseMenu(!savePurchases);
} }
function bool ButtonClicked(GUIComponent Sender) function bool ButtonClicked(GUIComponent Sender)
{ {
if ( Sender == PerkTabButton ) if ( Sender == PerkTabButton )
{ {
HandleParameters(PanelCaption[1], "OhHi!"); HandleParameters(PanelCaption[1], "OhHi!");
} }
if ( Sender == StoreTabButton ) if ( Sender == StoreTabButton )
{ {
HandleParameters(PanelCaption[0], "OhHi!"); HandleParameters(PanelCaption[0], "OhHi!");
} }
return true; return true;
} }
defaultproperties defaultproperties
{ {

2
sources/Perks/Enforcer/Skills/NiceSkillSupportDiversity.uc
View File

@ -5,7 +5,7 @@ static function UpdateWeight(NicePlayerController nicePlayer){
local NiceHumanPawn nicePawn; local NiceHumanPawn nicePawn;
if(nicePawn == none || nicePawn.KFPRI == none) return; if(nicePawn == none || nicePawn.KFPRI == none) return;
nicePawn.maxCarryWeight = nicePawn.default.maxCarryWeight; nicePawn.maxCarryWeight = nicePawn.default.maxCarryWeight;
if(nicePawn.KFPRI.clientVeteranSkill != none) if(nicePawn.KFPRI.clientVeteranSkill != none)
nicePawn.maxCarryWeight += nicePawn.KFPRI.clientVeteranSkill.static.AddCarryMaxWeight(nicePawn.KFPRI); nicePawn.maxCarryWeight += nicePawn.KFPRI.clientVeteranSkill.static.AddCarryMaxWeight(nicePawn.KFPRI);
} }
function static SkillSelected(NicePlayerController nicePlayer){ function static SkillSelected(NicePlayerController nicePlayer){

10
sources/Weapons/Playable/Explosives/PipeBombs/NiceDamTypePipeBomb.uc
View File

@ -1,11 +1,11 @@
class NiceDamTypePipeBomb extends NiceWeaponDamageType; class NiceDamTypePipeBomb extends NiceWeaponDamageType;
static function GetHitEffects(out class<xEmitter> HitEffects[4], int VictimHealth) static function GetHitEffects(out class<xEmitter> HitEffects[4], int VictimHealth)
{ {
HitEffects[0] = class'HitSmoke'; HitEffects[0] = class'HitSmoke';
if(VictimHealth <= 0) if(VictimHealth <= 0)
HitEffects[1] = class'KFHitFlame'; HitEffects[1] = class'KFHitFlame';
else if (FRand() < 0.8) else if (FRand() < 0.8)
HitEffects[1] = class'KFHitFlame'; HitEffects[1] = class'KFHitFlame';
} }
defaultproperties defaultproperties
{ {

16
sources/Weapons/Playable/Grenades/NiceCryoNadeCloud.uc
View File

@ -2,22 +2,22 @@
class NiceCryoNadeCloud extends Emitter; class NiceCryoNadeCloud extends Emitter;
var bool bFlashed; var bool bFlashed;
simulated function PostBeginPlay(){ simulated function PostBeginPlay(){
super.PostBeginPlay(); super.PostBeginPlay();
NadeLight(); NadeLight();
} }
simulated function NadeLight(){ simulated function NadeLight(){
if(instigator == none) return; if(instigator == none) return;
if(Level.bDropDetail) return; if(Level.bDropDetail) return;
if( (Level.TimeSeconds - LastRenderTime < 0.2) if( (Level.TimeSeconds - LastRenderTime < 0.2)
|| (PlayerController(instigator.controller) != none)){ || (PlayerController(instigator.controller) != none)){
bDynamicLight = true; bDynamicLight = true;
SetTimer(0.25, false); SetTimer(0.25, false);
} }
else else
Timer(); Timer();
} }
simulated function Timer(){ simulated function Timer(){
bDynamicLight = false; bDynamicLight = false;
} }
defaultproperties defaultproperties
{ {

2
sources/Zeds/Nice/NiceDamTypePoundCrushed.uc
View File

@ -1,5 +1,5 @@
class NiceDamTypePoundCrushed extends NiceZedMeleeDamageType class NiceDamTypePoundCrushed extends NiceZedMeleeDamageType
abstract; abstract;
defaultproperties defaultproperties
{ {
DeathString="%o was pounded by %k." DeathString="%o was pounded by %k."

4
sources/Zeds/NiceMonsterController.uc
View File

@ -16,8 +16,8 @@
class NiceMonsterController extends KFMonsterController; class NiceMonsterController extends KFMonsterController;
// Just reset threat assesment flag, since it's not used in NicePack // Just reset threat assesment flag, since it's not used in NicePack
function PostBeginPlay(){ function PostBeginPlay(){
super.PostBeginPlay(); super.PostBeginPlay();
bUseThreatAssessment = true; bUseThreatAssessment = true;
} }
event bool NotifyBump(Actor other){ event bool NotifyBump(Actor other){
local Pawn otherPawn; local Pawn otherPawn;