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

Revert "Revert "Add support for custom game modes classes"" 

This reverts commit 4478176407.
pull/4/head
efinst0rm 2023-08-17 19:48:00 -05:00
parent 4478176407
commit b36d0792d0
1 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,6 +303,8 @@ giveLoadout( team, class, allowCopycat )
{ {
self takeAllWeapons(); self takeAllWeapons();
self.changingWeapon = undefined;
primaryIndex = 0; primaryIndex = 0;
// initialize specialty array // initialize specialty array
@ -312,7 +314,15 @@ giveLoadout( team, class, allowCopycat )
allowCopycat = true; allowCopycat = true;
primaryWeapon = undefined; primaryWeapon = undefined;
clearAmmo = false;
// set in game mode custom class
loadoutKillstreak1 = undefined;
loadoutKillstreak2 = undefined;
loadoutKillstreak3 = undefined;
clonedLoadout = [];
if ( isDefined( self.pers["copyCatLoadout"] ) && self.pers["copyCatLoadout"]["inUse"] && allowCopycat ) if ( isDefined( self.pers["copyCatLoadout"] ) && self.pers["copyCatLoadout"]["inUse"] && allowCopycat )
{ {
self maps\mp\gametypes\_class::setClass( "copycat" ); self maps\mp\gametypes\_class::setClass( "copycat" );
@ -356,6 +366,64 @@ giveLoadout( team, class, allowCopycat )
loadoutOffhand = cac_getOffhand( class_num ); loadoutOffhand = cac_getOffhand( class_num );
loadoutDeathStreak = cac_getDeathstreak( class_num ); loadoutDeathStreak = cac_getDeathstreak( class_num );
} }
else if ( class == "gamemode" )
{
gamemodeLoadout = self.pers["gamemodeLoadout"];
loadoutPrimary = gamemodeLoadout["loadoutPrimary"];
loadoutPrimaryAttachment = gamemodeLoadout["loadoutPrimaryAttachment"];
loadoutPrimaryAttachment2 = gamemodeLoadout["loadoutPrimaryAttachment2"] ;
loadoutPrimaryCamo = gamemodeLoadout["loadoutPrimaryCamo"];
loadoutSecondary = gamemodeLoadout["loadoutSecondary"];
loadoutSecondaryAttachment = gamemodeLoadout["loadoutSecondaryAttachment"];
loadoutSecondaryAttachment2 = gamemodeLoadout["loadoutSecondaryAttachment2"];
loadoutSecondaryCamo = gamemodeLoadout["loadoutSecondaryCamo"];
// replace the placeholder throwing knife with the valid secondary if there is one
if ( loadoutPrimary == "throwingknife" && loadoutSecondary != "none" )
{
loadoutPrimary = loadoutSecondary;
loadoutPrimaryAttachment = loadoutSecondaryAttachment;
loadoutPrimaryAttachment2 = loadoutSecondaryAttachment2;
loadoutPrimaryCamo = loadoutSecondaryCamo;
loadoutSecondary = "none";
loadoutSecondaryAttachment = "none";
loadoutSecondaryAttachment2 = "none";
loadoutSecondaryCamo = "none";
}
// otherwise replace with normal default for invalid class
else if ( loadoutPrimary == "throwingknife" && loadoutSecondary == "none" )
{
clearAmmo = true;
loadoutPrimary = "usp";
loadoutPrimaryAttachment = "tactical";
}
loadoutEquipment = gamemodeLoadout["loadoutEquipment"];
loadoutOffhand = gamemodeLoadout["loadoutOffhand"];
// hack, until game mode default class data can be reset
if ( loadoutOffhand == "specialty_null" )
loadoutOffhand = "none";
loadoutPerk1 = gamemodeLoadout["loadoutPerk1"];
loadoutPerk2 = gamemodeLoadout["loadoutPerk2"];
loadoutPerk3 = gamemodeLoadout["loadoutPerk3"];
if ( level.killstreakRewards )
{
loadoutKillstreak1 = gamemodeLoadout["loadoutKillstreak1"];
loadoutKillstreak2 = gamemodeLoadout["loadoutKillstreak2"];
loadoutKillstreak3 = gamemodeLoadout["loadoutKillstreak3"];
}
else
{
loadoutKillstreak1 = "none";
loadoutKillstreak2 = "none";
loadoutKillstreak3 = "none";
}
loadoutDeathStreak = gamemodeLoadout["loadoutDeathstreak"];
}
else else
{ {
class_num = getClassIndex( class ); class_num = getClassIndex( class );
@ -377,8 +445,10 @@ giveLoadout( team, class, allowCopycat )
loadoutOffhand = table_getOffhand( level.classTableName, class_num ); loadoutOffhand = table_getOffhand( level.classTableName, class_num );
loadoutDeathstreak = table_getDeathstreak( level.classTableName, class_num ); loadoutDeathstreak = table_getDeathstreak( level.classTableName, class_num );
} }
isGameModeClass = ( class == "gamemode" );
if ( !(isDefined( self.pers["copyCatLoadout"] ) && self.pers["copyCatLoadout"]["inUse"] && allowCopycat) ) if ( !isGameModeClass && !(isDefined( self.pers["copyCatLoadout"] ) && self.pers["copyCatLoadout"]["inUse"] && allowCopycat) )
{ {
isCustomClass = isSubstr( class, "custom" ); isCustomClass = isSubstr( class, "custom" );
@ -548,6 +618,13 @@ giveLoadout( team, class, allowCopycat )
primaryWeapon = primaryName; primaryWeapon = primaryName;
self.primaryWeapon = primaryWeapon; self.primaryWeapon = primaryWeapon;
self.secondaryWeapon = secondaryName; self.secondaryWeapon = secondaryName;
// clear ammo for created default classes using placeholder gun when primary and secondary was set to none
if ( clearAmmo )
{
self SetWeaponAmmoClip( self.primaryWeapon, 0 );
self SetWeaponAmmoStock( self.primaryWeapon, 0 );
}
self maps\mp\gametypes\_teams::playerModelForWeapon( self.pers["primaryWeapon"], getBaseWeaponName( secondaryName ) ); self maps\mp\gametypes\_teams::playerModelForWeapon( self.pers["primaryWeapon"], getBaseWeaponName( secondaryName ) );