diff --git a/maps/bots/objectives/_manager.gsc b/maps/bots/objectives/_manager.gsc index 1a6dfa1..dbbec1d 100644 --- a/maps/bots/objectives/_manager.gsc +++ b/maps/bots/objectives/_manager.gsc @@ -6,8 +6,8 @@ init() { level.bot_objectives = []; - level.bot_objectives[level.bot_objectives.size] = CreateObjectiveForManger( "revive", maps\bots\objectives\_revive::Finder, maps\bots\objectives\_revive::Executer, maps\bots\objectives\_revive::Priority, 1000 ); - level.bot_objectives[level.bot_objectives.size] = CreateObjectiveForManger( "powerup", maps\bots\objectives\_powerup::Finder, maps\bots\objectives\_powerup::Executer, maps\bots\objectives\_powerup::Priority, 2500 ); + level.bot_objectives[level.bot_objectives.size] = CreateObjectiveForManger( "revive", maps\bots\objectives\_revive::Finder, maps\bots\objectives\_revive::Executer, 1000 ); + level.bot_objectives[level.bot_objectives.size] = CreateObjectiveForManger( "powerup", maps\bots\objectives\_powerup::Finder, maps\bots\objectives\_powerup::Executer, 2500 ); } connected() diff --git a/maps/bots/objectives/_powerup.gsc b/maps/bots/objectives/_powerup.gsc index f327975..f9124d7 100644 --- a/maps/bots/objectives/_powerup.gsc +++ b/maps/bots/objectives/_powerup.gsc @@ -30,7 +30,7 @@ Finder( eObj ) continue; } - answer[answer.size] = self CreateFinderObjective( eObj, eObj.sName + "_" + ents[i] GetEntityNumber(), ents[i], self [[eObj.fpPriority]]( eObj, ents[i] ) ); + answer[answer.size] = self CreateFinderObjective( eObj, eObj.sName + "_" + ents[i] GetEntityNumber(), ents[i], self Priority( eObj, ents[i] ) ); } return answer; diff --git a/maps/bots/objectives/_revive.gsc b/maps/bots/objectives/_revive.gsc index 5b0e75b..37e36ed 100644 --- a/maps/bots/objectives/_revive.gsc +++ b/maps/bots/objectives/_revive.gsc @@ -47,7 +47,7 @@ Finder( eObj ) continue; } - Answer[Answer.size] = self CreateFinderObjective( eObj, eObj.sName + "_" + Player GetEntityNumber(), Player, self [[eObj.fpPriority]]( eObj, Player ) ); + Answer[Answer.size] = self CreateFinderObjective( eObj, eObj.sName + "_" + Player GetEntityNumber(), Player, self Priority( eObj, Player ) ); } return Answer; diff --git a/maps/bots/objectives/_utility.gsc b/maps/bots/objectives/_utility.gsc index abbcf67..37c30c1 100644 --- a/maps/bots/objectives/_utility.gsc +++ b/maps/bots/objectives/_utility.gsc @@ -2,14 +2,13 @@ #include maps\_utility; #include maps\bots\_bot_utility; -CreateObjectiveForManger( sName, fpFinder, fpExecuter, fpPriority, iProcessRate ) +CreateObjectiveForManger( sName, fpFinder, fpExecuter, iProcessRate ) { Answer = SpawnStruct(); Answer.sName = sName; Answer.fpFinder = fpFinder; Answer.fpExecuter = fpExecuter; - Answer.fpPriority = fpPriority; Answer.aBotProcessTimes = []; Answer.iProcessRate = iProcessRate;