X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fhavocbot%2Fhavocbot.qc;h=68ff899ea402dee92dca393f56a0edde7bd2211e;hb=db2efd7cabe9d2eb3e09f330d9e5c8f951fbf194;hp=09cfe4f1f932217e4c1fa63e944b7d90790a1073;hpb=f2741730af3cbdb03dc3a3e1bd10c1b881f5a75d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index 09cfe4f1f..68ff899ea 100644 --- a/qcsrc/server/bot/havocbot/havocbot.qc +++ b/qcsrc/server/bot/havocbot/havocbot.qc @@ -6,12 +6,14 @@ #include "../scripting.qh" #include "../waypoints.qh" -#include "../../../common/constants.qh" -#include "../../../common/items/all.qh" +#include +#include +#include +#include -#include "../../../common/triggers/trigger/jumppads.qh" +#include -#include "../../../lib/warpzone/common.qh" +#include .float speed; @@ -38,7 +40,7 @@ void havocbot_ai() // TODO: tracewalk() should take care of this job (better path finding under water) // if we don't have a goal and we're under water look for a waypoint near the "shore" and push it - if(self.deadflag != DEAD_NO) + if(IS_DEAD(self)) if(self.goalcurrent==world) if(self.waterlevel==WATERLEVEL_SWIMMING || (self.aistatus & AI_STATUS_OUT_WATER)) { @@ -86,7 +88,7 @@ void havocbot_ai() bot_strategytoken_taken = true; } - if(self.deadflag != DEAD_NO) + if(IS_DEAD(self)) return; havocbot_chooseenemy(); @@ -108,12 +110,12 @@ void havocbot_ai() w.wr_aim(w); if (autocvar_bot_nofire || IS_INDEPENDENT_PLAYER(self)) { - self.BUTTON_ATCK = false; - self.BUTTON_ATCK2 = false; + PHYS_INPUT_BUTTON_ATCK(self) = false; + PHYS_INPUT_BUTTON_ATCK2(self) = false; } else { - if(self.BUTTON_ATCK||self.BUTTON_ATCK2) + if(PHYS_INPUT_BUTTON_ATCK(self) || PHYS_INPUT_BUTTON_ATCK2(self)) self.lastfiredweapon = PS(self).m_weapon.m_id; } } @@ -246,7 +248,7 @@ void havocbot_keyboard_movement(vector destorg) keyboard.z = 0; self.havocbot_keyboard = keyboard * maxspeed; - if (self.havocbot_ducktime>time) self.BUTTON_CROUCH=true; + if (self.havocbot_ducktime>time) PHYS_INPUT_BUTTON_CROUCH(self) = true; keyboard = self.havocbot_keyboard; blend = bound(0,vlen(destorg-self.origin)/autocvar_bot_ai_keyboard_distance,1); // When getting close move with 360 degree @@ -273,7 +275,7 @@ void havocbot_bunnyhop(vector dir) if(self.aistatus & AI_STATUS_DANGER_AHEAD) { self.aistatus &= ~AI_STATUS_RUNNING; - self.BUTTON_JUMP = false; + PHYS_INPUT_BUTTON_JUMP(self) = false; self.bot_canruntogoal = 0; self.bot_timelastseengoal = 0; return; @@ -295,7 +297,7 @@ void havocbot_bunnyhop(vector dir) bunnyhopdistance = vlen(self.origin - gco); // Run only to visible goals - if(self.flags & FL_ONGROUND) + if(IS_ONGROUND(self)) if(self.speed==maxspeed) if(checkpvs(self.origin + self.view_ofs, self.goalcurrent)) { @@ -349,12 +351,12 @@ void havocbot_bunnyhop(vector dir) { self.aistatus &= ~AI_STATUS_RUNNING; if(bunnyhopdistance > autocvar_bot_ai_bunnyhop_stopdistance) - self.BUTTON_JUMP = true; + PHYS_INPUT_BUTTON_JUMP(self) = true; } else { self.aistatus |= AI_STATUS_RUNNING; - self.BUTTON_JUMP = true; + PHYS_INPUT_BUTTON_JUMP(self) = true; } } } @@ -371,10 +373,10 @@ void havocbot_bunnyhop(vector dir) #if 0 // Release jump button if(!cvar("sv_pogostick")) - if((self.flags & FL_ONGROUND) == 0) + if((IS_ONGROUND(self)) == 0) { if(self.velocity.z < 0 || vlen(self.velocity)6) - if (!(self.flags & FL_ONGROUND)) + if (!(IS_ONGROUND(self))) { tracebox(self.origin, self.mins, self.maxs, self.origin + '0 0 -65536', MOVE_NOMONSTERS, self); if(tracebox_hits_trigger_hurt(self.origin, self.mins, self.maxs, trace_endpos )) @@ -565,11 +567,11 @@ void havocbot_movetogoal() { if(self.velocity.z<0) { - self.BUTTON_HOOK = true; + PHYS_INPUT_BUTTON_HOOK(self) = true; } } else - self.BUTTON_HOOK = true; + PHYS_INPUT_BUTTON_HOOK(self) = true; // If there is no goal try to move forward @@ -609,7 +611,7 @@ void havocbot_movetogoal() { if(time > self.rocketjumptime) { - self.BUTTON_ATCK2 = true; + PHYS_INPUT_BUTTON_ATCK2(self) = true; self.rocketjumptime = 0; } return; @@ -617,7 +619,7 @@ void havocbot_movetogoal() PS(self).m_switchweapon = WEP_DEVASTATOR; self.v_angle_x = 90; - self.BUTTON_ATCK = true; + PHYS_INPUT_BUTTON_ATCK(self) = true; self.rocketjumptime = time + WEP_CVAR(devastator, detonatedelay); return; } @@ -638,9 +640,9 @@ void havocbot_movetogoal() if(self.waterlevel>WATERLEVEL_SWIMMING) dir.z = 1; else if(self.velocity.z >= 0 && !(self.waterlevel == WATERLEVEL_WETFEET && self.watertype == CONTENT_WATER)) - self.BUTTON_JUMP = true; + PHYS_INPUT_BUTTON_JUMP(self) = true; else - self.BUTTON_JUMP = false; + PHYS_INPUT_BUTTON_JUMP(self) = false; makevectors(self.v_angle.y * '0 1 0'); self.movement_x = dir * v_forward * maxspeed; self.movement_y = dir * v_right * maxspeed; @@ -696,9 +698,9 @@ void havocbot_movetogoal() { if(self.velocity.z >= 0 && !(self.watertype == CONTENT_WATER && gco.z < self.origin.z) && ( !(self.waterlevel == WATERLEVEL_WETFEET && self.watertype == CONTENT_WATER) || self.aistatus & AI_STATUS_OUT_WATER)) - self.BUTTON_JUMP = true; + PHYS_INPUT_BUTTON_JUMP(self) = true; else - self.BUTTON_JUMP = false; + PHYS_INPUT_BUTTON_JUMP(self) = false; } dir = normalize(flatdir); makevectors(self.v_angle.y * '0 1 0'); @@ -722,7 +724,7 @@ void havocbot_movetogoal() s = trace_fraction; tracebox(self.origin + jumpstepheightvec, self.mins, self.maxs, self.origin + self.velocity * 0.2 + jumpstepheightvec, false, self); if (trace_fraction > s) - self.BUTTON_JUMP = 1; + PHYS_INPUT_BUTTON_JUMP(self) = true; } } @@ -738,7 +740,7 @@ void havocbot_movetogoal() // Check head-banging against walls if(vlen(self.origin + self.view_ofs - trace_endpos) < 25 && !(self.aistatus & AI_STATUS_OUT_WATER)) { - self.BUTTON_JUMP = true; + PHYS_INPUT_BUTTON_JUMP(self) = true; if(self.facingwalltime && time > self.facingwalltime) { self.ignoregoal = self.goalcurrent; @@ -767,7 +769,7 @@ void havocbot_movetogoal() self.aistatus &= ~AI_STATUS_DANGER_AHEAD; if(trace_fraction == 1 && self.jumppadcount == 0 && !self.goalcurrent.wphardwired ) - if((self.flags & FL_ONGROUND) || (self.aistatus & AI_STATUS_RUNNING) || self.BUTTON_JUMP == true) + if((IS_ONGROUND(self)) || (self.aistatus & AI_STATUS_RUNNING) || PHYS_INPUT_BUTTON_JUMP(self)) { // Look downwards traceline(dst_ahead , dst_down, true, world); @@ -815,7 +817,7 @@ void havocbot_movetogoal() dir = normalize(dir + dodge + evadeobstacle + evadelava); // self.bot_dodgevector = dir; - // self.bot_dodgevector_jumpbutton = self.BUTTON_JUMP; + // self.bot_dodgevector_jumpbutton = PHYS_INPUT_BUTTON_JUMP(self); } if(time < self.ladder_time) @@ -834,7 +836,7 @@ void havocbot_movetogoal() //dir = self.bot_dodgevector; //if (self.bot_dodgevector_jumpbutton) - // self.BUTTON_JUMP = 1; + // PHYS_INPUT_BUTTON_JUMP(self) = true; self.movement_x = dir * v_forward * maxspeed; self.movement_y = dir * v_right * maxspeed; self.movement_z = dir * v_up * maxspeed; @@ -849,8 +851,8 @@ void havocbot_movetogoal() if(skill+self.bot_moveskill >= autocvar_bot_ai_bunnyhop_skilloffset) havocbot_bunnyhop(dir); - if ((dir * v_up) >= autocvar_sv_jumpvelocity*0.5 && (self.flags & FL_ONGROUND)) self.BUTTON_JUMP=1; - if (((dodge * v_up) > 0) && random()*frametime >= 0.2*bound(0,(10-skill-self.bot_dodgeskill)*0.1,1)) self.BUTTON_JUMP=true; + if ((dir * v_up) >= autocvar_sv_jumpvelocity*0.5 && (IS_ONGROUND(self))) PHYS_INPUT_BUTTON_JUMP(self) = true; + if (((dodge * v_up) > 0) && random()*frametime >= 0.2*bound(0,(10-skill-self.bot_dodgeskill)*0.1,1)) PHYS_INPUT_BUTTON_JUMP(self) = true; if (((dodge * v_up) < 0) && random()*frametime >= 0.5*bound(0,(10-skill-self.bot_dodgeskill)*0.1,1)) self.havocbot_ducktime=time+0.3/bound(0.1,skill+self.bot_dodgeskill,10); }