X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_nexball.qc;h=1b94746356c85ee15576d809f3e0ce3b57f9c076;hb=e332988cce112231a09d8c9c8c88d889a5fbea83;hp=327d7783bda849481701cdf7642dc4b6be90c116;hpb=8f4d064a1d62a040e788fc0634baf93e888ba2f6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc index 327d7783b..1b9474635 100644 --- a/qcsrc/server/mutators/gamemode_nexball.qc +++ b/qcsrc/server/mutators/gamemode_nexball.qc @@ -1,6 +1,17 @@ +float autocvar_g_nexball_safepass_turnrate; +float autocvar_g_nexball_safepass_maxdist; +float autocvar_g_nexball_safepass_holdtime; +float autocvar_g_nexball_viewmodel_scale; +float autocvar_g_nexball_tackling; +vector autocvar_g_nexball_viewmodel_offset; + void basketball_touch(); void football_touch(); void ResetBall(); +#define NBM_NONE 0 +#define NBM_FOOTBALL 2 +#define NBM_BASKETBALL 4 +float nexball_mode; float OtherTeam(float t) //works only if there are two teams on the map! { @@ -96,9 +107,9 @@ void GiveBall(entity plyr, entity ball) { WaypointSprite_Kill(ball.waypointsprite_attachedforcarrier); } - - setattachment(ball, plyr, ""); - setorigin(ball, BALL_ATTACHORG); + + //setattachment(ball, plyr, ""); + setorigin(ball, plyr.origin + plyr.view_ofs); if(ball.team != plyr.team) ball.teamtime = time + autocvar_g_nexball_basketball_delay_hold_forteam; @@ -106,7 +117,7 @@ void GiveBall(entity plyr, entity ball) ball.owner = ball.pusher = plyr; //"owner" is set to the player carrying, "pusher" to the last player who touched it ball.team = plyr.team; plyr.ballcarried = ball; - ball.dropperid = plyr.playerid; + ball.ctf_dropper = plyr; plyr.effects |= autocvar_g_nexball_basketball_effects_default; ball.effects &~= autocvar_g_nexball_basketball_effects_default; @@ -125,6 +136,16 @@ void GiveBall(entity plyr, entity ball) ball.think = DropOwner; ball.nextthink = time + autocvar_g_nexball_basketball_delay_hold; } + + ownr = self; + self = plyr; + WEPSET_COPY_EE(self.weaponentity, self); + self.weaponentity.switchweapon = self.weapon; + WEPSET_COPY_EW(self, WEP_PORTO); + weapon_action(WEP_PORTO, WR_RESETPLAYER); + self.switchweapon = WEP_PORTO; + W_SwitchWeapon(WEP_PORTO); + self = ownr; } void DropBall(entity ball, vector org, vector vel) @@ -266,7 +287,7 @@ void basketball_touch(void) football_touch(); return; } - if(!self.cnt && other.classname == "player" && (other.playerid != self.dropperid || time > self.ctf_droptime + autocvar_g_nexball_delay_collect)) + if(!self.cnt && other.classname == "player" && (other != self.ctf_dropper || time > self.ctf_droptime + autocvar_g_nexball_delay_collect)) { if(other.health <= 0) return; @@ -302,6 +323,8 @@ void GoalTouch(void) if(nb_teams == 2) otherteam = OtherTeam(ball.team); + else + otherteam = 0; if((isclient = ball.pusher.flags & FL_CLIENT)) pname = ball.pusher.netname; @@ -395,7 +418,7 @@ void nb_spawnteam(string teamname, float teamcolor) void nb_spawnteams(void) { - float t_r, t_b, t_y, t_p; + float t_r = 0, t_b = 0, t_y = 0, t_p = 0; entity e; for(e = world; (e = find(e, classname, "nexball_goal"));) { @@ -503,6 +526,7 @@ void SpawnBall(void) void spawnfunc_nexball_basketball(void) { + nexball_mode |= NBM_BASKETBALL; self.classname = "nexball_basketball"; if not(balls & BALL_BASKET) { @@ -525,6 +549,7 @@ void spawnfunc_nexball_basketball(void) void spawnfunc_nexball_football(void) { + nexball_mode |= NBM_FOOTBALL; self.classname = "nexball_football"; self.solid = SOLID_TRIGGER; balls |= BALL_FOOT; @@ -623,11 +648,29 @@ void spawnfunc_ball_bound(void) // Weapon code // //=======================// + +void W_Nexball_Think() +{ + //dprint("W_Nexball_Think\n"); + //vector new_dir = steerlib_arrive(self.enemy.origin, 2500); + vector new_dir = normalize(self.enemy.origin - self.origin); + vector old_dir = normalize(self.velocity); + float _speed = vlen(self.velocity); + vector new_vel = normalize(old_dir + (new_dir * autocvar_g_nexball_safepass_turnrate)) * _speed; + //vector new_vel = (new_dir * autocvar_g_nexball_safepass_turnrate + + self.velocity = new_vel; + + self.nextthink = time; +} + void W_Nexball_Touch(void) { entity ball, attacker; attacker = self.owner; - + //self.think = SUB_Null; + //self.enemy = world; + PROJECTILE_TOUCH; if(attacker.team != other.team || autocvar_g_nexball_basketball_teamsteal) if((ball = other.ballcarried) && (attacker.classname == "player")) @@ -681,12 +724,28 @@ void W_Nexball_Attack(float t) mul = 2 - mul; mul = mi + (ma - mi) * mul; // range from the minimal power to the maximal power } - DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, FALSE)); + + DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, FALSE)); + + //TODO: use the speed_up cvar too ?? } void W_Nexball_Attack2(void) { + if(self.ballcarried.enemy) + { + entity _ball = self.ballcarried; + W_SetupShot(self, FALSE, 4, "nexball/shoot1.wav", CH_WEAPON_A, 0); + DropBall(_ball, w_shotorg, trigger_push_calculatevelocity(_ball.origin, _ball.enemy, 32)); + _ball.think = W_Nexball_Think; + _ball.nextthink = time; + return; + } + + if(!autocvar_g_nexball_tackling) + return; + entity missile; if(!(balls & BALL_BASKET)) return; @@ -714,6 +773,34 @@ void W_Nexball_Attack2(void) missile.flags = FL_PROJECTILE; } +var const float() nullfunc; +float ball_customize() +{ + if(!self.owner) + { + self.effects &~= EF_FLAME; + self.scale = 1; + self.customizeentityforclient = nullfunc; + return TRUE; + } + + if(other == self.owner) + { + self.scale = autocvar_g_nexball_viewmodel_scale; + if(self.enemy) + self.effects |= EF_FLAME; + else + self.effects &~= EF_FLAME; + } + else + { + self.effects &~= EF_FLAME; + self.scale = 1; + } + + return TRUE; +} + float w_nexball_weapon(float req) { if(req == WR_THINK) @@ -790,6 +877,79 @@ MUTATOR_HOOKFUNCTION(nexball_BuildMutatorsPrettyString) return 0; } +MUTATOR_HOOKFUNCTION(nexball_PlayerPreThink) +{ + makevectors(self.v_angle); + if(nexball_mode & NBM_BASKETBALL) + { + if(self.ballcarried) + { + // 'view ball' + self.ballcarried.velocity = self.velocity; + self.ballcarried.customizeentityforclient = ball_customize; + + setorigin(self.ballcarried, self.origin + self.view_ofs + + v_forward * autocvar_g_nexball_viewmodel_offset_x + + v_right * autocvar_g_nexball_viewmodel_offset_y + + v_up * autocvar_g_nexball_viewmodel_offset_z); + + // 'safe passing' + if(autocvar_g_nexball_safepass_maxdist) + { + if(self.ballcarried.wait < time && self.ballcarried.enemy) + { + //centerprint(self, sprintf("Lost lock on %s", self.ballcarried.enemy.netname)); + self.ballcarried.enemy = world; + } + + + //tracebox(self.origin + self.view_ofs, '-2 -2 -2', '2 2 2', self.origin + self.view_ofs + v_forward * autocvar_g_nexball_safepass_maxdist); + crosshair_trace(self); + if( trace_ent && + trace_ent.flags & FL_CLIENT && + trace_ent.deadflag == DEAD_NO && + trace_ent.team == self.team && + vlen(trace_ent.origin - self.origin) <= autocvar_g_nexball_safepass_maxdist ) + { + + //if(self.ballcarried.enemy != trace_ent) + // centerprint(self, sprintf("Locked to %s", trace_ent.netname)); + self.ballcarried.enemy = trace_ent; + self.ballcarried.wait = time + autocvar_g_nexball_safepass_holdtime; + + + } + } + } + else + { + if(!WEPSET_EMPTY_E(self.weaponentity)) + { + WEPSET_COPY_EE(self, self.weaponentity); + weapon_action(WEP_PORTO, WR_RESETPLAYER); + self.switchweapon = self.weaponentity.switchweapon; + W_SwitchWeapon(self.switchweapon); + + WEPSET_CLEAR_E(self.weaponentity); + } + } + + } + return FALSE; +} + +MUTATOR_HOOKFUNCTION(nexball_PlayerSpawn) +{ + WEPSET_CLEAR_E(self.weaponentity); + + if(nexball_mode & NBM_BASKETBALL) + WEPSET_OR_EW(self, WEP_PORTO); + else + WEPSET_CLEAR_E(self); + + return FALSE; +} + MUTATOR_DEFINITION(gamemode_nexball) { MUTATOR_HOOK(PlayerDies, nexball_BallDrop, CBC_ORDER_ANY); @@ -797,6 +957,8 @@ MUTATOR_DEFINITION(gamemode_nexball) MUTATOR_HOOK(ClientDisconnect, nexball_BallDrop, CBC_ORDER_ANY); MUTATOR_HOOK(BuildMutatorsPrettyString, nexball_BuildMutatorsPrettyString, CBC_ORDER_ANY); MUTATOR_HOOK(BuildMutatorsString, nexball_BuildMutatorsString, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerSpawn, nexball_PlayerSpawn, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerPreThink, nexball_PlayerPreThink, CBC_ORDER_ANY); MUTATOR_ONADD {