IAmChrisAMA
/
iw4x-rawfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:iw4x/iw4x-rawfiles into develop

develop
Louvenarde 2024-06-16 11:18:35 +02:00
parent 525d77f95a 550f1bd27d
commit b9ef601902
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iw4x/iw4x_00/maps/mp/gametypes/_class.gsc
View File

@ -312,7 +312,7 @@ giveLoadout( team, class, allowCopycat )
clearAmmo = false; clearAmmo = false;
// set in game mode custom class // set in game mode custom class
loadoutKillstreak1 = undefined; loadoutKillstreak1 = undefined;
loadoutKillstreak2 = undefined; loadoutKillstreak2 = undefined;
loadoutKillstreak3 = undefined; loadoutKillstreak3 = undefined;
@ -527,7 +527,7 @@ giveLoadout( team, class, allowCopycat )
self _clearPerks(); self _clearPerks();
self _detachAll(); self _detachAll();
if ( level.killstreakRewards ) if ( level.killstreakRewards && !isDefined( loadoutKillstreak1 ) && !isDefined( loadoutKillstreak2 ) && !isDefined( loadoutKillstreak3 ) )
{ {
if ( getDvarInt( "scr_classic" ) == 1 ) if ( getDvarInt( "scr_classic" ) == 1 )
{ {

28
iw4x/iw4x_00/maps/mp/gametypes/infect.gsc
View File

@ -8,17 +8,17 @@ main()
maps\mp\gametypes\_callbacksetup::SetupCallbacks(); maps\mp\gametypes\_callbacksetup::SetupCallbacks();
maps\mp\gametypes\_globallogic::SetupCallbacks(); maps\mp\gametypes\_globallogic::SetupCallbacks();
registerTimeLimitDvar( level.gameType, 10 ); registerTimeLimitDvar( level.gameType, 10 );
setOverrideWatchDvar( "scorelimit", 0 ); setOverrideWatchDvar( "scorelimit", 0 );
registerRoundLimitDvar( level.gameType, 1 ); registerRoundLimitDvar( level.gameType, 1 );
registerWinLimitDvar( level.gameType, 1 ); registerWinLimitDvar( level.gameType, 1 );
registerNumLivesDvar( level.gameType, 0 ); registerNumLivesDvar( level.gameType, 0 );
registerHalfTimeDvar( level.gameType, 0 ); registerHalfTimeDvar( level.gameType, 0 );
setSpecialLoadouts(); setSpecialLoadouts();
level.teamBased = true; level.teamBased = true;
// don't sit there waiting for both teams to contain players, // don't sit there waiting for both teams to contain players,
// as everyone starts a survivor // as everyone starts a survivor
level.prematchWaitForTeams = false; level.prematchWaitForTeams = false;
level.onPrecacheGameType = ::onPrecacheGameType; level.onPrecacheGameType = ::onPrecacheGameType;
@ -29,7 +29,7 @@ main()
level.onDeadEvent = ::onDeadEvent; level.onDeadEvent = ::onDeadEvent;
level.onTimeLimit = ::onTimeLimit; level.onTimeLimit = ::onTimeLimit;
level.infect_perks = []; level.infect_perks = [];
level.infect_perks[level.infect_perks.size] = "specialty_marathon"; level.infect_perks[level.infect_perks.size] = "specialty_marathon";
level.infect_perks[level.infect_perks.size] = "specialty_fastreload"; level.infect_perks[level.infect_perks.size] = "specialty_fastreload";
level.infect_perks[level.infect_perks.size] = "specialty_scavenger"; level.infect_perks[level.infect_perks.size] = "specialty_scavenger";
@ -55,7 +55,7 @@ determineWinningTeam()
onPrecacheGameType() onPrecacheGameType()
{ {
precacheString( &"MP_CONSCRIPTION_STARTS_IN" ); precacheString( &"MP_CONSCRIPTION_STARTS_IN" );
} }
onStartGameType() onStartGameType()
@ -752,7 +752,7 @@ setSpecialLoadouts()
level.infect_loadouts["axis"]["loadoutPrimaryAttachment"] = "none"; level.infect_loadouts["axis"]["loadoutPrimaryAttachment"] = "none";
level.infect_loadouts["axis"]["loadoutPrimaryAttachment2"] = "none"; level.infect_loadouts["axis"]["loadoutPrimaryAttachment2"] = "none";
level.infect_loadouts["axis"]["loadoutPrimaryCamo"] = "none"; level.infect_loadouts["axis"]["loadoutPrimaryCamo"] = "none";
level.infect_loadouts["axis"]["loadoutSecondary"] = "none"; level.infect_loadouts["axis"]["loadoutSecondary"] = "none";
level.infect_loadouts["axis"]["loadoutSecondaryAttachment"] = "none"; level.infect_loadouts["axis"]["loadoutSecondaryAttachment"] = "none";
level.infect_loadouts["axis"]["loadoutSecondaryAttachment2"] = "none"; level.infect_loadouts["axis"]["loadoutSecondaryAttachment2"] = "none";
level.infect_loadouts["axis"]["loadoutSecondaryCamo"] = "none"; level.infect_loadouts["axis"]["loadoutSecondaryCamo"] = "none";
@ -764,7 +764,7 @@ setSpecialLoadouts()
level.infect_loadouts["axis"]["loadoutKillstreak1"] = "none"; level.infect_loadouts["axis"]["loadoutKillstreak1"] = "none";
level.infect_loadouts["axis"]["loadoutKillstreak2"] = "none"; level.infect_loadouts["axis"]["loadoutKillstreak2"] = "none";
level.infect_loadouts["axis"]["loadoutKillstreak3"] = "none"; level.infect_loadouts["axis"]["loadoutKillstreak3"] = "none";
level.infect_loadouts["axis"]["loadoutDeathstreak"] = "none"; level.infect_loadouts["axis"]["loadoutDeathstreak"] = "specialty_null";
level.infect_loadouts["axis_initial"]["loadoutPrimary"] = "throwingknife"; level.infect_loadouts["axis_initial"]["loadoutPrimary"] = "throwingknife";
level.infect_loadouts["axis_initial"]["loadoutPrimaryAttachment"] = "none"; level.infect_loadouts["axis_initial"]["loadoutPrimaryAttachment"] = "none";
@ -782,7 +782,7 @@ setSpecialLoadouts()
level.infect_loadouts["axis_initial"]["loadoutKillstreak1"] = "none"; level.infect_loadouts["axis_initial"]["loadoutKillstreak1"] = "none";
level.infect_loadouts["axis_initial"]["loadoutKillstreak2"] = "none"; level.infect_loadouts["axis_initial"]["loadoutKillstreak2"] = "none";
level.infect_loadouts["axis_initial"]["loadoutKillstreak3"] = "none"; level.infect_loadouts["axis_initial"]["loadoutKillstreak3"] = "none";
level.infect_loadouts["axis_initial"]["loadoutDeathstreak"] = "none"; level.infect_loadouts["axis_initial"]["loadoutDeathstreak"] = "specialty_null";
level.infect_loadouts["allies"]["loadoutPrimary"] = "spas12"; level.infect_loadouts["allies"]["loadoutPrimary"] = "spas12";
level.infect_loadouts["allies"]["loadoutPrimaryAttachment"] = "xmags"; level.infect_loadouts["allies"]["loadoutPrimaryAttachment"] = "xmags";