X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fnexball%2Fnexball.qc;h=163cc3854185fbd7b52165fdf6ef0399e1275a44;hp=9c6c9f0803941379bb39e765980cd4bc6361b133;hb=f570e338e4f861aa53cd44a4014a077105cefe72;hpb=c039d054a46888048d214000273ccfc63e4611b6 diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc index 9c6c9f080..163cc3854 100644 --- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc +++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc @@ -34,6 +34,7 @@ float autocvar_g_nexball_football_bouncestop; bool autocvar_g_nexball_radar_showallplayers; bool autocvar_g_nexball_sound_bounce; int autocvar_g_nexball_trail_color; +bool autocvar_g_nexball_playerclip_collisions = true; float autocvar_g_nexball_safepass_turnrate; float autocvar_g_nexball_safepass_maxdist; @@ -71,11 +72,11 @@ float OtherTeam(float t) //works only if there are two teams on the map! const float ST_NEXBALL_GOALS = 1; void nb_ScoreRules(int teams) { - ScoreRules_basics(teams, 0, 0, true); - ScoreInfo_SetLabel_TeamScore( ST_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); - ScoreInfo_SetLabel_PlayerScore( SP_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); - ScoreInfo_SetLabel_PlayerScore(SP_NEXBALL_FAULTS, "faults", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER); - ScoreRules_basics_end(); + GameRules_scoring(teams, 0, 0, { + field_team(ST_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); + field(SP_NEXBALL_GOALS, "goals", SFL_SORT_PRIO_PRIMARY); + field(SP_NEXBALL_FAULTS, "faults", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER); + }); } void LogNB(string mode, entity actor) @@ -103,9 +104,9 @@ void nexball_setstatus(entity this) { if(this.ballcarried.teamtime && (this.ballcarried.teamtime < time)) { - bprint("The ", Team_ColoredFullName(this.team), " held the ball for too long.\n"); - DropBall(this.ballcarried, this.ballcarried.owner.origin, '0 0 0'); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_NEXBALL_RETURN_HELD)); entity e = this.ballcarried; + DropBall(this.ballcarried, this.ballcarried.owner.origin, '0 0 0'); ResetBall(e); } else @@ -118,14 +119,16 @@ void relocate_nexball(entity this) tracebox(this.origin, BALL_MINS, BALL_MAXS, this.origin, true, this); if(trace_startsolid) { - vector o; - o = this.origin; - if(!move_out_of_solid(this)) + vector o = this.origin; + if (!move_out_of_solid(this)) { objerror(this, "could not get out of solid at all!"); - LOG_INFO("^1NOTE: this map needs FIXING. ", this.classname, " at ", vtos(o - '0 0 1')); - LOG_INFO(" needs to be moved out of solid, e.g. by '", ftos(this.origin.x - o.x)); - LOG_INFO(" ", ftos(this.origin.y - o.y)); - LOG_INFO(" ", ftos(this.origin.z - o.z), "'\n"); + } + LOG_INFOF( + "^1NOTE: this map needs FIXING. %s at %s needs to be moved out of solid, e.g. by %s", + this.classname, + vtos(o - '0 0 1'), + vtos(this.origin - o) + ); this.origin = o; } } @@ -167,6 +170,7 @@ void GiveBall(entity plyr, entity ball) ball.teamtime = time + autocvar_g_nexball_basketball_delay_hold_forteam; ball.owner = ball.pusher = plyr; //"owner" is set to the player carrying, "pusher" to the last player who touched it + ball.weaponentity_fld = weaponentity; ball.team = plyr.team; plyr.ballcarried = ball; ball.nb_dropper = plyr; @@ -190,12 +194,12 @@ void GiveBall(entity plyr, entity ball) } plyr.(weaponentity).weapons = plyr.weapons; - plyr.(weaponentity).m_switchweapon = PS(plyr).m_weapon; + plyr.m_switchweapon = plyr.(weaponentity).m_weapon; plyr.weapons = WEPSET(NEXBALL); Weapon w = WEP_NEXBALL; w.wr_resetplayer(w, plyr); - PS(plyr).m_switchweapon = WEP_NEXBALL; - W_SwitchWeapon(plyr, WEP_NEXBALL); + plyr.(weaponentity).m_switchweapon = WEP_NEXBALL; + W_SwitchWeapon(plyr, WEP_NEXBALL, weaponentity); } void DropBall(entity ball, vector org, vector vel) @@ -218,7 +222,7 @@ void DropBall(entity ball, vector org, vector vel) if(ball.owner.metertime) { ball.owner.metertime = 0; - .entity weaponentity = weaponentities[0]; // TODO: find ballstealer + .entity weaponentity = ball.weaponentity_fld; ball.owner.(weaponentity).state = WS_READY; } @@ -232,7 +236,7 @@ void DropBall(entity ball, vector org, vector vel) void InitBall(entity this) { - if(gameover) return; + if(game_stopped) return; UNSET_ONGROUND(this); set_movetype(this, MOVETYPE_BOUNCE); if(this.classname == "nexball_basketball") @@ -255,7 +259,7 @@ void ResetBall(entity this) if(this.cnt < 2) // step 1 { if(time == this.teamtime) - bprint("The ", Team_ColoredFullName(this.team), " held the ball for too long.\n"); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_NEXBALL_RETURN_HELD)); settouch(this, func_null); set_movetype(this, MOVETYPE_NOCLIP); @@ -360,7 +364,7 @@ void GoalTouch(entity this, entity toucher) float isclient, pscore, otherteam; string pname; - if(gameover) return; + if(game_stopped) return; if((this.spawnflags & GOAL_TOUCHPLAYER) && toucher.ballcarried) ball = toucher.ballcarried; else @@ -552,6 +556,9 @@ void SpawnBall(entity this) set_movetype(this, MOVETYPE_FLY); + if(autocvar_g_nexball_playerclip_collisions) + this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP; + if(!autocvar_g_nexball_sound_bounce) this.noise = ""; else if(this.noise == "") @@ -748,11 +755,11 @@ void W_Nexball_Touch(entity this, entity toucher) LogNB("stole", attacker); _sound(toucher, CH_TRIGGER, ball.noise2, VOL_BASE, ATTEN_NORM); - if(SAME_TEAM(attacker, toucher) && time > attacker.teamkill_complain) + if(SAME_TEAM(attacker, toucher) && time > CS(attacker).teamkill_complain) { - attacker.teamkill_complain = time + 5; - attacker.teamkill_soundtime = time + 0.4; - attacker.teamkill_soundsource = toucher; + CS(attacker).teamkill_complain = time + 5; + CS(attacker).teamkill_soundtime = time + 0.4; + CS(attacker).teamkill_soundsource = toucher; } GiveBall(attacker, toucher.ballcarried); @@ -835,6 +842,7 @@ void W_Nexball_Attack2(entity actor, .entity weaponentity) missile.effects = EF_BRIGHTFIELD | EF_LOWPRECISION; missile.flags = FL_PROJECTILE; IL_PUSH(g_projectiles, missile); + IL_PUSH(g_bot_dodge, missile); CSQCProjectile(missile, true, PROJECTILE_ELECTRO, true); } @@ -898,19 +906,24 @@ METHOD(BallStealer, wr_think, void(BallStealer thiswep, entity actor, .entity we } } -METHOD(BallStealer, wr_setup, void(BallStealer this, entity actor)) +METHOD(BallStealer, wr_setup, void(BallStealer this, entity actor, .entity weaponentity)) { TC(BallStealer, this); //weapon_setup(WEP_PORTO.m_id); } -METHOD(BallStealer, wr_checkammo1, bool(BallStealer this, entity actor)) +METHOD(BallStealer, wr_reload, void(entity thiswep, entity actor, .entity weaponentity)) +{ + TC(BallStealer, this); +} + +METHOD(BallStealer, wr_checkammo1, bool(BallStealer this, entity actor, .entity weaponentity)) { TC(BallStealer, this); return true; } -METHOD(BallStealer, wr_checkammo2, bool(BallStealer this, entity actor)) +METHOD(BallStealer, wr_checkammo2, bool(BallStealer this, entity actor, .entity weaponentity)) { TC(BallStealer, this); return true; @@ -993,16 +1006,20 @@ MUTATOR_HOOKFUNCTION(nb, PlayerPreThink) } else { - .entity weaponentity = weaponentities[0]; // TODO - if(player.(weaponentity).weapons) + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { - player.weapons = player.(weaponentity).weapons; - Weapon w = WEP_NEXBALL; - w.wr_resetplayer(w, player); - PS(player).m_switchweapon = player.(weaponentity).m_switchweapon; - W_SwitchWeapon(player, PS(player).m_switchweapon); + .entity weaponentity = weaponentities[slot]; - player.(weaponentity).weapons = '0 0 0'; + if(player.(weaponentity).weapons) + { + player.weapons = player.(weaponentity).weapons; + Weapon w = WEP_NEXBALL; + w.wr_resetplayer(w, player); + player.(weaponentity).m_switchweapon = player.m_switchweapon; + W_SwitchWeapon(player, player.(weaponentity).m_switchweapon, weaponentity); + + player.(weaponentity).weapons = '0 0 0'; + } } } @@ -1024,8 +1041,11 @@ MUTATOR_HOOKFUNCTION(nb, PlayerSpawn) entity player = M_ARGV(0, entity); player.metertime = 0; - .entity weaponentity = weaponentities[0]; - player.(weaponentity).weapons = '0 0 0'; + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + player.(weaponentity).weapons = '0 0 0'; + } if (nexball_mode & NBM_BASKETBALL) player.weapons |= WEPSET(NEXBALL); @@ -1051,16 +1071,18 @@ MUTATOR_HOOKFUNCTION(nb, PlayerPhysics) MUTATOR_HOOKFUNCTION(nb, ForbidThrowCurrentWeapon) { - entity player = M_ARGV(0, entity); + //entity player = M_ARGV(0, entity); + entity wepent = M_ARGV(1, entity); - return PS(player).m_weapon == WEP_NEXBALL; + return wepent.m_weapon == WEP_NEXBALL; } MUTATOR_HOOKFUNCTION(nb, ForbidDropCurrentWeapon) { - entity player = M_ARGV(0, entity); + //entity player = M_ARGV(0, entity); + int wep = M_ARGV(1, int); - return PS(player).m_weapon == WEP_MORTAR; // TODO: what is this for? + return wep == WEP_MORTAR.m_id; // TODO: what is this for? } MUTATOR_HOOKFUNCTION(nb, FilterItem) @@ -1085,7 +1107,7 @@ MUTATOR_HOOKFUNCTION(nb, ItemTouch) return MUT_ITEMTOUCH_CONTINUE; } -MUTATOR_HOOKFUNCTION(nb, GetTeamCount) +MUTATOR_HOOKFUNCTION(nb, CheckAllowedTeams) { M_ARGV(1, string) = "nexball_team"; return true; @@ -1133,9 +1155,9 @@ REGISTER_MUTATOR(nb, g_nexball) InitializeEntity(NULL, nb_delayedinit, INITPRIO_GAMETYPE); WEP_NEXBALL.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; - ActivateTeamplay(); - SetLimits(autocvar_g_nexball_goallimit, autocvar_g_nexball_goalleadlimit, autocvar_timelimit_override, -1); - have_team_spawns = -1; // request team spawns + GameRules_teams(true); + GameRules_limit_score(autocvar_g_nexball_goallimit); + GameRules_limit_lead(autocvar_g_nexball_goalleadlimit); } MUTATOR_ONROLLBACK_OR_REMOVE