Fix dev script setPlayerData errors

This commit is contained in:
ineed bots 2022-04-18 15:01:33 -06:00
parent 17e36e08c7
commit 835b3d597c
2 changed files with 71 additions and 50 deletions

View File

@ -18,11 +18,14 @@ added()
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self setPlayerData( "experience", self bot_get_rank() ); if ( !getDvarInt( "developer_script" ) )
self setPlayerData( "prestige", self bot_get_prestige() ); {
self setPlayerData( "experience", self bot_get_rank() );
self setPlayerData( "prestige", self bot_get_prestige() );
self setPlayerData( "cardTitle", random( getCardTitles() ) ); self setPlayerData( "cardTitle", random( getCardTitles() ) );
self setPlayerData( "cardIcon", random( getCardIcons() ) ); self setPlayerData( "cardIcon", random( getCardIcons() ) );
}
self setClasses(); self setClasses();
self setKillstreaks(); self setKillstreaks();
@ -737,21 +740,24 @@ setClasses()
if ( perk1 != "specialty_bling" || !isDefined( self.pers["bots"]["unlocks"]["upgraded_specialty_bling"] ) ) if ( perk1 != "specialty_bling" || !isDefined( self.pers["bots"]["unlocks"]["upgraded_specialty_bling"] ) )
secondaryAtts[1] = "none"; secondaryAtts[1] = "none";
self setPlayerData( "customClasses", i, "weaponSetups", 0, "weapon", primary ); if ( !getDvarInt( "developer_script" ) )
self setPlayerData( "customClasses", i, "weaponSetups", 0, "attachment", 0, primaryAtts[0] ); {
self setPlayerData( "customClasses", i, "weaponSetups", 0, "attachment", 1, primaryAtts[1] ); self setPlayerData( "customClasses", i, "weaponSetups", 0, "weapon", primary );
self setPlayerData( "customClasses", i, "weaponSetups", 0, "camo", primaryCamo ); self setPlayerData( "customClasses", i, "weaponSetups", 0, "attachment", 0, primaryAtts[0] );
self setPlayerData( "customClasses", i, "weaponSetups", 0, "attachment", 1, primaryAtts[1] );
self setPlayerData( "customClasses", i, "weaponSetups", 0, "camo", primaryCamo );
self setPlayerData( "customClasses", i, "weaponSetups", 1, "weapon", secondary ); self setPlayerData( "customClasses", i, "weaponSetups", 1, "weapon", secondary );
self setPlayerData( "customClasses", i, "weaponSetups", 1, "attachment", 0, secondaryAtts[0] ); self setPlayerData( "customClasses", i, "weaponSetups", 1, "attachment", 0, secondaryAtts[0] );
self setPlayerData( "customClasses", i, "weaponSetups", 1, "attachment", 1, secondaryAtts[1] ); self setPlayerData( "customClasses", i, "weaponSetups", 1, "attachment", 1, secondaryAtts[1] );
self setPlayerData( "customClasses", i, "perks", 0, equipment ); self setPlayerData( "customClasses", i, "perks", 0, equipment );
self setPlayerData( "customClasses", i, "perks", 1, perk1 ); self setPlayerData( "customClasses", i, "perks", 1, perk1 );
self setPlayerData( "customClasses", i, "perks", 2, perk2 ); self setPlayerData( "customClasses", i, "perks", 2, perk2 );
self setPlayerData( "customClasses", i, "perks", 3, perk3 ); self setPlayerData( "customClasses", i, "perks", 3, perk3 );
self setPlayerData( "customClasses", i, "perks", 4, deathstreak ); self setPlayerData( "customClasses", i, "perks", 4, deathstreak );
self setPlayerData( "customClasses", i, "specialGrenade", tactical ); self setPlayerData( "customClasses", i, "specialGrenade", tactical );
}
} }
} }
@ -871,9 +877,12 @@ setKillstreaks()
if ( killstreaks[2] == "" ) if ( killstreaks[2] == "" )
killstreaks[2] = "predator_missile"; killstreaks[2] = "predator_missile";
self setPlayerData( "killstreaks", 0, killstreaks[0] ); if ( !getDvarInt( "developer_script" ) )
self setPlayerData( "killstreaks", 1, killstreaks[1] ); {
self setPlayerData( "killstreaks", 2, killstreaks[2] ); self setPlayerData( "killstreaks", 0, killstreaks[0] );
self setPlayerData( "killstreaks", 1, killstreaks[1] );
self setPlayerData( "killstreaks", 2, killstreaks[2] );
}
} }
/* /*
@ -1040,7 +1049,7 @@ doKillcamStuff()
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "killcam_ended" ); self endon( "killcam_ended" );
self BotNotifyBotChat("killcam", "start"); self BotNotifyBotChat( "killcam", "start" );
wait 0.5 + randomInt( 3 ); wait 0.5 + randomInt( 3 );
@ -1051,7 +1060,7 @@ doKillcamStuff()
self notify( "abort_killcam" ); self notify( "abort_killcam" );
self BotNotifyBotChat("killcam", "stop"); self BotNotifyBotChat( "killcam", "stop" );
} }
/* /*
@ -5508,7 +5517,7 @@ bot_sab_loop()
} }
// lets go defuse // lets go defuse
self BotNotifyBotChat( "sab", "go", "defuse" ); self BotNotifyBotChat( "sab", "go", "defuse" );
self.bot_lock_goal = true; self.bot_lock_goal = true;

View File

@ -16,15 +16,15 @@ init()
initBufferedStats() initBufferedStats()
{ {
self.bufferedStats = []; self.bufferedStats = [];
self.bufferedStats[ "totalShots" ] = self getPlayerData( "totalShots" ); self.bufferedStats[ "totalShots" ] = self getPlayerData( "totalShots" );
self.bufferedStats[ "accuracy" ] = self getPlayerData( "accuracy" ); self.bufferedStats[ "accuracy" ] = self getPlayerData( "accuracy" );
self.bufferedStats[ "misses" ] = self getPlayerData( "misses" ); self.bufferedStats[ "misses" ] = self getPlayerData( "misses" );
self.bufferedStats[ "hits" ] = self getPlayerData( "hits" ); self.bufferedStats[ "hits" ] = self getPlayerData( "hits" );
self.bufferedStats[ "timePlayedAllies" ] = self getPlayerData( "timePlayedAllies" ); self.bufferedStats[ "timePlayedAllies" ] = self getPlayerData( "timePlayedAllies" );
self.bufferedStats[ "timePlayedOpfor" ] = self getPlayerData( "timePlayedOpfor" ); self.bufferedStats[ "timePlayedOpfor" ] = self getPlayerData( "timePlayedOpfor" );
self.bufferedStats[ "timePlayedOther" ] = self getPlayerData( "timePlayedOther" ); self.bufferedStats[ "timePlayedOther" ] = self getPlayerData( "timePlayedOther" );
self.bufferedStats[ "timePlayedTotal" ] = self getPlayerData( "timePlayedTotal" ); self.bufferedStats[ "timePlayedTotal" ] = self getPlayerData( "timePlayedTotal" );
self.bufferedChildStats = []; self.bufferedChildStats = [];
self.bufferedChildStats[ "round" ] = []; self.bufferedChildStats[ "round" ] = [];
self.bufferedChildStats[ "round" ][ "timePlayed" ] = self getPlayerData( "round", "timePlayed" ); self.bufferedChildStats[ "round" ][ "timePlayed" ] = self getPlayerData( "round", "timePlayed" );
@ -60,10 +60,13 @@ Sets the value of the named stat
statSet( dataName, value ) statSet( dataName, value )
{ {
assert( !isDefined( self.bufferedStats[ dataName ] ) ); // should use statGetBuffered consistently with statSetBuffered assert( !isDefined( self.bufferedStats[ dataName ] ) ); // should use statGetBuffered consistently with statSetBuffered
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
if (getDvarInt("developer_script"))
return;
self SetPlayerData( dataName, value ); self SetPlayerData( dataName, value );
} }
@ -75,12 +78,15 @@ Adds the passed value to the value of the named stat
============= =============
*/ */
statAdd( dataName, value ) statAdd( dataName, value )
{ {
assert( !isDefined( self.bufferedStats[ dataName ] ) ); // should use statGetBuffered consistently with statSetBuffered assert( !isDefined( self.bufferedStats[ dataName ] ) ); // should use statGetBuffered consistently with statSetBuffered
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
if (getDvarInt("developer_script"))
return;
curValue = self GetPlayerData( dataName ); curValue = self GetPlayerData( dataName );
self SetPlayerData( dataName, value + curValue ); self SetPlayerData( dataName, value + curValue );
} }
@ -96,7 +102,10 @@ statSetChild( parent, child, value )
{ {
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
if (getDvarInt("developer_script"))
return;
self SetPlayerData( parent, child, value ); self SetPlayerData( parent, child, value );
} }
@ -107,7 +116,10 @@ statAddChild( parent, child, value )
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
if (getDvarInt("developer_script"))
return;
curValue = self GetPlayerData( parent, child ); curValue = self GetPlayerData( parent, child );
self SetPlayerData( parent, child, curValue + value ); self SetPlayerData( parent, child, curValue + value );
} }
@ -116,7 +128,7 @@ statAddChild( parent, child, value )
statGetChildBuffered( parent, child ) statGetChildBuffered( parent, child )
{ {
assert( isDefined( self.bufferedChildStats[ parent ][ child ] ) ); assert( isDefined( self.bufferedChildStats[ parent ][ child ] ) );
return self.bufferedChildStats[ parent ][ child ]; return self.bufferedChildStats[ parent ][ child ];
} }
@ -124,7 +136,7 @@ statGetChildBuffered( parent, child )
statSetChildBuffered( parent, child, value ) statSetChildBuffered( parent, child, value )
{ {
assert( isDefined( self.bufferedChildStats[ parent ][ child ] ) ); assert( isDefined( self.bufferedChildStats[ parent ][ child ] ) );
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
@ -138,7 +150,7 @@ statAddChildBuffered( parent, child, value )
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
curValue = statGetChildBuffered( parent, child ); curValue = statGetChildBuffered( parent, child );
statSetChildBuffered( parent, child, curValue + value ); statSetChildBuffered( parent, child, curValue + value );
} }
@ -154,7 +166,7 @@ Returns the value of the named stat
statGetBuffered( dataName ) statGetBuffered( dataName )
{ {
assert( isDefined( self.bufferedStats[ dataName ] ) ); assert( isDefined( self.bufferedStats[ dataName ] ) );
return self.bufferedStats[ dataName ]; return self.bufferedStats[ dataName ];
} }
@ -171,7 +183,7 @@ statSetBuffered( dataName, value )
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
self.bufferedStats[ dataName ] = value; self.bufferedStats[ dataName ] = value;
} }
@ -183,12 +195,12 @@ Adds the passed value to the value of the named stat
============= =============
*/ */
statAddBuffered( dataName, value ) statAddBuffered( dataName, value )
{ {
assert( isDefined( self.bufferedStats[ dataName ] ) ); assert( isDefined( self.bufferedStats[ dataName ] ) );
if ( !self rankingEnabled() ) if ( !self rankingEnabled() )
return; return;
curValue = statGetBuffered( dataName ); curValue = statGetBuffered( dataName );
statSetBuffered( dataName, curValue + value ); statSetBuffered( dataName, curValue + value );
} }
@ -198,7 +210,7 @@ updateBufferedStats()
{ {
// give the first player time to connect // give the first player time to connect
wait ( 0.15 ); wait ( 0.15 );
nextToUpdate = 0; nextToUpdate = 0;
while ( !level.gameEnded ) while ( !level.gameEnded )
{ {
@ -211,9 +223,9 @@ updateBufferedStats()
wait ( 2.0 ); wait ( 2.0 );
} }
foreach ( player in level.players ) foreach ( player in level.players )
player writeBufferedStats(); player writeBufferedStats();
} }
@ -221,7 +233,7 @@ writeBufferedStats()
{ {
if (getDvarInt("developer_script")) if (getDvarInt("developer_script"))
return; return;
foreach ( statName, statVal in self.bufferedStats ) foreach ( statName, statVal in self.bufferedStats )
{ {
self setPlayerData( statName, statVal ); self setPlayerData( statName, statVal );