Add ludicrous kill / Holyshit, fix accessed None

This commit is contained in:
cclecle
2023-06-05 23:04:54 +01:00
parent 4c84d5865a
commit 6defd221dc
5 changed files with 24 additions and 7 deletions

View File

@@ -18,6 +18,9 @@
// SmartCTF ChaChaV4 by chacha. 2023:
// - Fix Access None (TGRPI / PRI)
// - Fix Denied Message
// SmartCTF ChaChaV5 by chacha. 2023:
// - Add LudicrousKill & HolyShit Msg / Sounds
// - Fix accessed none KillInTheAir
//
//
// This mod changes the point system and adds features to ultimately promote Teamwork in CTF.
@@ -749,7 +752,7 @@ function bool PreventDeath( Pawn Victim, Pawn Killer, name DamageType, vector Hi
VictimStats = SCTFGame.GetStats( Victim );
// airkill handling
if(bPlayAirKillSound && (Victim!=Killer))
if(bPlayAirKillSound && (Victim!=Killer) && (Killer!=None))
{
if(Victim.Physics == PHYS_Falling && Killer.Physics == PHYS_Falling)
{
@@ -2647,7 +2650,7 @@ defaultproperties
RedAstIndex=0
BlueAstIndex=0
TRCount=0
version="ChaChaV4"
version="ChaChaV5"
GameTieMessage="The game ended in a tie!"
FCs(0)=None
FCs(1)=None

View File

@@ -9,8 +9,12 @@ class SmartCTFEnhancedMultiKillMessage extends MultiKillMessage;
// It also doesn't stop after 9 times ;p
#exec OBJ LOAD FILE=..\Sounds\Announcer.uax
#exec AUDIO IMPORT NAME=LudicrousKill FILE=Sounds\LudicrousKill.wav GROUP=SmartCTF
#exec AUDIO IMPORT NAME=HolyShit FILE=Sounds\HolyShit.wav GROUP=SmartCTF
var(Messages) localized string MegaKillString;
var(Messages) localized string LudicrousKillString;
var(Messages) localized string HolyShitString;
static function int GetFontSize( int Switch )
{
@@ -34,7 +38,11 @@ static function string GetString( optional int Switch, optional PlayerReplicatio
break;
case 5: return default.UltraKillString;
break;
default: return default.MonsterKillString;
case 6: return default.MonsterKillString;
break;
case 7: return default.LudicrousKillString;
break;
default: return default.HolyShitString;
break;
}
}
@@ -62,7 +70,11 @@ static simulated function ClientReceive( PlayerPawn P, optional int Switch, opti
break;
case 5: P.ClientPlaySound( sound'Announcer.UltraKill', , true );
break;
default: P.ClientPlaySound( sound'Announcer.MonsterKill', , true );
case 6: P.ClientPlaySound( sound'Announcer.MonsterKill', , true );
break;
case 7: P.ClientPlaySound( sound'LudicrousKill', , true );
break;
default: P.ClientPlaySound( sound'HolyShit', , true );
break;
}
}
@@ -91,4 +103,6 @@ static function color GetColor( optional int Switch, optional PlayerReplicationI
defaultproperties
{
MegaKillString="MEGA KILL!"
LudicrousKillString="L U D I C R O U S K I L L !!!"
HolyShitString="H O L Y S H I T!!!"
}

BIN
Sources/Sounds/HolyShit.wav Normal file

Binary file not shown.

Binary file not shown.

View File

@@ -1,2 +1,2 @@
del %~dp0\..\System\SmartCTF_ChaChaV4.u
%~dp0\..\System\ucc.exe make SmartCTF_ChaChaV4
del %~dp0\..\System\SmartCTF_ChaChaV5.u
%~dp0\..\System\ucc.exe make SmartCTF_ChaChaV5