X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fbot%2Fnavigation.qc;h=ab74732e60d0dc3ca265db5a978a3e96149f0e5f;hb=bd7038146e8b9decebe5b9f852d2ee3d3ef2bfac;hp=d80f8336c8ba179bd52e862bc2807181d92efebc;hpb=37903827937b44f174275a75d2dab5301b8ab53e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc index d80f8336c..ab74732e6 100644 --- a/qcsrc/server/bot/navigation.qc +++ b/qcsrc/server/bot/navigation.qc @@ -1,17 +1,22 @@ -void bot_debug(string input) -{ - switch(autocvar_bot_debug) - { - case 1: dprint(input); break; - case 2: print(input); break; - } -} +#include "navigation.qh" + +#include "bot.qh" +#include "waypoints.qh" + +#include + +#include + +#include +#include + +.float speed; // rough simulation of walking from one point to another to test if a path // can be traveled, used for waypoint linking and havocbot float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode) -{ +{SELFPARAM(); vector org; vector move; vector dir; @@ -220,42 +225,42 @@ float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float ///////////////////////////////////////////////////////////////////////////// // completely empty the goal stack, used when deciding where to go -void navigation_clearroute() +void navigation_clearroute(entity this) { - //print("bot ", etos(self), " clear\n"); - self.navigation_hasgoals = false; - self.goalcurrent = world; - self.goalstack01 = world; - self.goalstack02 = world; - self.goalstack03 = world; - self.goalstack04 = world; - self.goalstack05 = world; - self.goalstack06 = world; - self.goalstack07 = world; - self.goalstack08 = world; - self.goalstack09 = world; - self.goalstack10 = world; - self.goalstack11 = world; - self.goalstack12 = world; - self.goalstack13 = world; - self.goalstack14 = world; - self.goalstack15 = world; - self.goalstack16 = world; - self.goalstack17 = world; - self.goalstack18 = world; - self.goalstack19 = world; - self.goalstack20 = world; - self.goalstack21 = world; - self.goalstack22 = world; - self.goalstack23 = world; - self.goalstack24 = world; - self.goalstack25 = world; - self.goalstack26 = world; - self.goalstack27 = world; - self.goalstack28 = world; - self.goalstack29 = world; - self.goalstack30 = world; - self.goalstack31 = world; + //print("bot ", etos(this), " clear\n"); + this.navigation_hasgoals = false; + this.goalcurrent = world; + this.goalstack01 = world; + this.goalstack02 = world; + this.goalstack03 = world; + this.goalstack04 = world; + this.goalstack05 = world; + this.goalstack06 = world; + this.goalstack07 = world; + this.goalstack08 = world; + this.goalstack09 = world; + this.goalstack10 = world; + this.goalstack11 = world; + this.goalstack12 = world; + this.goalstack13 = world; + this.goalstack14 = world; + this.goalstack15 = world; + this.goalstack16 = world; + this.goalstack17 = world; + this.goalstack18 = world; + this.goalstack19 = world; + this.goalstack20 = world; + this.goalstack21 = world; + this.goalstack22 = world; + this.goalstack23 = world; + this.goalstack24 = world; + this.goalstack25 = world; + this.goalstack26 = world; + this.goalstack27 = world; + this.goalstack28 = world; + this.goalstack29 = world; + this.goalstack30 = world; + this.goalstack31 = world; } // add a new goal at the beginning of the stack @@ -264,48 +269,48 @@ void navigation_clearroute() // next-closest WP on the shortest path to the WP // That means, if the stack overflows, the bot will know how to do the FIRST 32 // steps to the goal, and then recalculate the path. -void navigation_pushroute(entity e) +void navigation_pushroute(entity this, entity e) { - //print("bot ", etos(self), " push ", etos(e), "\n"); - self.goalstack31 = self.goalstack30; - self.goalstack30 = self.goalstack29; - self.goalstack29 = self.goalstack28; - self.goalstack28 = self.goalstack27; - self.goalstack27 = self.goalstack26; - self.goalstack26 = self.goalstack25; - self.goalstack25 = self.goalstack24; - self.goalstack24 = self.goalstack23; - self.goalstack23 = self.goalstack22; - self.goalstack22 = self.goalstack21; - self.goalstack21 = self.goalstack20; - self.goalstack20 = self.goalstack19; - self.goalstack19 = self.goalstack18; - self.goalstack18 = self.goalstack17; - self.goalstack17 = self.goalstack16; - self.goalstack16 = self.goalstack15; - self.goalstack15 = self.goalstack14; - self.goalstack14 = self.goalstack13; - self.goalstack13 = self.goalstack12; - self.goalstack12 = self.goalstack11; - self.goalstack11 = self.goalstack10; - self.goalstack10 = self.goalstack09; - self.goalstack09 = self.goalstack08; - self.goalstack08 = self.goalstack07; - self.goalstack07 = self.goalstack06; - self.goalstack06 = self.goalstack05; - self.goalstack05 = self.goalstack04; - self.goalstack04 = self.goalstack03; - self.goalstack03 = self.goalstack02; - self.goalstack02 = self.goalstack01; - self.goalstack01 = self.goalcurrent; - self.goalcurrent = e; + //print("bot ", etos(this), " push ", etos(e), "\n"); + this.goalstack31 = this.goalstack30; + this.goalstack30 = this.goalstack29; + this.goalstack29 = this.goalstack28; + this.goalstack28 = this.goalstack27; + this.goalstack27 = this.goalstack26; + this.goalstack26 = this.goalstack25; + this.goalstack25 = this.goalstack24; + this.goalstack24 = this.goalstack23; + this.goalstack23 = this.goalstack22; + this.goalstack22 = this.goalstack21; + this.goalstack21 = this.goalstack20; + this.goalstack20 = this.goalstack19; + this.goalstack19 = this.goalstack18; + this.goalstack18 = this.goalstack17; + this.goalstack17 = this.goalstack16; + this.goalstack16 = this.goalstack15; + this.goalstack15 = this.goalstack14; + this.goalstack14 = this.goalstack13; + this.goalstack13 = this.goalstack12; + this.goalstack12 = this.goalstack11; + this.goalstack11 = this.goalstack10; + this.goalstack10 = this.goalstack09; + this.goalstack09 = this.goalstack08; + this.goalstack08 = this.goalstack07; + this.goalstack07 = this.goalstack06; + this.goalstack06 = this.goalstack05; + this.goalstack05 = this.goalstack04; + this.goalstack04 = this.goalstack03; + this.goalstack03 = this.goalstack02; + this.goalstack02 = this.goalstack01; + this.goalstack01 = this.goalcurrent; + this.goalcurrent = e; } // remove first goal from stack // (in other words: remove a prerequisite for reaching the later goals) // (used when a spawnfunc_waypoint is reached) void navigation_poproute() -{ +{SELFPARAM(); //print("bot ", etos(self), " pop\n"); self.goalcurrent = self.goalstack01; self.goalstack01 = self.goalstack02; @@ -352,12 +357,12 @@ float navigation_waypoint_will_link(vector v, vector org, entity ent, float walk { if (walkfromwp) { - if (tracewalk(ent, v, PL_MIN, PL_MAX, org, bot_navigation_movemode)) + if (tracewalk(ent, v, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), org, bot_navigation_movemode)) return true; } else { - if (tracewalk(ent, org, PL_MIN, PL_MAX, v, bot_navigation_movemode)) + if (tracewalk(ent, org, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), v, bot_navigation_movemode)) return true; } } @@ -387,7 +392,7 @@ entity navigation_findnearestwaypoint_withdist_except(entity ent, float walkfrom } org = ent.origin + 0.5 * (ent.mins + ent.maxs); - org.z = ent.origin.z + ent.mins.z - PL_MIN_z; // player height + org.z = ent.origin.z + ent.mins.z - STAT(PL_MIN, NULL).z; // player height // TODO possibly make other code have the same support for bboxes if(ent.tag_entity) org = org + ent.tag_entity.origin; @@ -438,7 +443,7 @@ entity navigation_findnearestwaypoint(entity ent, float walkfromwp) // finds the waypoints near the bot initiating a navigation query float navigation_markroutes_nearestwaypoints(entity waylist, float maxdist) -{ +{SELFPARAM(); entity head; vector v, m1, m2, diff; float c; @@ -509,7 +514,7 @@ void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost2, vecto // queries the entire spawnfunc_waypoint network for pathes leading away from the bot void navigation_markroutes(entity fixed_source_waypoint) -{ +{SELFPARAM(); entity w, wp, waylist; float searching, cost, cost2; vector p; @@ -537,7 +542,7 @@ void navigation_markroutes(entity fixed_source_waypoint) // try a short range search for the nearest waypoints, and expand the search repeatedly if none are found // as this search is expensive we will use lower values if the bot is on the air float i, increment, maxdistance; - if(self.flags & FL_ONGROUND) + if(IS_ONGROUND(self)) { increment = 750; maxdistance = 50000; @@ -668,7 +673,7 @@ void navigation_markroutes_inverted(entity fixed_source_waypoint) // updates the best goal according to a weighted calculation of travel cost and item value of a new proposed item void navigation_routerating(entity e, float f, float rangebias) -{ +{SELFPARAM(); entity nwp; vector o; if (!e) @@ -689,7 +694,7 @@ void navigation_routerating(entity e, float f, float rangebias) { vector pointa, pointb; - bot_debug(strcat("jetpack ai: evaluating path for ", e.classname, "\n")); + LOG_DEBUG("jetpack ai: evaluating path for ", e.classname, "\n"); // Point A traceline(self.origin, self.origin + '0 0 65535', MOVE_NORMAL, self); @@ -704,13 +709,13 @@ void navigation_routerating(entity e, float f, float rangebias) if(trace_fraction==1) { - bot_debug("jetpack ai: can bridge these two points\n"); + LOG_DEBUG("jetpack ai: can bridge these two points\n"); // Lower the altitude of these points as much as possible float zdistance, xydistance, cost, t, fuel; vector down, npa, npb; - down = '0 0 -1' * (PL_MAX_z - PL_MIN_z) * 10; + down = '0 0 -1' * (STAT(PL_MAX, NULL).z - STAT(PL_MIN, NULL).z) * 10; do{ npa = pointa + down; @@ -741,7 +746,7 @@ void navigation_routerating(entity e, float f, float rangebias) t += xydistance / autocvar_g_jetpack_maxspeed_side; fuel = t * autocvar_g_jetpack_fuel * 0.8; - bot_debug(strcat("jetpack ai: required fuel ", ftos(fuel), " self.ammo_fuel ", ftos(self.ammo_fuel), "\n")); + LOG_DEBUG(strcat("jetpack ai: required fuel ", ftos(fuel), " self.ammo_fuel ", ftos(self.ammo_fuel), "\n")); // enough fuel ? if(self.ammo_fuel>fuel) @@ -759,7 +764,7 @@ void navigation_routerating(entity e, float f, float rangebias) if (navigation_bestrating < f) { - bot_debug(strcat("jetpack path: added goal ", e.classname, " (with rating ", ftos(f), ")\n")); + LOG_DEBUG(strcat("jetpack path: added goal ", e.classname, " (with rating ", ftos(f), ")\n")); navigation_bestrating = f; navigation_bestgoal = e; self.navigation_jetpack_goal = e; @@ -805,7 +810,7 @@ void navigation_routerating(entity e, float f, float rangebias) e.nearestwaypoint = nwp; else { - bot_debug(strcat("FAILED to find a nearest waypoint to '", e.classname, "' #", etos(e), "\n")); + LOG_DEBUG(strcat("FAILED to find a nearest waypoint to '", e.classname, "' #", etos(e), "\n")); if(e.flags & FL_ITEM) e.blacklisted = true; @@ -817,7 +822,7 @@ void navigation_routerating(entity e, float f, float rangebias) if(e.blacklisted) { - bot_debug(strcat("The entity '", e.classname, "' is going to be excluded from path finding during this match\n")); + LOG_DEBUG(strcat("The entity '", e.classname, "' is going to be excluded from path finding during this match\n")); return; } } @@ -831,17 +836,17 @@ void navigation_routerating(entity e, float f, float rangebias) nwp = e.nearestwaypoint; } - bot_debug(strcat("-- checking ", e.classname, " (with cost ", ftos(nwp.wpcost), ")\n")); + LOG_DEBUG(strcat("-- checking ", e.classname, " (with cost ", ftos(nwp.wpcost), ")\n")); if (nwp) if (nwp.wpcost < 10000000) { //te_wizspike(nwp.wpnearestpoint); - bot_debug(strcat(e.classname, " ", ftos(f), "/(1+", ftos((nwp.wpcost + vlen(e.origin - nwp.wpnearestpoint))), "/", ftos(rangebias), ") = ")); + LOG_DEBUG(strcat(e.classname, " ", ftos(f), "/(1+", ftos((nwp.wpcost + vlen(e.origin - nwp.wpnearestpoint))), "/", ftos(rangebias), ") = ")); f = f * rangebias / (rangebias + (nwp.wpcost + vlen(o - nwp.wpnearestpoint))); - bot_debug(strcat("considering ", e.classname, " (with rating ", ftos(f), ")\n")); + LOG_DEBUG(strcat("considering ", e.classname, " (with rating ", ftos(f), ")\n")); if (navigation_bestrating < f) { - bot_debug(strcat("ground path: added goal ", e.classname, " (with rating ", ftos(f), ")\n")); + LOG_DEBUG(strcat("ground path: added goal ", e.classname, " (with rating ", ftos(f), ")\n")); navigation_bestrating = f; navigation_bestgoal = e; } @@ -849,26 +854,26 @@ void navigation_routerating(entity e, float f, float rangebias) } // adds an item to the the goal stack with the path to a given item -float navigation_routetogoal(entity e, vector startposition) +bool navigation_routetogoal(entity this, entity e, vector startposition) { - self.goalentity = e; + this.goalentity = e; // if there is no goal, just exit if (!e) return false; - self.navigation_hasgoals = true; + this.navigation_hasgoals = true; // put the entity on the goal stack //print("routetogoal ", etos(e), "\n"); - navigation_pushroute(e); + navigation_pushroute(this, e); if(g_jetpack) - if(e==self.navigation_jetpack_goal) + if(e==this.navigation_jetpack_goal) return true; // if it can reach the goal there is nothing more to do - if (tracewalk(self, startposition, PL_MIN, PL_MAX, (e.absmin + e.absmax) * 0.5, bot_navigation_movemode)) + if (tracewalk(this, startposition, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), (e.absmin + e.absmax) * 0.5, bot_navigation_movemode)) return true; // see if there are waypoints describing a path to the item @@ -883,7 +888,7 @@ float navigation_routetogoal(entity e, vector startposition) for (;;) { // add the spawnfunc_waypoint to the path - navigation_pushroute(e); + navigation_pushroute(this, e); e = e.enemy; if(e==world) @@ -896,7 +901,7 @@ float navigation_routetogoal(entity e, vector startposition) // removes any currently touching waypoints from the goal stack // (this is how bots detect if they reached a goal) void navigation_poptouchedgoals() -{ +{SELFPARAM(); vector org, m1, m2; org = self.origin; m1 = org + self.mins; @@ -924,7 +929,7 @@ void navigation_poptouchedgoals() if(checkpvs(self.origin + self.view_ofs, self.goalstack01)) if(tracewalk(self, self.origin, self.mins, self.maxs, (self.goalstack01.absmin + self.goalstack01.absmax) * 0.5, bot_navigation_movemode)) { - bot_debug(strcat("path optimized for ", self.netname, ", removed a goal from the queue\n")); + LOG_DEBUG(strcat("path optimized for ", self.netname, ", removed a goal from the queue\n")); navigation_poproute(); // TODO this may also be a nice idea to do "early" (e.g. by // manipulating the vlen() comparisons) to shorten paths in @@ -982,26 +987,26 @@ void navigation_poptouchedgoals() // begin a goal selection session (queries spawnfunc_waypoint network) void navigation_goalrating_start() -{ +{SELFPARAM(); if(self.aistatus & AI_STATUS_STUCK) return; self.navigation_jetpack_goal = world; navigation_bestrating = -1; self.navigation_hasgoals = false; - navigation_clearroute(); + navigation_clearroute(self); navigation_bestgoal = world; navigation_markroutes(world); } // ends a goal selection session (updates goal stack to the best goal) void navigation_goalrating_end() -{ +{SELFPARAM(); if(self.aistatus & AI_STATUS_STUCK) return; - navigation_routetogoal(navigation_bestgoal, self.origin); - bot_debug(strcat("best goal ", self.goalcurrent.classname , "\n")); + navigation_routetogoal(self, navigation_bestgoal, self.origin); + LOG_DEBUG(strcat("best goal ", self.goalcurrent.classname , "\n")); // If the bot got stuck then try to reach the farthest waypoint if (!self.navigation_hasgoals) @@ -1009,7 +1014,7 @@ void navigation_goalrating_end() { if (!(self.aistatus & AI_STATUS_STUCK)) { - bot_debug(strcat(self.netname, " cannot walk to any goal\n")); + LOG_DEBUG(strcat(self.netname, " cannot walk to any goal\n")); self.aistatus |= AI_STATUS_STUCK; } @@ -1055,7 +1060,7 @@ void botframe_updatedangerousobjects(float maxupdate) } } -void navigation_unstuck() +void navigation_unstuck(entity this) { float search_radius = 1000; @@ -1064,21 +1069,23 @@ void navigation_unstuck() if (!bot_waypoint_queue_owner) { - bot_debug(strcat(self.netname, " sutck, taking over the waypoints queue\n")); - bot_waypoint_queue_owner = self; + LOG_DEBUG(strcat(this.netname, " sutck, taking over the waypoints queue\n")); + bot_waypoint_queue_owner = this; bot_waypoint_queue_bestgoal = world; bot_waypoint_queue_bestgoalrating = 0; } - if(bot_waypoint_queue_owner!=self) + if(bot_waypoint_queue_owner!=this) return; if (bot_waypoint_queue_goal) { // evaluate the next goal on the queue - float d = vlen(self.origin - bot_waypoint_queue_goal.origin); - bot_debug(strcat(self.netname, " evaluating ", bot_waypoint_queue_goal.classname, " with distance ", ftos(d), "\n")); - if(tracewalk(bot_waypoint_queue_goal, self.origin, PL_MIN, PL_MAX, bot_waypoint_queue_goal.origin, bot_navigation_movemode)) + float d = vlen(this.origin - bot_waypoint_queue_goal.origin); + LOG_DEBUG(strcat(this.netname, " evaluating ", bot_waypoint_queue_goal.classname, " with distance ", ftos(d), "\n")); + entity oldself = self; + setself(this); // tracewalk has questionable use of self + if(tracewalk(bot_waypoint_queue_goal, this.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), bot_waypoint_queue_goal.origin, bot_navigation_movemode)) { if( d > bot_waypoint_queue_bestgoalrating) { @@ -1086,20 +1093,21 @@ void navigation_unstuck() bot_waypoint_queue_bestgoal = bot_waypoint_queue_goal; } } + setself(oldself); bot_waypoint_queue_goal = bot_waypoint_queue_goal.bot_waypoint_queue_nextgoal; if (!bot_waypoint_queue_goal) { if (bot_waypoint_queue_bestgoal) { - bot_debug(strcat(self.netname, " stuck, reachable waypoint found, heading to it\n")); - navigation_routetogoal(bot_waypoint_queue_bestgoal, self.origin); - self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; - self.aistatus &= ~AI_STATUS_STUCK; + LOG_DEBUG(strcat(this.netname, " stuck, reachable waypoint found, heading to it\n")); + navigation_routetogoal(this, bot_waypoint_queue_bestgoal, this.origin); + this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + this.aistatus &= ~AI_STATUS_STUCK; } else { - bot_debug(strcat(self.netname, " stuck, cannot walk to any waypoint at all\n")); + LOG_DEBUG(strcat(this.netname, " stuck, cannot walk to any waypoint at all\n")); } bot_waypoint_queue_owner = world; @@ -1107,16 +1115,16 @@ void navigation_unstuck() } else { - if(bot_strategytoken!=self) + if(bot_strategytoken!=this) return; // build a new queue - bot_debug(strcat(self.netname, " stuck, scanning reachable waypoints within ", ftos(search_radius)," qu\n")); + LOG_DEBUG(strcat(this.netname, " stuck, scanning reachable waypoints within ", ftos(search_radius)," qu\n")); entity head, first; first = world; - head = findradius(self.origin, search_radius); + head = findradius(this.origin, search_radius); while(head) { @@ -1139,7 +1147,7 @@ void navigation_unstuck() bot_waypoint_queue_goal = first; else { - bot_debug(strcat(self.netname, " stuck, cannot walk to any waypoint at all\n")); + LOG_DEBUG(strcat(this.netname, " stuck, cannot walk to any waypoint at all\n")); bot_waypoint_queue_owner = world; } } @@ -1153,7 +1161,7 @@ void debugresetnodes() } void debugnode(vector node) -{ +{SELFPARAM(); if (!IS_PLAYER(self)) return; @@ -1195,61 +1203,61 @@ void debugnodestatus(vector position, float status) .vector lastposition; // Debug the goal stack visually -void debuggoalstack() +void debuggoalstack(entity this) { entity goal; vector org, go; - if(self.goalcounter==0)goal=self.goalcurrent; - else if(self.goalcounter==1)goal=self.goalstack01; - else if(self.goalcounter==2)goal=self.goalstack02; - else if(self.goalcounter==3)goal=self.goalstack03; - else if(self.goalcounter==4)goal=self.goalstack04; - else if(self.goalcounter==5)goal=self.goalstack05; - else if(self.goalcounter==6)goal=self.goalstack06; - else if(self.goalcounter==7)goal=self.goalstack07; - else if(self.goalcounter==8)goal=self.goalstack08; - else if(self.goalcounter==9)goal=self.goalstack09; - else if(self.goalcounter==10)goal=self.goalstack10; - else if(self.goalcounter==11)goal=self.goalstack11; - else if(self.goalcounter==12)goal=self.goalstack12; - else if(self.goalcounter==13)goal=self.goalstack13; - else if(self.goalcounter==14)goal=self.goalstack14; - else if(self.goalcounter==15)goal=self.goalstack15; - else if(self.goalcounter==16)goal=self.goalstack16; - else if(self.goalcounter==17)goal=self.goalstack17; - else if(self.goalcounter==18)goal=self.goalstack18; - else if(self.goalcounter==19)goal=self.goalstack19; - else if(self.goalcounter==20)goal=self.goalstack20; - else if(self.goalcounter==21)goal=self.goalstack21; - else if(self.goalcounter==22)goal=self.goalstack22; - else if(self.goalcounter==23)goal=self.goalstack23; - else if(self.goalcounter==24)goal=self.goalstack24; - else if(self.goalcounter==25)goal=self.goalstack25; - else if(self.goalcounter==26)goal=self.goalstack26; - else if(self.goalcounter==27)goal=self.goalstack27; - else if(self.goalcounter==28)goal=self.goalstack28; - else if(self.goalcounter==29)goal=self.goalstack29; - else if(self.goalcounter==30)goal=self.goalstack30; - else if(self.goalcounter==31)goal=self.goalstack31; + if(this.goalcounter==0)goal=this.goalcurrent; + else if(this.goalcounter==1)goal=this.goalstack01; + else if(this.goalcounter==2)goal=this.goalstack02; + else if(this.goalcounter==3)goal=this.goalstack03; + else if(this.goalcounter==4)goal=this.goalstack04; + else if(this.goalcounter==5)goal=this.goalstack05; + else if(this.goalcounter==6)goal=this.goalstack06; + else if(this.goalcounter==7)goal=this.goalstack07; + else if(this.goalcounter==8)goal=this.goalstack08; + else if(this.goalcounter==9)goal=this.goalstack09; + else if(this.goalcounter==10)goal=this.goalstack10; + else if(this.goalcounter==11)goal=this.goalstack11; + else if(this.goalcounter==12)goal=this.goalstack12; + else if(this.goalcounter==13)goal=this.goalstack13; + else if(this.goalcounter==14)goal=this.goalstack14; + else if(this.goalcounter==15)goal=this.goalstack15; + else if(this.goalcounter==16)goal=this.goalstack16; + else if(this.goalcounter==17)goal=this.goalstack17; + else if(this.goalcounter==18)goal=this.goalstack18; + else if(this.goalcounter==19)goal=this.goalstack19; + else if(this.goalcounter==20)goal=this.goalstack20; + else if(this.goalcounter==21)goal=this.goalstack21; + else if(this.goalcounter==22)goal=this.goalstack22; + else if(this.goalcounter==23)goal=this.goalstack23; + else if(this.goalcounter==24)goal=this.goalstack24; + else if(this.goalcounter==25)goal=this.goalstack25; + else if(this.goalcounter==26)goal=this.goalstack26; + else if(this.goalcounter==27)goal=this.goalstack27; + else if(this.goalcounter==28)goal=this.goalstack28; + else if(this.goalcounter==29)goal=this.goalstack29; + else if(this.goalcounter==30)goal=this.goalstack30; + else if(this.goalcounter==31)goal=this.goalstack31; else goal=world; if(goal==world) { - self.goalcounter = 0; - self.lastposition='0 0 0'; + this.goalcounter = 0; + this.lastposition='0 0 0'; return; } - if(self.lastposition=='0 0 0') - org = self.origin; + if(this.lastposition=='0 0 0') + org = this.origin; else - org = self.lastposition; + org = this.lastposition; go = ( goal.absmin + goal.absmax ) * 0.5; te_lightning2(world, org, go); - self.lastposition = go; + this.lastposition = go; - self.goalcounter++; + this.goalcounter++; }