X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=273b854ce966e96807a01414fc2596fcbf0a90ce;hp=319b6f16ff7e3c7c333d8fb3a67e2b360eefbde8;hb=2649e8e8c7377825bebcab773696955107d8995f;hpb=5453f53da1df88742c11c71e4dc5b9c3e3d24c62 diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 319b6f16f..273b854ce 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -40,29 +40,38 @@ void crosshair_trace(entity pl) { traceline_antilag(pl, CS(pl).cursor_trace_start, CS(pl).cursor_trace_start + normalize(CS(pl).cursor_trace_endpos - CS(pl).cursor_trace_start) * max_shot_distance, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl)); } -.bool ctrace_solidchanged; + void crosshair_trace_plusvisibletriggers(entity pl) +{ + crosshair_trace_plusvisibletriggers__is_wz(pl, false); +} + +void WarpZone_crosshair_trace_plusvisibletriggers(entity pl) +{ + crosshair_trace_plusvisibletriggers__is_wz(pl, true); +} + +void crosshair_trace_plusvisibletriggers__is_wz(entity pl, bool is_wz) { FOREACH_ENTITY_FLOAT(solid, SOLID_TRIGGER, { if(it.model != "") { it.solid = SOLID_BSP; - it.ctrace_solidchanged = true; IL_PUSH(g_ctrace_changed, it); } }); - crosshair_trace(pl); + if (is_wz) + WarpZone_crosshair_trace(pl); + else + crosshair_trace(pl); - IL_EACH(g_ctrace_changed, it.ctrace_solidchanged, - { - it.solid = SOLID_TRIGGER; - it.ctrace_solidchanged = false; - }); + IL_EACH(g_ctrace_changed, true, { it.solid = SOLID_TRIGGER; }); IL_CLEAR(g_ctrace_changed); } + void WarpZone_crosshair_trace(entity pl) { WarpZone_traceline_antilag(pl, CS(pl).cursor_trace_start, CS(pl).cursor_trace_start + normalize(CS(pl).cursor_trace_endpos - CS(pl).cursor_trace_start) * max_shot_distance, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl)); @@ -209,12 +218,12 @@ string AmmoNameFromWeaponentity(Weapon wep) string ammoitems = "batteries"; switch (wep.ammo_type) { - case RESOURCE_SHELLS: ammoitems = ITEM_Shells.m_name; break; - case RESOURCE_BULLETS: ammoitems = ITEM_Bullets.m_name; break; - case RESOURCE_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; - case RESOURCE_CELLS: ammoitems = ITEM_Cells.m_name; break; - case RESOURCE_PLASMA: ammoitems = ITEM_Plasma.m_name; break; - case RESOURCE_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; + case RES_SHELLS: ammoitems = ITEM_Shells.m_name; break; + case RES_BULLETS: ammoitems = ITEM_Bullets.m_name; break; + case RES_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; + case RES_CELLS: ammoitems = ITEM_Cells.m_name; break; + case RES_PLASMA: ammoitems = ITEM_Plasma.m_name; break; + case RES_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; } return ammoitems; } @@ -223,16 +232,13 @@ string formatmessage(entity this, string msg) { float p, p1, p2; float n; - vector cursor; - entity cursor_ent; + vector cursor = '0 0 0'; + entity cursor_ent = NULL; string escape; string replacement; p = 0; n = 7; - - WarpZone_crosshair_trace(this); - cursor = trace_endpos; - cursor_ent = trace_ent; + bool traced = false; MUTATOR_CALLHOOK(PreFormatMessage, this, msg); msg = M_ARGV(1, string); @@ -256,6 +262,14 @@ string formatmessage(entity this, string msg) if (p < 0) break; + if(!traced) + { + WarpZone_crosshair_trace_plusvisibletriggers(this); + cursor = trace_endpos; + cursor_ent = trace_ent; + traced = true; + } + replacement = substring(msg, p, 2); escape = substring(msg, p + 1, 1); @@ -266,8 +280,8 @@ string formatmessage(entity this, string msg) case "%": replacement = "%"; break; case "\\":replacement = "\\"; break; case "n": replacement = "\n"; break; - case "a": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_ARMOR))); break; - case "h": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_HEALTH))); break; + case "a": replacement = ftos(floor(GetResource(this, RES_ARMOR))); break; + case "h": replacement = ftos(floor(GetResource(this, RES_HEALTH))); break; case "l": replacement = NearestLocation(this.origin); break; case "y": replacement = NearestLocation(cursor); break; case "d": replacement = NearestLocation(this.death_origin); break; @@ -402,6 +416,12 @@ REPLICATE(cvar_cl_weaponimpulsemode, int, "cl_weaponimpulsemode"); REPLICATE(cvar_g_xonoticversion, string, "g_xonoticversion"); +REPLICATE(cvar_cl_cts_noautoswitch, bool, "cl_cts_noautoswitch"); + +REPLICATE(cvar_cl_weapon_switch_reload, bool, "cl_weapon_switch_reload"); + +REPLICATE(cvar_cl_weapon_switch_fallback_to_impulse, bool, "cl_weapon_switch_fallback_to_impulse"); + /** * @param f -1: cleanup, 0: request, 1: receive */ @@ -479,12 +499,7 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne allow_mutatorblocked = M_ARGV(3, bool); if(allguns) - { - if(weaponinfo.spawnflags & WEP_FLAG_NORMAL) - d = true; - else - d = false; - } + d = boolean((weaponinfo.spawnflags & WEP_FLAG_NORMAL) && !(weaponinfo.spawnflags & WEP_FLAG_HIDDEN)); else if(!mutator_returnvalue) d = !(!weaponinfo.weaponstart); @@ -507,6 +522,19 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne return t; } +void weaponarena_available_update(entity this) +{ + FOREACH(Weapons, it != WEP_Null, { + // if no weapons are available, just fall back to normal weapons (most weapons arena) + bool wep_available = ((weaponsInMapAll) ? !!(weaponsInMapAll & WepSet_FromWeapon(it)) : (it.spawnflags & WEP_FLAG_NORMAL)); + if(wep_available && !(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN)) + g_weaponarena_weapons |= WepSet_FromWeapon(it); + }); + start_weapons = g_weaponarena_weapons; + if(warmup_stage) + warmup_start_weapons = start_weapons; +} + void readplayerstartcvars() { float i, t; @@ -568,11 +596,22 @@ void readplayerstartcvars() g_weaponarena = 1; g_weaponarena_list = "Most Weapons"; FOREACH(Weapons, it != WEP_Null, { - if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) - if(it.spawnflags & WEP_FLAG_NORMAL) - g_weaponarena_weapons |= (it.m_wepset); + if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && (it.spawnflags & WEP_FLAG_NORMAL) && !(it.spawnflags & WEP_FLAG_HIDDEN)) + g_weaponarena_weapons |= (it.m_wepset); }); } + else if (s == "available") + { + g_weaponarena = 2; + g_weaponarena_list = "Most Weapons"; + // include weapons the player would start with + FOREACH(Weapons, it != WEP_Null, { + int w = want_weapon(it, false); + if(w & 1) + g_weaponarena_weapons |= (it.m_wepset); + }); + InitializeEntity(NULL, weaponarena_available_update, INITPRIO_FINDTARGET); + } else if (s == "none") { g_weaponarena = 1; @@ -586,14 +625,12 @@ void readplayerstartcvars() for (i = 0; i < t; ++i) { s = argv(i); - FOREACH(Weapons, it != WEP_Null, { - if(it.netname == s) - { - g_weaponarena_weapons |= (it.m_wepset); - g_weaponarena_list = strcat(g_weaponarena_list, it.m_name, " & "); - break; - } - }); + Weapon wep = Weapons_fromstr(s); + if(wep != WEP_Null) + { + g_weaponarena_weapons |= (wep.m_wepset); + g_weaponarena_list = strcat(g_weaponarena_list, wep.m_name, " & "); + } } g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3)); } @@ -618,6 +655,9 @@ void readplayerstartcvars() }); } + if(cvar("g_balance_superweapons_time") < 0) + start_items |= IT_UNLIMITED_SUPERWEAPONS; + if(!cvar("g_use_ammunition")) start_items |= IT_UNLIMITED_AMMO; @@ -639,15 +679,15 @@ void readplayerstartcvars() start_ammo_plasma = cvar("g_start_ammo_plasma"); start_ammo_fuel = cvar("g_start_ammo_fuel"); random_start_weapons_count = cvar("g_random_start_weapons_count"); - SetResourceAmount(random_start_ammo, RESOURCE_SHELLS, cvar( + SetResource(random_start_ammo, RES_SHELLS, cvar( "g_random_start_shells")); - SetResourceAmount(random_start_ammo, RESOURCE_BULLETS, cvar( + SetResource(random_start_ammo, RES_BULLETS, cvar( "g_random_start_bullets")); - SetResourceAmount(random_start_ammo, RESOURCE_ROCKETS, + SetResource(random_start_ammo, RES_ROCKETS, cvar("g_random_start_rockets")); - SetResourceAmount(random_start_ammo, RESOURCE_CELLS, cvar( + SetResource(random_start_ammo, RES_CELLS, cvar( "g_random_start_cells")); - SetResourceAmount(random_start_ammo, RESOURCE_PLASMA, cvar( + SetResource(random_start_ammo, RES_PLASMA, cvar( "g_random_start_plasma")); } @@ -703,30 +743,22 @@ void readplayerstartcvars() warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable")); } - WepSet precache_weapons = start_weapons; - if (g_warmup_allguns != 1) - precache_weapons |= warmup_start_weapons; - FOREACH(Weapons, it != WEP_Null, { - if(precache_weapons & (it.m_wepset)) - it.wr_init(it); - }); - start_ammo_shells = max(0, start_ammo_shells); start_ammo_nails = max(0, start_ammo_nails); start_ammo_rockets = max(0, start_ammo_rockets); start_ammo_cells = max(0, start_ammo_cells); start_ammo_plasma = max(0, start_ammo_plasma); start_ammo_fuel = max(0, start_ammo_fuel); - SetResourceAmount(random_start_ammo, RESOURCE_SHELLS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_SHELLS))); - SetResourceAmount(random_start_ammo, RESOURCE_BULLETS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_BULLETS))); - SetResourceAmount(random_start_ammo, RESOURCE_ROCKETS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_ROCKETS))); - SetResourceAmount(random_start_ammo, RESOURCE_CELLS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_CELLS))); - SetResourceAmount(random_start_ammo, RESOURCE_PLASMA, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_PLASMA))); + SetResource(random_start_ammo, RES_SHELLS, max(0, + GetResource(random_start_ammo, RES_SHELLS))); + SetResource(random_start_ammo, RES_BULLETS, max(0, + GetResource(random_start_ammo, RES_BULLETS))); + SetResource(random_start_ammo, RES_ROCKETS, max(0, + GetResource(random_start_ammo, RES_ROCKETS))); + SetResource(random_start_ammo, RES_CELLS, max(0, + GetResource(random_start_ammo, RES_CELLS))); + SetResource(random_start_ammo, RES_PLASMA, max(0, + GetResource(random_start_ammo, RES_PLASMA))); warmup_start_ammo_shells = max(0, warmup_start_ammo_shells); warmup_start_ammo_nails = max(0, warmup_start_ammo_nails); @@ -875,7 +907,7 @@ void remove_safely(entity e) builtin_remove(e); } -void InitializeEntity(entity e, void(entity this) func, float order) +void InitializeEntity(entity e, void(entity this) func, int order) { entity prev, cur;