X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fjumppads.qc;h=7e08862127924a7e76405f2b4c093ed24161983c;hb=f18db064bc143a04ed51bd74f10c2f6d79a931e8;hp=effeff95675702af70cc75a99f37f045bc74a7c2;hpb=ad0825bdcb97b45779a73953aee838cdea09c308;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc index effeff956..7e0886212 100644 --- a/qcsrc/common/triggers/trigger/jumppads.qc +++ b/qcsrc/common/triggers/trigger/jumppads.qc @@ -1,3 +1,4 @@ +#include "jumppads.qh" // TODO: split target_push and put it in the target folder #ifdef SVQC #include "jumppads.qh" @@ -129,23 +130,14 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht) return sdir * vs + '0 0 1' * vz; } -void trigger_push_touch(entity this, entity toucher) +bool jumppad_push(entity this, entity targ) { - if (this.active == ACTIVE_NOT) - return; - - if (!isPushable(toucher)) - return; - - if(this.team) - if(((this.spawnflags & 4) == 0) == (DIFF_TEAM(this, toucher))) - return; - - EXACTTRIGGER_TOUCH(this, toucher); + if (!isPushable(targ)) + return false; if(this.enemy) { - toucher.velocity = trigger_push_calculatevelocity(toucher.origin, this.enemy, this.height); + targ.velocity = trigger_push_calculatevelocity(targ.origin, this.enemy, this.height); } else if(this.target && this.target != "") { @@ -154,109 +146,121 @@ void trigger_push_touch(entity this, entity toucher) for(e = NULL; (e = find(e, targetname, this.target)); ) { if(e.cnt) - RandomSelection_Add(e, 0, string_null, e.cnt, 1); + RandomSelection_AddEnt(e, e.cnt, 1); else - RandomSelection_Add(e, 0, string_null, 1, 1); + RandomSelection_AddEnt(e, 1, 1); } - toucher.velocity = trigger_push_calculatevelocity(toucher.origin, RandomSelection_chosen_ent, this.height); + targ.velocity = trigger_push_calculatevelocity(targ.origin, RandomSelection_chosen_ent, this.height); } else { - toucher.velocity = this.movedir; + targ.velocity = this.movedir; } - UNSET_ONGROUND(toucher); + UNSET_ONGROUND(targ); #ifdef CSQC - if (toucher.flags & FL_PROJECTILE) + if (targ.flags & FL_PROJECTILE) { - toucher.angles = vectoangles (toucher.velocity); - switch(toucher.move_movetype) + targ.angles = vectoangles (targ.velocity); + switch(targ.move_movetype) { case MOVETYPE_FLY: - set_movetype(toucher, MOVETYPE_TOSS); - toucher.gravity = 1; + set_movetype(targ, MOVETYPE_TOSS); + targ.gravity = 1; break; case MOVETYPE_BOUNCEMISSILE: - set_movetype(toucher, MOVETYPE_BOUNCE); - toucher.gravity = 1; + set_movetype(targ, MOVETYPE_BOUNCE); + targ.gravity = 1; break; } } #endif #ifdef SVQC - if (IS_PLAYER(toucher)) + if (IS_PLAYER(targ)) { // reset tracking of oldvelocity for impact damage (sudden velocity changes) - toucher.oldvelocity = toucher.velocity; + targ.oldvelocity = targ.velocity; if(this.pushltime < time) // prevent "snorring" sound when a player hits the jumppad more than once { // flash when activated - Send_Effect(EFFECT_JUMPPAD, toucher.origin, toucher.velocity, 1); - _sound (toucher, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM); + Send_Effect(EFFECT_JUMPPAD, targ.origin, targ.velocity, 1); + _sound (targ, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM); this.pushltime = time + 0.2; } - if(IS_REAL_CLIENT(toucher) || IS_BOT_CLIENT(toucher)) + if(IS_REAL_CLIENT(targ) || IS_BOT_CLIENT(targ)) { bool found = false; - for(int i = 0; i < toucher.jumppadcount && i < NUM_JUMPPADSUSED; ++i) - if(toucher.(jumppadsused[i]) == this) + for(int i = 0; i < targ.jumppadcount && i < NUM_JUMPPADSUSED; ++i) + if(targ.(jumppadsused[i]) == this) found = true; if(!found) { - toucher.(jumppadsused[toucher.jumppadcount % NUM_JUMPPADSUSED]) = this; - toucher.jumppadcount = toucher.jumppadcount + 1; + targ.(jumppadsused[targ.jumppadcount % NUM_JUMPPADSUSED]) = this; + targ.jumppadcount = targ.jumppadcount + 1; } - if(IS_REAL_CLIENT(toucher)) + if(IS_REAL_CLIENT(targ)) { if(this.message) - centerprint(toucher, this.message); + centerprint(targ, this.message); } else - toucher.lastteleporttime = time; + targ.lastteleporttime = time; - if (!IS_DEAD(toucher)) - animdecide_setaction(toucher, ANIMACTION_JUMP, true); + if (!IS_DEAD(targ)) + animdecide_setaction(targ, ANIMACTION_JUMP, true); } else - toucher.jumppadcount = true; + targ.jumppadcount = true; // reset tracking of who pushed you into a hazard (for kill credit) - toucher.pushltime = 0; - toucher.istypefrag = 0; + targ.pushltime = 0; + targ.istypefrag = 0; } if(this.enemy.target) - SUB_UseTargets(this.enemy, toucher, toucher); // TODO: do we need toucher as trigger too? + SUB_UseTargets(this.enemy, targ, this); - if (toucher.flags & FL_PROJECTILE) + if (targ.flags & FL_PROJECTILE) { - toucher.angles = vectoangles (toucher.velocity); - toucher.com_phys_gravity_factor = 1; - switch(toucher.move_movetype) + targ.angles = vectoangles (targ.velocity); + targ.com_phys_gravity_factor = 1; + switch(targ.move_movetype) { case MOVETYPE_FLY: - set_movetype(toucher, MOVETYPE_TOSS); - toucher.gravity = 1; + set_movetype(targ, MOVETYPE_TOSS); + targ.gravity = 1; break; case MOVETYPE_BOUNCEMISSILE: - set_movetype(toucher, MOVETYPE_BOUNCE); - toucher.gravity = 1; + set_movetype(targ, MOVETYPE_BOUNCE); + targ.gravity = 1; break; } - UpdateCSQCProjectile(toucher); + UpdateCSQCProjectile(targ); } +#endif - /*if (toucher.flags & FL_ITEM) - { - ItemUpdate(toucher); - toucher.SendFlags |= ISF_DROP; - }*/ + return true; +} + +void trigger_push_touch(entity this, entity toucher) +{ + if (this.active == ACTIVE_NOT) + return; + + if(this.team) + if(((this.spawnflags & 4) == 0) == (DIFF_TEAM(this, toucher))) + return; - if (this.spawnflags & PUSH_ONCE) + EXACTTRIGGER_TOUCH(this, toucher); + + noref bool success = jumppad_push(this, toucher); + +#ifdef SVQC + if (success && (this.spawnflags & PUSH_ONCE)) { settouch(this, func_null); setthink(this, SUB_Remove); @@ -268,31 +272,75 @@ void trigger_push_touch(entity this, entity toucher) #ifdef SVQC void trigger_push_link(entity this); void trigger_push_updatelink(entity this); +bool trigger_push_testorigin(entity e, entity targ, entity jp, vector org) +{ + setorigin(e, org); + tracetoss(e, e); + if(trace_startsolid) + return false; + if(e.move_movetype == MOVETYPE_NONE) + { + tracebox(trace_endpos, e.mins, e.maxs, trace_endpos - eZ * 1500, true, jp); + return true; + } + return false; +} #endif void trigger_push_findtarget(entity this) { - entity t; - vector org; - // first calculate a typical start point for the jump - org = (this.absmin + this.absmax) * 0.5; - org_z = this.absmax.z - STAT(PL_MIN, NULL).z; + vector org = (this.absmin + this.absmax) * 0.5; + org.z = this.absmax.z - PL_MIN_CONST.z; if (this.target) { - float n = 0; - for(t = NULL; (t = find(t, targetname, this.target)); ) + int n = 0; + for(entity t = NULL; (t = find(t, targetname, this.target)); ) { ++n; #ifdef SVQC entity e = spawn(); - setorigin(e, org); - setsize(e, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL)); + setsize(e, PL_MIN_CONST, PL_MAX_CONST); e.velocity = trigger_push_calculatevelocity(org, t, this.height); - tracetoss(e, e); - if(e.move_movetype == MOVETYPE_NONE) - waypoint_spawnforteleporter(this, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); - remove(e); + vector best_target = '0 0 0'; + vector best_org = '0 0 0'; + bool valid_best_target = false; + if (trigger_push_testorigin(e, t, this, org)) + { + best_target = trace_endpos; + best_org = org; + valid_best_target = true; + } + + vector new_org; + vector dist = t.origin - org; + if (dist.x || dist.y) // if not perfectly vertical + { + // test trajectory with different starting points, sometimes the trajectory + // starting from the jumppad origin can't reach the real destination + // and destination waypoint ends up near the jumppad itself + vector flatdir = normalize(dist - eZ * dist.z); + vector ofs = flatdir * 0.5 * min(fabs(this.absmax.x - this.absmin.x), fabs(this.absmax.y - this.absmin.y)); + new_org = org + ofs; + e.velocity = trigger_push_calculatevelocity(new_org, t, this.height); + if (trigger_push_testorigin(e, t, this, new_org) && (!valid_best_target || trace_endpos.z > best_target.z + 50)) + { + best_target = trace_endpos; + best_org = new_org; + valid_best_target = true; + } + new_org = org - ofs; + e.velocity = trigger_push_calculatevelocity(new_org, t, this.height); + if (trigger_push_testorigin(e, t, this, new_org) && (!valid_best_target || trace_endpos.z > best_target.z + 50)) + { + best_target = trace_endpos; + best_org = new_org; + valid_best_target = true; + } + } + if (valid_best_target) + waypoint_spawnforteleporter(this, best_target, (vlen(t.origin - best_org) + vlen(best_target - t.origin)) / vlen(e.velocity)); + delete(e); #endif } @@ -320,14 +368,13 @@ void trigger_push_findtarget(entity this) { entity e = spawn(); setorigin(e, org); - setsize(e, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL)); + setsize(e, PL_MIN_CONST, PL_MAX_CONST); e.velocity = this.movedir; tracetoss(e, e); waypoint_spawnforteleporter(this, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); - remove(e); + delete(e); } - trigger_push_link(this); defer(this, 0.1, trigger_push_updatelink); #endif } @@ -392,6 +439,8 @@ spawnfunc(trigger_push) this.noise = "misc/jumppad.wav"; precache_sound (this.noise); + trigger_push_link(this); // link it now + // this must be called to spawn the teleport waypoints for bots InitializeEntity(this, trigger_push_findtarget, INITPRIO_FINDTARGET); } @@ -414,6 +463,14 @@ bool target_push_send(entity this, entity to, float sf) return true; } +void target_push_use(entity this, entity actor, entity trigger) +{ + if(trigger.classname == "trigger_push" || trigger == this) + return; // WTF, why is this a thing + + jumppad_push(this, actor); +} + void target_push_link(entity this) { BITSET_ASSIGN(this.effects, EF_NODEPTHTEST); @@ -428,7 +485,18 @@ void target_push_init(entity this) target_push_link(this); } -spawnfunc(target_push) { target_push_init(this); } +void target_push_init2(entity this) +{ + if(this.target && this.target != "") // we have an old style pusher! + { + InitializeEntity(this, trigger_push_findtarget, INITPRIO_FINDTARGET); + this.use = target_push_use; + } + + target_push_init(this); // normal push target behaviour can be combined with a legacy pusher? +} + +spawnfunc(target_push) { target_push_init2(this); } spawnfunc(info_notnull) { target_push_init(this); } spawnfunc(target_position) { target_push_init(this); } @@ -459,9 +527,9 @@ NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew) void target_push_remove(entity this) { - if(this.classname) - strunzone(this.classname); - this.classname = string_null; + //if(this.classname) + //strunzone(this.classname); + //this.classname = string_null; if(this.targetname) strunzone(this.targetname);