mirror of
https://github.com/JezuzLizard/t4sp_bot_warfare.git
synced 2025-06-30 00:01:58 +00:00
casing fixes
This commit is contained in:
ineed bots
@ -39,9 +39,9 @@ watch_for_objective_canceled()
|
||||
|
||||
obj_name = "undefined";
|
||||
|
||||
if ( isDefined( self.bot_current_objective ) )
|
||||
if ( isdefined( self.bot_current_objective ) )
|
||||
{
|
||||
obj_name = self.bot_current_objective.sName;
|
||||
obj_name = self.bot_current_objective.sname;
|
||||
}
|
||||
|
||||
self BotNotifyBotEvent( "debug", "watch_for_objective_canceled: " + obj_name + ": " + reason );
|
||||
@ -60,11 +60,11 @@ clean_objective_on_completion()
|
||||
|
||||
obj_name = "undefined";
|
||||
|
||||
if ( isDefined( self.bot_current_objective ) )
|
||||
if ( isdefined( self.bot_current_objective ) )
|
||||
{
|
||||
obj_name = self.bot_current_objective.sName;
|
||||
obj_name = self.bot_current_objective.sname;
|
||||
|
||||
self.bot_current_objective.eParentObj.aBotProcessTimes[self GetEntityNumber() + ""] = getTime();
|
||||
self.bot_current_objective.eparentobj.abotprocesstimes[self getentitynumber() + ""] = gettime();
|
||||
}
|
||||
|
||||
self BotNotifyBotEvent( "debug", "clean_objective_on_completion: " + obj_name + ": " + successful + ": " + reason );
|
||||
@ -95,21 +95,21 @@ bot_objective_think()
|
||||
|
||||
// find all avail objectives
|
||||
objectives = [];
|
||||
now = getTime();
|
||||
our_key = self GetEntityNumber() + "";
|
||||
now = gettime();
|
||||
our_key = self getentitynumber() + "";
|
||||
|
||||
for ( i = 0; i < level.bot_objectives.size; i++ )
|
||||
{
|
||||
objective = level.bot_objectives[i];
|
||||
|
||||
// check the process rate
|
||||
if ( isDefined( objective.aBotProcessTimes[our_key] ) && now - objective.aBotProcessTimes[our_key] < objective.iProcessRate )
|
||||
if ( isdefined( objective.abotprocesstimes[our_key] ) && now - objective.abotprocesstimes[our_key] < objective.iprocessrate )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
objectives = array_merge( objectives, self [[objective.fpFinder]]( objective ) );
|
||||
objective.aBotProcessTimes[our_key] = now;
|
||||
objectives = array_merge( objectives, self [[objective.fpfinder]]( objective ) );
|
||||
objective.abotprocesstimes[our_key] = now;
|
||||
}
|
||||
|
||||
if ( objectives.size <= 0 )
|
||||
@ -122,7 +122,7 @@ bot_objective_think()
|
||||
|
||||
for ( i = 0; i < objectives.size; i++ )
|
||||
{
|
||||
if ( objectives[i].fPriority <= -100 )
|
||||
if ( objectives[i].fpriority <= -100 )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@ -133,36 +133,36 @@ bot_objective_think()
|
||||
// pop the top!
|
||||
best_prio = heap.data[0];
|
||||
|
||||
if ( !isDefined( best_prio ) )
|
||||
if ( !isdefined( best_prio ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// already on a better obj
|
||||
if ( isDefined( self.bot_current_objective ) && ( best_prio.GUID == self.bot_current_objective.GUID || best_prio.fPriority < self [[self.bot_current_objective.eParentObj.fpPriorty]]( self.bot_current_objective.eParentObj, self.bot_current_objective.eEnt ) ) )
|
||||
if ( isdefined( self.bot_current_objective ) && ( best_prio.guid == self.bot_current_objective.guid || best_prio.fpriority < self [[self.bot_current_objective.eparentobj.fppriorty]]( self.bot_current_objective.eparentobj, self.bot_current_objective.eent ) ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// DO THE OBJ
|
||||
// cancel the old obj
|
||||
if ( isDefined( self.bot_current_objective ) )
|
||||
if ( isdefined( self.bot_current_objective ) )
|
||||
{
|
||||
// cancel it
|
||||
self CancelObjective( "new obj: " + best_prio.sName );
|
||||
self CancelObjective( "new obj: " + best_prio.sname );
|
||||
|
||||
// wait for it to clean up
|
||||
self waittill( "completed_bot_objective" );
|
||||
|
||||
// redo the loop, should do the obj next iteration
|
||||
best_prio.eParentObj.aBotProcessTimes[our_key] = undefined;
|
||||
best_prio.eparentobj.abotprocesstimes[our_key] = undefined;
|
||||
continue;
|
||||
}
|
||||
|
||||
// ready to execute
|
||||
self BotNotifyBotEvent( "debug", "bot_objective_think: " + best_prio.sName );
|
||||
self BotNotifyBotEvent( "debug", "bot_objective_think: " + best_prio.sname );
|
||||
|
||||
self.bot_current_objective = best_prio;
|
||||
self thread [[best_prio.eParentObj.fpExecuter]]( best_prio );
|
||||
self thread [[best_prio.eparentobj.fpexecuter]]( best_prio );
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
init()
|
||||
{
|
||||
vending_triggers = GetEntArray( "zombie_vending", "targetname" );
|
||||
vending_triggers = getentarray( "zombie_vending", "targetname" );
|
||||
|
||||
if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
if ( !isdefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
{
|
||||
vending_triggers = getEntArray( "harrybo21_perk_trigger", "targetname" );
|
||||
vending_triggers = getentarray( "harrybo21_perk_trigger", "targetname" );
|
||||
|
||||
if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
if ( !isdefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
{
|
||||
return;
|
||||
}
|
||||
@ -55,13 +55,13 @@ Finder( eObj )
|
||||
return answer;
|
||||
}
|
||||
|
||||
vending_triggers = GetEntArray( "zombie_vending", "targetname" );
|
||||
vending_triggers = getentarray( "zombie_vending", "targetname" );
|
||||
|
||||
if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
if ( !isdefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
{
|
||||
vending_triggers = getEntArray( "harrybo21_perk_trigger", "targetname" );
|
||||
vending_triggers = getentarray( "harrybo21_perk_trigger", "targetname" );
|
||||
|
||||
if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
if ( !isdefined( vending_triggers ) || vending_triggers.size < 1 )
|
||||
{
|
||||
return answer;
|
||||
}
|
||||
@ -85,14 +85,14 @@ Finder( eObj )
|
||||
}
|
||||
|
||||
// perk limit??
|
||||
if ( self HasPerk( perk ) )
|
||||
if ( self hasperk( perk ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
machine = vending getMachine();
|
||||
|
||||
if ( !isDefined( machine ) )
|
||||
if ( !isdefined( machine ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@ -112,7 +112,7 @@ Finder( eObj )
|
||||
|
||||
getMachine()
|
||||
{
|
||||
return GetEnt( self.target, "targetname" );
|
||||
return getent( self.target, "targetname" );
|
||||
}
|
||||
|
||||
getVendingPerk()
|
||||
@ -187,7 +187,7 @@ Executer( eObj )
|
||||
self endon( "disconnect" );
|
||||
self endon( "zombified" );
|
||||
|
||||
vending = eObj.eEnt;
|
||||
vending = eObj.eent;
|
||||
|
||||
self thread WatchForCancel( vending );
|
||||
|
||||
@ -197,7 +197,7 @@ Executer( eObj )
|
||||
self ClearScriptAimPos();
|
||||
self ClearScriptGoal();
|
||||
|
||||
self CompletedObjective( eObj.bWasSuccessful, eObj.sReason );
|
||||
self CompletedObjective( eObj.bwassuccessful, eObj.sreason );
|
||||
}
|
||||
|
||||
WatchForCancelCleanup()
|
||||
@ -236,7 +236,7 @@ WatchToGoToMachine( vending )
|
||||
{
|
||||
wait 0.05;
|
||||
|
||||
if ( self IsTouching( vending ) || vending PointInsideUseTrigger( self.origin ) )
|
||||
if ( self istouching( vending ) || vending PointInsideUseTrigger( self.origin ) )
|
||||
{
|
||||
self notify( "goal" );
|
||||
break; // is this needed?
|
||||
@ -248,7 +248,7 @@ GoDoPerkMachine( eObj )
|
||||
{
|
||||
self endon( "cancel_bot_objective" );
|
||||
|
||||
vending = eObj.eEnt;
|
||||
vending = eObj.eent;
|
||||
machine = vending getMachine();
|
||||
perk = vending getVendingPerk();
|
||||
org = self getOffset( machine );
|
||||
@ -261,13 +261,13 @@ GoDoPerkMachine( eObj )
|
||||
|
||||
if ( result != "goal" )
|
||||
{
|
||||
eObj.sReason = "didn't go to machine";
|
||||
eObj.sreason = "didn't go to machine";
|
||||
return;
|
||||
}
|
||||
|
||||
if ( !self IsTouching( vending ) && !vending PointInsideUseTrigger( self.origin ) )
|
||||
if ( !self istouching( vending ) && !vending PointInsideUseTrigger( self.origin ) )
|
||||
{
|
||||
eObj.sReason = "not touching machine";
|
||||
eObj.sreason = "not touching machine";
|
||||
return;
|
||||
}
|
||||
|
||||
@ -282,6 +282,6 @@ GoDoPerkMachine( eObj )
|
||||
wait 0.1;
|
||||
|
||||
// ok we pressed use, DONE
|
||||
eObj.sReason = "completed " + perk;
|
||||
eObj.bWasSuccessful = true;
|
||||
eObj.sreason = "completed " + perk;
|
||||
eObj.bwassuccessful = true;
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ Finder( eObj )
|
||||
for ( i = 0; i < ents.size; i++ )
|
||||
{
|
||||
// not a powerup script_model
|
||||
if ( !isDefined( ents[i].powerup_name ) )
|
||||
if ( !isdefined( ents[i].powerup_name ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@ -59,7 +59,7 @@ Executer( eObj )
|
||||
self endon( "disconnect" );
|
||||
self endon( "zombified" );
|
||||
|
||||
powerup = eObj.eEnt;
|
||||
powerup = eObj.eent;
|
||||
org = powerup.origin;
|
||||
|
||||
self thread IncrementBotsForEntity( powerup );
|
||||
@ -73,11 +73,11 @@ Executer( eObj )
|
||||
|
||||
if ( distance( org, self.origin ) <= 64 )
|
||||
{
|
||||
eObj.sReason = "completed";
|
||||
eObj.bWasSuccessful = true;
|
||||
eObj.sreason = "completed";
|
||||
eObj.bwassuccessful = true;
|
||||
}
|
||||
|
||||
self CompletedObjective( eObj.bWasSuccessful, eObj.sReason );
|
||||
self CompletedObjective( eObj.bwassuccessful, eObj.sreason );
|
||||
}
|
||||
|
||||
WatchForCancelCleanup()
|
||||
@ -113,7 +113,7 @@ GoDoPowerup( eObj )
|
||||
{
|
||||
self endon( "cancel_bot_objective" );
|
||||
|
||||
powerup = eObj.eEnt;
|
||||
powerup = eObj.eent;
|
||||
|
||||
// go to it
|
||||
self SetScriptGoal( powerup.origin, 32 );
|
||||
@ -122,21 +122,21 @@ GoDoPowerup( eObj )
|
||||
|
||||
if ( result != "goal" )
|
||||
{
|
||||
eObj.sReason = "didn't go to powerup";
|
||||
eObj.sreason = "didn't go to powerup";
|
||||
return;
|
||||
}
|
||||
|
||||
if ( !isDefined( powerup ) || !isDefined( powerup.origin ) )
|
||||
if ( !isdefined( powerup ) || !isdefined( powerup.origin ) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if ( distance( powerup.origin, self.origin ) > 64 )
|
||||
{
|
||||
eObj.sReason = "not touching it";
|
||||
eObj.sreason = "not touching it";
|
||||
return;
|
||||
}
|
||||
|
||||
eObj.sReason = "completed";
|
||||
eObj.bWasSuccessful = true;
|
||||
eObj.sreason = "completed";
|
||||
eObj.bwassuccessful = true;
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ Finder( eObj )
|
||||
{
|
||||
Player = Players[i];
|
||||
|
||||
if ( !IsDefined( Player ) || !IsDefined( Player.team ) )
|
||||
if ( !isdefined( Player ) || !isdefined( Player.team ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@ -71,7 +71,7 @@ Executer( eObj )
|
||||
self endon( "disconnect" );
|
||||
self endon( "zombified" );
|
||||
|
||||
revivee = eObj.eEnt;
|
||||
revivee = eObj.eent;
|
||||
|
||||
self thread IncrementBotsForEntity( revivee );
|
||||
self thread WatchForCancelRevive( revivee );
|
||||
@ -84,7 +84,7 @@ Executer( eObj )
|
||||
self ClearScriptGoal();
|
||||
self ClearPriorityObjective();
|
||||
|
||||
self CompletedObjective( eObj.bWasSuccessful, eObj.sReason );
|
||||
self CompletedObjective( eObj.bwassuccessful, eObj.sreason );
|
||||
}
|
||||
|
||||
WatchForCancelReviveCleanup()
|
||||
@ -143,7 +143,7 @@ WatchToGoToGuy( revivee )
|
||||
{
|
||||
wait 1;
|
||||
|
||||
if ( self IsTouching( revivee.revivetrigger ) )
|
||||
if ( self istouching( revivee.revivetrigger ) )
|
||||
{
|
||||
self notify( "goal" );
|
||||
break; // is this needed?
|
||||
@ -156,14 +156,14 @@ WatchForSuccessRevive( eObj )
|
||||
self endon( "disconnect" );
|
||||
self endon( "zombified" );
|
||||
|
||||
revivee = eObj.eEnt;
|
||||
revivee = eObj.eent;
|
||||
|
||||
ret = self waittill_either_return( "cancel_bot_objective", "completed_bot_objective" );
|
||||
|
||||
if ( ret == "cancel_bot_objective" && isDefined( revivee ) && !revivee inLastStand() )
|
||||
if ( ret == "cancel_bot_objective" && isdefined( revivee ) && !revivee inLastStand() )
|
||||
{
|
||||
eObj.bWasSuccessful = true;
|
||||
eObj.sReason = "revived him!";
|
||||
eObj.bwassuccessful = true;
|
||||
eObj.sreason = "revived him!";
|
||||
}
|
||||
}
|
||||
|
||||
@ -171,7 +171,7 @@ GoDoRevive( eObj )
|
||||
{
|
||||
self endon( "cancel_bot_objective" );
|
||||
|
||||
revivee = eObj.eEnt;
|
||||
revivee = eObj.eent;
|
||||
|
||||
// go to guy
|
||||
self thread WatchToGoToGuy( revivee );
|
||||
@ -182,13 +182,13 @@ GoDoRevive( eObj )
|
||||
|
||||
if ( result != "goal" )
|
||||
{
|
||||
eObj.sReason = "didn't go to guy";
|
||||
eObj.sreason = "didn't go to guy";
|
||||
return;
|
||||
}
|
||||
|
||||
if ( !self IsTouching( revivee.revivetrigger ) )
|
||||
if ( !self istouching( revivee.revivetrigger ) )
|
||||
{
|
||||
eObj.sReason = "not touching guy";
|
||||
eObj.sreason = "not touching guy";
|
||||
return;
|
||||
}
|
||||
|
||||
@ -198,12 +198,12 @@ GoDoRevive( eObj )
|
||||
// now lets hold use until he is up or otherwise
|
||||
self thread WatchForSuccessRevive( eObj );
|
||||
|
||||
while ( self IsTouching( revivee.revivetrigger ) )
|
||||
while ( self istouching( revivee.revivetrigger ) )
|
||||
{
|
||||
self thread BotPressUse( 0.15 );
|
||||
|
||||
wait 0.1;
|
||||
}
|
||||
|
||||
eObj.sReason = "not touching guy";
|
||||
eObj.sreason = "not touching guy";
|
||||
}
|
||||
|
||||
@ -12,17 +12,17 @@ Finder( eObj )
|
||||
return answer;
|
||||
}
|
||||
|
||||
weapons = self GetWeaponsList();
|
||||
weapons = self getweaponslist();
|
||||
|
||||
// TODO check if need a new weapon, rate weapons too is better then current etc
|
||||
chests = level.chests;
|
||||
|
||||
if ( !isDefined( chests ) )
|
||||
if ( !isdefined( chests ) )
|
||||
{
|
||||
chests = GetEntArray( "treasure_chest_use", "targetname" );
|
||||
chests = getentarray( "treasure_chest_use", "targetname" );
|
||||
}
|
||||
|
||||
if ( !isDefined( chests ) || chests.size <= 0 )
|
||||
if ( !isdefined( chests ) || chests.size <= 0 )
|
||||
{
|
||||
return answer;
|
||||
}
|
||||
@ -32,24 +32,24 @@ Finder( eObj )
|
||||
chest = chests[i];
|
||||
|
||||
// not active chest
|
||||
if ( isDefined( chest.disabled ) && chest.disabled )
|
||||
if ( isdefined( chest.disabled ) && chest.disabled )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// box is waiting for someone to grab weapon
|
||||
if ( isDefined( chest.grab_weapon_hint ) && chest.grab_weapon_hint )
|
||||
if ( isdefined( chest.grab_weapon_hint ) && chest.grab_weapon_hint )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
cost = 950;
|
||||
|
||||
if ( IsDefined( level.zombie_treasure_chest_cost ) )
|
||||
if ( isdefined( level.zombie_treasure_chest_cost ) )
|
||||
{
|
||||
cost = level.zombie_treasure_chest_cost;
|
||||
}
|
||||
else if ( isDefined( chest.zombie_cost ) )
|
||||
else if ( isdefined( chest.zombie_cost ) )
|
||||
{
|
||||
cost = chest.zombie_cost;
|
||||
}
|
||||
@ -62,7 +62,7 @@ Finder( eObj )
|
||||
|
||||
lid = getent( chest.target, "targetname" );
|
||||
|
||||
if ( !isDefined( lid ) )
|
||||
if ( !isdefined( lid ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@ -112,7 +112,7 @@ Executer( eObj )
|
||||
self endon( "disconnect" );
|
||||
self endon( "zombified" );
|
||||
|
||||
chest = eObj.eEnt;
|
||||
chest = eObj.eent;
|
||||
|
||||
self thread WatchForCancel( chest );
|
||||
|
||||
@ -123,7 +123,7 @@ Executer( eObj )
|
||||
self ClearScriptGoal();
|
||||
self ClearPriorityObjective();
|
||||
|
||||
self CompletedObjective( eObj.bWasSuccessful, eObj.sReason );
|
||||
self CompletedObjective( eObj.bwassuccessful, eObj.sreason );
|
||||
}
|
||||
|
||||
WatchForCancelCleanup()
|
||||
@ -162,13 +162,13 @@ WatchToGoToChest( chest )
|
||||
{
|
||||
wait 0.05;
|
||||
|
||||
if ( self IsTouching( chest ) || chest PointInsideUseTrigger( self.origin ) )
|
||||
if ( self istouching( chest ) || chest PointInsideUseTrigger( self.origin ) )
|
||||
{
|
||||
self notify( "goal" );
|
||||
break; // is this needed?
|
||||
}
|
||||
|
||||
if ( isDefined( chest.disabled ) && chest.disabled )
|
||||
if ( isdefined( chest.disabled ) && chest.disabled )
|
||||
{
|
||||
self notify( "bad_path" );
|
||||
break; // is this needed?
|
||||
@ -180,14 +180,14 @@ GoDoTreasureChest( eObj )
|
||||
{
|
||||
self endon( "cancel_bot_objective" );
|
||||
|
||||
chest = eObj.eEnt;
|
||||
chest = eObj.eent;
|
||||
lid = getent( chest.target, "targetname" );
|
||||
weapon_spawn_org = getent( lid.target, "targetname" );
|
||||
org = self getOffset( lid );
|
||||
|
||||
weap = self GetCurrentWeapon();
|
||||
weap = self getcurrentweapon();
|
||||
|
||||
if ( weap == "none" || !self getAmmoCount( weap ) )
|
||||
if ( weap == "none" || !self getammocount( weap ) )
|
||||
{
|
||||
self SetPriorityObjective();
|
||||
}
|
||||
@ -200,13 +200,13 @@ GoDoTreasureChest( eObj )
|
||||
|
||||
if ( result != "goal" )
|
||||
{
|
||||
eObj.sReason = "didn't go to chest";
|
||||
eObj.sreason = "didn't go to chest";
|
||||
return;
|
||||
}
|
||||
|
||||
if ( !self IsTouching( chest ) && !chest PointInsideUseTrigger( self.origin ) )
|
||||
if ( !self istouching( chest ) && !chest PointInsideUseTrigger( self.origin ) )
|
||||
{
|
||||
eObj.sReason = "not touching chest";
|
||||
eObj.sreason = "not touching chest";
|
||||
return;
|
||||
}
|
||||
|
||||
@ -225,9 +225,9 @@ GoDoTreasureChest( eObj )
|
||||
self ClearPriorityObjective();
|
||||
|
||||
// randomization isnt happening...
|
||||
if ( !isDefined( chest.disabled ) || !chest.disabled )
|
||||
if ( !isdefined( chest.disabled ) || !chest.disabled )
|
||||
{
|
||||
eObj.sReason = "chest isnt randomizing";
|
||||
eObj.sreason = "chest isnt randomizing";
|
||||
return;
|
||||
}
|
||||
|
||||
@ -235,13 +235,13 @@ GoDoTreasureChest( eObj )
|
||||
|
||||
if (ret == "timeout")
|
||||
{
|
||||
eObj.sReason = "randomization_done timed out";
|
||||
eObj.sreason = "randomization_done timed out";
|
||||
return;
|
||||
}
|
||||
|
||||
if ( isDefined( level.flag[ "moving_chest_now" ] ) && flag( "moving_chest_now" ) )
|
||||
if ( isdefined( level.flag[ "moving_chest_now" ] ) && flag( "moving_chest_now" ) )
|
||||
{
|
||||
eObj.sReason = "chest is moving!";
|
||||
eObj.sreason = "chest is moving!";
|
||||
return;
|
||||
}
|
||||
|
||||
@ -258,13 +258,13 @@ GoDoTreasureChest( eObj )
|
||||
|
||||
if ( result != "goal" )
|
||||
{
|
||||
eObj.sReason = "didn't go to chest";
|
||||
eObj.sreason = "didn't go to chest";
|
||||
return;
|
||||
}
|
||||
|
||||
if ( !self IsTouching( chest ) && !chest PointInsideUseTrigger( self.origin ) )
|
||||
if ( !self istouching( chest ) && !chest PointInsideUseTrigger( self.origin ) )
|
||||
{
|
||||
eObj.sReason = "not touching chest";
|
||||
eObj.sreason = "not touching chest";
|
||||
return;
|
||||
}
|
||||
|
||||
@ -279,6 +279,6 @@ GoDoTreasureChest( eObj )
|
||||
wait 0.1;
|
||||
|
||||
// complete!
|
||||
eObj.sReason = "completed " + weap;
|
||||
eObj.bWasSuccessful = true;
|
||||
eObj.sreason = "completed " + weap;
|
||||
eObj.bwassuccessful = true;
|
||||
}
|
||||
|
||||
@ -4,43 +4,43 @@
|
||||
|
||||
CreateObjectiveForManger( sName, fpFinder, fpPriorty, fpExecuter, iProcessRate )
|
||||
{
|
||||
Answer = SpawnStruct();
|
||||
Answer = spawnstruct();
|
||||
|
||||
Answer.sName = sName;
|
||||
Answer.fpFinder = fpFinder;
|
||||
Answer.fpExecuter = fpExecuter;
|
||||
Answer.fpPriorty = fpPriorty;
|
||||
Answer.sname = sName;
|
||||
Answer.fpfinder = fpFinder;
|
||||
Answer.fpexecuter = fpExecuter;
|
||||
Answer.fppriorty = fpPriorty;
|
||||
|
||||
Answer.aBotProcessTimes = [];
|
||||
Answer.iProcessRate = iProcessRate;
|
||||
Answer.abotprocesstimes = [];
|
||||
Answer.iprocessrate = iProcessRate;
|
||||
|
||||
return Answer;
|
||||
}
|
||||
|
||||
CreateFinderObjectiveEZ( eObj, eEnt )
|
||||
{
|
||||
return self CreateFinderObjective( eObj, eObj.sName + "_" + eEnt GetEntityNumber(), eEnt, self [[eObj.fpPriorty]]( eObj, eEnt ) );
|
||||
return self CreateFinderObjective( eObj, eObj.sname + "_" + eEnt getentitynumber(), eEnt, self [[eObj.fppriorty]]( eObj, eEnt ) );
|
||||
}
|
||||
|
||||
CreateFinderObjective( eObj, sName, eEnt, fPriority )
|
||||
{
|
||||
Answer = SpawnStruct();
|
||||
Answer = spawnstruct();
|
||||
|
||||
Answer.eParentObj = eObj;
|
||||
Answer.sName = sName;
|
||||
Answer.eEnt = eEnt;
|
||||
Answer.fPriority = fPriority;
|
||||
Answer.GUID = eEnt GetEntityNumber();
|
||||
Answer.eparentobj = eObj;
|
||||
Answer.sname = sName;
|
||||
Answer.eent = eEnt;
|
||||
Answer.fpriority = fPriority;
|
||||
Answer.guid = eEnt getentitynumber();
|
||||
|
||||
Answer.bWasSuccessful = false;
|
||||
Answer.sReason = "canceled";
|
||||
Answer.bwassuccessful = false;
|
||||
Answer.sreason = "canceled";
|
||||
|
||||
return Answer;
|
||||
}
|
||||
|
||||
GetBotsAmountForEntity( eEnt )
|
||||
{
|
||||
if ( !isDefined( eEnt.bots ) )
|
||||
if ( !isdefined( eEnt.bots ) )
|
||||
{
|
||||
eEnt.bots = 0;
|
||||
}
|
||||
@ -56,7 +56,7 @@ IncrementBotsForEntity( eEnt )
|
||||
|
||||
self waittill_either( "disconnect", "zombified" );
|
||||
|
||||
if ( isDefined( eEnt ) )
|
||||
if ( isdefined( eEnt ) )
|
||||
{
|
||||
eEnt.bots--;
|
||||
}
|
||||
@ -66,7 +66,7 @@ DecrementBotsForEntity( eEnt )
|
||||
{
|
||||
self notify( "bots_for_entity_cleanup" );
|
||||
|
||||
if ( isDefined( eEnt ) )
|
||||
if ( isdefined( eEnt ) )
|
||||
{
|
||||
eEnt.bots--;
|
||||
}
|
||||
@ -94,7 +94,7 @@ GetBotObjectiveEnt()
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return self GetBotObjective().eEnt;
|
||||
return self GetBotObjective().eent;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -110,5 +110,5 @@ GetBotObjective()
|
||||
*/
|
||||
HasBotObjective()
|
||||
{
|
||||
return isDefined( self GetBotObjective() );
|
||||
return isdefined( self GetBotObjective() );
|
||||
}
|
||||
|
||||
@ -12,14 +12,14 @@ Finder( eObj )
|
||||
return answer;
|
||||
}
|
||||
|
||||
weapon_spawns = GetEntArray( "weapon_upgrade", "targetname" );
|
||||
weapon_spawns = getentarray( "weapon_upgrade", "targetname" );
|
||||
|
||||
if ( !isDefined( weapon_spawns ) || weapon_spawns.size <= 0 )
|
||||
if ( !isdefined( weapon_spawns ) || weapon_spawns.size <= 0 )
|
||||
{
|
||||
return answer;
|
||||
}
|
||||
|
||||
weapons = self GetWeaponsList();
|
||||
weapons = self getweaponslist();
|
||||
|
||||
// TODO check if need a new weapon, rate weapons too is better then current etc
|
||||
|
||||
@ -27,7 +27,7 @@ Finder( eObj )
|
||||
{
|
||||
player_has_weapon = false;
|
||||
|
||||
if ( !isDefined( weapon_spawns[i].zombie_weapon_upgrade ) )
|
||||
if ( !isdefined( weapon_spawns[i].zombie_weapon_upgrade ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@ -40,7 +40,7 @@ Finder( eObj )
|
||||
}
|
||||
}
|
||||
|
||||
is_grenade = ( WeaponType( weapon_spawns[i].zombie_weapon_upgrade ) == "grenade" );
|
||||
is_grenade = ( weapontype( weapon_spawns[i].zombie_weapon_upgrade ) == "grenade" );
|
||||
|
||||
if ( !player_has_weapon || is_grenade )
|
||||
{
|
||||
@ -63,12 +63,12 @@ Finder( eObj )
|
||||
|
||||
model = weapon_spawns[ i ];
|
||||
|
||||
if ( isDefined( weapon_spawns[ i ].target ) )
|
||||
if ( isdefined( weapon_spawns[ i ].target ) )
|
||||
{
|
||||
model = getEnt( weapon_spawns[ i ].target, "targetname" );
|
||||
model = getent( weapon_spawns[ i ].target, "targetname" );
|
||||
}
|
||||
|
||||
if ( !isDefined( model ) )
|
||||
if ( !isdefined( model ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@ -112,7 +112,7 @@ Priority( eObj, eEnt )
|
||||
base_priority -= 1;
|
||||
}
|
||||
|
||||
if ( isSubStr( eEnt.zombie_weapon_upgrade, "kar98k" ) || isSubStr( eEnt.zombie_weapon_upgrade, "type99" ) )
|
||||
if ( issubstr( eEnt.zombie_weapon_upgrade, "kar98k" ) || issubstr( eEnt.zombie_weapon_upgrade, "type99" ) )
|
||||
{
|
||||
base_priority -= 999;
|
||||
}
|
||||
@ -125,7 +125,7 @@ Executer( eObj )
|
||||
self endon( "disconnect" );
|
||||
self endon( "zombified" );
|
||||
|
||||
weapon = eObj.eEnt;
|
||||
weapon = eObj.eent;
|
||||
|
||||
self thread WatchForCancel( weapon );
|
||||
|
||||
@ -136,7 +136,7 @@ Executer( eObj )
|
||||
self ClearScriptGoal();
|
||||
self ClearPriorityObjective();
|
||||
|
||||
self CompletedObjective( eObj.bWasSuccessful, eObj.sReason );
|
||||
self CompletedObjective( eObj.bwassuccessful, eObj.sreason );
|
||||
}
|
||||
|
||||
WatchForCancelCleanup()
|
||||
@ -175,7 +175,7 @@ WatchToGoToWeapon( weapon )
|
||||
{
|
||||
wait 0.05;
|
||||
|
||||
if ( self IsTouching( weapon ) || weapon PointInsideUseTrigger( self.origin ) )
|
||||
if ( self istouching( weapon ) || weapon PointInsideUseTrigger( self.origin ) )
|
||||
{
|
||||
self notify( "goal" );
|
||||
break; // is this needed?
|
||||
@ -187,19 +187,19 @@ GoDoWallweapon( eObj )
|
||||
{
|
||||
self endon( "cancel_bot_objective" );
|
||||
|
||||
weapon = eObj.eEnt;
|
||||
weapon = eObj.eent;
|
||||
model = weapon;
|
||||
|
||||
if ( isDefined( weapon.target ) )
|
||||
if ( isdefined( weapon.target ) )
|
||||
{
|
||||
model = getEnt( weapon.target, "targetname" );
|
||||
model = getent( weapon.target, "targetname" );
|
||||
}
|
||||
|
||||
org = self getOffset( model, weapon );
|
||||
|
||||
weap = self GetCurrentWeapon();
|
||||
weap = self getcurrentweapon();
|
||||
|
||||
if ( weap == "none" || !self getAmmoCount( weap ) )
|
||||
if ( weap == "none" || !self getammocount( weap ) )
|
||||
{
|
||||
self SetPriorityObjective();
|
||||
}
|
||||
@ -212,13 +212,13 @@ GoDoWallweapon( eObj )
|
||||
|
||||
if ( result != "goal" )
|
||||
{
|
||||
eObj.sReason = "didn't go to weapon";
|
||||
eObj.sreason = "didn't go to weapon";
|
||||
return;
|
||||
}
|
||||
|
||||
if ( !self IsTouching( weapon ) && !weapon PointInsideUseTrigger( self.origin ) )
|
||||
if ( !self istouching( weapon ) && !weapon PointInsideUseTrigger( self.origin ) )
|
||||
{
|
||||
eObj.sReason = "not touching weapon";
|
||||
eObj.sreason = "not touching weapon";
|
||||
return;
|
||||
}
|
||||
|
||||
@ -232,6 +232,6 @@ GoDoWallweapon( eObj )
|
||||
self thread BotPressUse( 0.15 );
|
||||
wait 0.1;
|
||||
|
||||
eObj.sReason = "completed";
|
||||
eObj.bWasSuccessful = true;
|
||||
eObj.sreason = "completed";
|
||||
eObj.bwassuccessful = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user