diff --git a/Sources/Classes/SmartCTF.uc b/Sources/Classes/SmartCTF.uc index 379e697..65f1711 100644 --- a/Sources/Classes/SmartCTF.uc +++ b/Sources/Classes/SmartCTF.uc @@ -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 diff --git a/Sources/Classes/SmartCTFEnhancedMultiKillMessage.uc b/Sources/Classes/SmartCTFEnhancedMultiKillMessage.uc index a7093d9..b422eb8 100644 --- a/Sources/Classes/SmartCTFEnhancedMultiKillMessage.uc +++ b/Sources/Classes/SmartCTFEnhancedMultiKillMessage.uc @@ -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; } } @@ -90,5 +102,7 @@ static function color GetColor( optional int Switch, optional PlayerReplicationI defaultproperties { - MegaKillString="MEGA KILL!" + 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!!!" } diff --git a/Sources/Sounds/HolyShit.wav b/Sources/Sounds/HolyShit.wav new file mode 100644 index 0000000..bf6e1e2 Binary files /dev/null and b/Sources/Sounds/HolyShit.wav differ diff --git a/Sources/Sounds/LudicrousKill.wav b/Sources/Sounds/LudicrousKill.wav new file mode 100644 index 0000000..c1e89bf Binary files /dev/null and b/Sources/Sounds/LudicrousKill.wav differ diff --git a/Sources/make.bat b/Sources/make.bat index a779a51..af97bb3 100644 --- a/Sources/make.bat +++ b/Sources/make.bat @@ -1,2 +1,2 @@ -del %~dp0\..\System\SmartCTF_ChaChaV4.u -%~dp0\..\System\ucc.exe make SmartCTF_ChaChaV4 \ No newline at end of file +del %~dp0\..\System\SmartCTF_ChaChaV5.u +%~dp0\..\System\ucc.exe make SmartCTF_ChaChaV5 \ No newline at end of file