X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fwaypoints.qc;h=d2d0aa15c86a2aa02399c3058fb57f6eb7668e7d;hp=91dca6141cf07aa961be583a68acdc53cd1a1464;hb=772fb683d951a622cc8520827096ec34fdea4763;hpb=672f90b2f8b75271fc27d870e97465fd30d30581 diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index 91dca6141c..d2d0aa15c8 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -348,7 +348,15 @@ void waypoint_setupmodel(entity wp) wp.colormod = '1 0 0'; // red else if (wp.wpflags & WAYPOINTFLAG_GENERATED) wp.colormod = '1 1 0'; // yellow - else if (wp.wpflags & WAYPOINTFLAG_NORELINK) + else if (wp.wpflags & WAYPOINTFLAG_SUPPORT) + wp.colormod = '0 1 0'; // green + else if (wp.wpflags & WAYPOINTFLAG_CUSTOM_JP) + wp.colormod = '1 0.5 0'; // orange + else if (wp.wpflags & WAYPOINTFLAG_TELEPORT) + wp.colormod = '1 0.5 0'; // orange + else if (wp.wpflags & WAYPOINTFLAG_LADDER) + wp.colormod = '1 0.5 0'; // orange + else if (wp.wpflags & WAYPOINTFLAG_JUMP) wp.colormod = '1 0.5 0'; // orange else if (wp.wpflags & WAYPOINTFLAG_CROUCH) wp.colormod = '0 1 1'; // cyan @@ -361,6 +369,29 @@ void waypoint_setupmodel(entity wp) wp.model = ""; } +string waypoint_get_type_name(entity wp) +{ + if (wp.wpflags & WAYPOINTFLAG_ITEM) return "^1Item waypoint"; + else if (wp.wpflags & WAYPOINTFLAG_CROUCH) return "^5Crouch waypoint"; + else if (wp.wpflags & WAYPOINTFLAG_JUMP) return "^xf80Jump waypoint"; + else if (wp.wpflags & WAYPOINTFLAG_SUPPORT) return "^2Support waypoint"; + else if (waypoint_has_hardwiredlinks(wp)) return "^x80fHardwired waypoint"; + else if (wp.wpflags & WAYPOINTFLAG_LADDER) return "^3Ladder waypoint"; + else if (wp.wpflags & WAYPOINTFLAG_TELEPORT) + { + if (!wp.wpisbox) return "^3Warpzone waypoint"; + else if (wp.wpflags & WAYPOINTFLAG_CUSTOM_JP) return "^3Custom jumppad waypoint"; + else + { + IL_EACH(g_jumppads, boxesoverlap(wp.absmin, wp.absmax, it.absmin, it.absmax), + { return "^3Jumppad waypoint"; }); + return "^3Teleport waypoint"; + } + } + + return "^7Waypoint"; +} + entity waypoint_get(vector m1, vector m2) { if (m1 == m2) @@ -385,7 +416,7 @@ entity waypoint_spawn(vector m1, vector m2, float f) // spawn only one destination waypoint for teleports teleporting player to the exact same spot // otherwise links loaded from file would be applied only to the first destination // waypoint since link format doesn't specify waypoint entities but just positions - if((f & WAYPOINTFLAG_GENERATED) && !(f & (WAYPOINTFLAG_NORELINK | WAYPOINTFLAG_PERSONAL)) && m1 == m2) + if((f & WAYPOINTFLAG_GENERATED) && !(f & (WPFLAGMASK_NORELINK | WAYPOINTFLAG_PERSONAL)) && m1 == m2) { IL_EACH(g_waypoints, boxesoverlap(m1, m2, it.absmin, it.absmax), { @@ -460,13 +491,15 @@ void waypoint_addlink_for_custom_jumppad(entity wp_from, entity wp_to) bool start_wp_is_spawned; vector start_wp_origin; bool start_wp_is_hardwired; +bool start_wp_is_support; -void waypoint_clear_start_wp(entity pl, bool warn) +void waypoint_clear_start_wp_globals(entity pl, bool warn) { start_wp_is_spawned = false; start_wp_origin = '0 0 0'; pl.wp_locked = NULL; start_wp_is_hardwired = false; + start_wp_is_support = false; if (warn) LOG_INFO("^xf80Start waypoint has been cleared.\n"); } @@ -474,7 +507,7 @@ void waypoint_clear_start_wp(entity pl, bool warn) void waypoint_start_hardwiredlink(entity pl) { entity wp = pl.nearestwaypoint; - if ((!start_wp_is_spawned || start_wp_is_hardwired) && wp && !(wp.wpflags & WAYPOINTFLAG_NORELINK)) + if ((!start_wp_is_spawned || start_wp_is_hardwired) && wp && !(wp.wpflags & WPFLAGMASK_NORELINK)) { start_wp_is_hardwired = true; start_wp_is_spawned = true; @@ -486,7 +519,7 @@ void waypoint_start_hardwiredlink(entity pl) start_wp_is_hardwired = false; } -void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bool is_crouch_wp) +void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bool is_crouch_wp, bool is_support_wp) { if (WAYPOINT_VERSION < waypoint_version_loaded) { @@ -501,13 +534,14 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo { crosshair_trace(pl); org = trace_endpos - eZ * PL_MIN_CONST.z; - IL_EACH(g_jumppads, boxesoverlap(org + PL_MIN_CONST, org + PL_MAX_CONST, it.absmin, it.absmax), - { - jp = it; - break; - }); + if (!(start_wp_is_hardwired || start_wp_is_support)) + IL_EACH(g_jumppads, boxesoverlap(org + PL_MIN_CONST, org + PL_MAX_CONST, it.absmin, it.absmax), + { + jp = it; + break; + }); } - if (jp || is_jump_wp) + if (jp || is_jump_wp || is_support_wp) { if (start_wp_is_spawned) start_wp_is_spawned = false; @@ -522,7 +556,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo ctf_flags = 2; int wp_num = ctf_flags; - if(!PHYS_INPUT_BUTTON_CROUCH(pl) && !at_crosshair && !is_jump_wp) + if(!PHYS_INPUT_BUTTON_CROUCH(pl) && !at_crosshair && !is_jump_wp && !is_support_wp) { // snap waypoint to item's origin if close enough IL_EACH(g_items, true, @@ -554,25 +588,27 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo if (jp) { e = NULL; - IL_EACH(g_waypoints, it.wpflags & WAYPOINTFLAG_NORELINK + IL_EACH(g_waypoints, it.wpflags & WPFLAGMASK_NORELINK && boxesoverlap(org + PL_MIN_CONST, org + PL_MAX_CONST, it.absmin, it.absmax), { e = it; break; }); if (!e) - e = waypoint_spawn(jp.absmin - PL_MAX_CONST + '1 1 1', jp.absmax - PL_MIN_CONST + '-1 -1 -1', WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_NORELINK); + e = waypoint_spawn(jp.absmin - PL_MAX_CONST + '1 1 1', jp.absmax - PL_MIN_CONST + '-1 -1 -1', WAYPOINTFLAG_TELEPORT); if (!pl.wp_locked) pl.wp_locked = e; } - else if (is_jump_wp) + else if (is_jump_wp || is_support_wp) { + int type_flag = (is_jump_wp) ? WAYPOINTFLAG_JUMP : WAYPOINTFLAG_SUPPORT; + entity wp_found = waypoint_get(org, org); - if (wp_found && !(wp_found.wpflags & WAYPOINTFLAG_JUMP)) + if (wp_found && !(wp_found.wpflags & type_flag)) { - LOG_INFO("Error: can't spawn a jump waypoint over an existent waypoint of a different type\n"); + LOG_INFOF("Error: can't spawn a %s waypoint over an existent waypoint of a different type\n", (is_jump_wp) ? "Jump" : "Support"); return; } - e = waypoint_spawn(org, org, WAYPOINTFLAG_JUMP | WAYPOINTFLAG_NORELINK); + e = waypoint_spawn(org, org, type_flag); if (!pl.wp_locked) pl.wp_locked = e; } @@ -582,7 +618,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo { LOG_INFOF("Couldn't spawn waypoint at %v\n", org); if (start_wp_is_spawned) - waypoint_clear_start_wp(pl, true); + waypoint_clear_start_wp_globals(pl, true); return; } @@ -595,7 +631,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo entity start_wp = NULL; if (start_wp_is_spawned) { - IL_EACH(g_waypoints, (start_wp_is_hardwired || it.wpflags & WAYPOINTFLAG_NORELINK) + IL_EACH(g_waypoints, (start_wp_is_hardwired || it.wpflags & WPFLAGMASK_NORELINK) && boxesoverlap(start_org, start_org, it.absmin, it.absmax), { start_wp = it; break; @@ -604,7 +640,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo { // should not happen LOG_INFOF("Couldn't find start waypoint at %v\n", start_org); - waypoint_clear_start_wp(pl, true); + waypoint_clear_start_wp_globals(pl, true); return; } if (start_wp_is_hardwired) @@ -622,20 +658,20 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo { LOG_INFO("Error: hardwired links can be created only between 2 existing (and unconnected) waypoints.\n"); waypoint_remove(e); - waypoint_clear_start_wp(pl, true); - waypoint_spawn_fromeditor(pl, at_crosshair, is_jump_wp, is_crouch_wp); + waypoint_clear_start_wp_globals(pl, true); + waypoint_spawn_fromeditor(pl, at_crosshair, is_jump_wp, is_crouch_wp, is_support_wp); return; } if (start_wp == e) { LOG_INFO("Error: start and destination waypoints coincide.\n"); - waypoint_clear_start_wp(pl, true); + waypoint_clear_start_wp_globals(pl, true); return; } if (waypoint_islinked(start_wp, e)) { LOG_INFO("Error: waypoints are already linked.\n"); - waypoint_clear_start_wp(pl, true); + waypoint_clear_start_wp_globals(pl, true); return; } waypoint_addlink(start_wp, e); @@ -645,18 +681,32 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo } } else + { + if (start_wp_is_support) + { + if (e.SUPPORT_WP) + { + LOG_INFOF("Waypoint %v has already a support waypoint, delete it first.\n", e.origin); + waypoint_clear_start_wp_globals(pl, true); + return; + } + // clear all links to e + IL_EACH(g_waypoints, it != e, + { + if (waypoint_islinked(it, e) && !waypoint_is_hardwiredlink(it, e)) + waypoint_removelink(it, e); + }); + } waypoint_addlink(start_wp, e); + } } - if (!(jp || is_jump_wp || start_wp_is_hardwired)) + if (!(jp || is_jump_wp || is_support_wp || start_wp_is_hardwired)) waypoint_schedulerelink(e); - string wp_type_str = "Waypoint"; - if (is_crouch_wp) wp_type_str = "Crouch waypoint"; - else if (is_jump_wp) wp_type_str = "Jump waypoint"; - else if (jp) wp_type_str = "Custom jumppad waypoint"; + string wp_type_str = waypoint_get_type_name(e); - bprint(strcat(wp_type_str, " spawned at ", vtos(e.origin), "\n")); + bprint(strcat(wp_type_str, "^7 spawned at ", vtos(e.origin), "\n")); if (start_wp_is_spawned) { @@ -693,7 +743,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo goto add_wp; } } - if (jp || is_jump_wp) + if (jp || is_jump_wp || is_support_wp) { if (!start_wp_is_spawned) { @@ -701,11 +751,13 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo // the next one created by the user will be the destination waypoint start_wp_is_spawned = true; start_wp_origin = initial_origin; + if (is_support_wp) + start_wp_is_support = true; } } else if (start_wp_is_spawned) { - waypoint_clear_start_wp(pl, false); + waypoint_clear_start_wp_globals(pl, false); } } @@ -713,6 +765,11 @@ void waypoint_remove(entity wp) { IL_EACH(g_waypoints, it != wp, { + if (it.SUPPORT_WP == wp) + { + it.SUPPORT_WP = NULL; + waypoint_schedulerelink(it); // restore incoming links + } if (waypoint_islinked(it, wp)) { if (waypoint_is_hardwiredlink(it, wp)) @@ -749,13 +806,13 @@ void waypoint_remove_fromeditor(entity pl) if (e.wpflags & WAYPOINTFLAG_GENERATED) { if (start_wp_is_spawned) - waypoint_clear_start_wp(pl, true); + waypoint_clear_start_wp_globals(pl, true); return; } if (waypoint_has_hardwiredlinks(e)) { - LOG_INFO("^1Warning: ^7Removal of hardwired waypoints is not allowed in the editor. Please remove links from/to this waypoint (", vtos(e.origin), ") by hand from maps/", mapname, ".waypoints.hardwired\n"); + LOG_INFO("Can't remove a waypoint with hardwired links, remove them with \"wpeditor hardwire\" first\n"); return; } @@ -786,12 +843,12 @@ void waypoint_remove_fromeditor(entity pl) } if (start_wp_is_spawned) - waypoint_clear_start_wp(pl, true); + waypoint_clear_start_wp_globals(pl, true); } void waypoint_removelink(entity from, entity to) { - if (from == to || (from.wpflags & WAYPOINTFLAG_NORELINK && !(from.wpflags & WAYPOINTFLAG_JUMP))) + if (from == to || (from.wpflags & WPFLAGMASK_NORELINK && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT)))) return; entity fromwp31_prev = from.wp31; @@ -976,7 +1033,7 @@ void waypoint_addlink_customcost(entity from, entity to, float c) { if (from == to || waypoint_islinked(from, to)) return; - if (c == -1 && (from.wpflags & WAYPOINTFLAG_NORELINK) && !(from.wpflags & WAYPOINTFLAG_JUMP)) + if (c == -1 && (from.wpflags & WPFLAGMASK_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))) return; if(c == -1) @@ -1019,10 +1076,13 @@ void waypoint_addlink_customcost(entity from, entity to, float c) void waypoint_addlink(entity from, entity to) { - if ((from.wpflags & WAYPOINTFLAG_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP))) + if ((from.wpflags & WPFLAGMASK_NORELINK) && !(from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))) waypoint_addlink_for_custom_jumppad(from, to); else waypoint_addlink_customcost(from, to, -1); + + if (from.wpflags & WAYPOINTFLAG_SUPPORT) + to.SUPPORT_WP = from; } // relink this spawnfunc_waypoint @@ -1045,8 +1105,10 @@ void waypoint_think(entity this) { if (boxesoverlap(this.absmin, this.absmax, it.absmin, it.absmax)) { - waypoint_addlink(this, it); - waypoint_addlink(it, this); + if (!(this.wpflags & WPFLAGMASK_NORELINK)) + waypoint_addlink(this, it); + if (!(it.wpflags & WPFLAGMASK_NORELINK)) + waypoint_addlink(it, this); } else { @@ -1091,8 +1153,11 @@ void waypoint_think(entity this) //traceline(this.origin, it.origin, false, NULL); //if (trace_fraction == 1) - if (this.wpisbox || this.wpflags & WAYPOINTFLAG_JUMP) + if (this.wpisbox || this.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT) // forbid outgoing links + || it.SUPPORT_WP) // forbid incoming links + { relink_walkculled += 0.5; + } else { if (tracewalk(this, sv, m1, m2, ev2, ev2_height, MOVE_NOMONSTERS)) @@ -1101,8 +1166,12 @@ void waypoint_think(entity this) relink_walkculled += 0.5; } - if (it.wpisbox || it.wpflags & WAYPOINTFLAG_JUMP) + // reverse direction + if (it.wpisbox || it.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT) // forbid incoming links + || this.SUPPORT_WP) // forbid outgoing links + { relink_walkculled += 0.5; + } else { if (tracewalk(this, ev, m1, m2, sv2, sv2_height, MOVE_NOMONSTERS)) @@ -1148,7 +1217,7 @@ void waypoint_schedulerelink(entity wp) wp.enemy = NULL; if (!(wp.wpflags & WAYPOINTFLAG_PERSONAL)) wp.owner = NULL; - if (!(wp.wpflags & WAYPOINTFLAG_NORELINK)) + if (!(wp.wpflags & WPFLAGMASK_NORELINK)) waypoint_clearlinks(wp); // schedule an actual relink on next frame setthink(wp, waypoint_think); @@ -1431,8 +1500,9 @@ void waypoint_load_hardwiredlinks() { waypoint_addlink(wp_from, wp_to); waypoint_mark_hardwiredlink(wp_from, wp_to); - } else if (wp_from.wpflags & WAYPOINTFLAG_NORELINK - && (wp_from.wpflags & WAYPOINTFLAG_JUMP || (wp_from.wpisbox && wp_from.wpflags & WAYPOINTFLAG_TELEPORT))) + } else if (wp_from.wpflags & WPFLAGMASK_NORELINK + && (wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT) + || (wp_from.wpisbox && wp_from.wpflags & WAYPOINTFLAG_TELEPORT))) { waypoint_addlink(wp_from, wp_to); } @@ -1517,7 +1587,7 @@ void waypoint_save_hardwiredlinks() // write special links to file int count2 = 0; fputs(file, "\n// SPECIAL LINKS\n"); - IL_EACH(g_waypoints, it.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_CUSTOM_JP), + IL_EACH(g_waypoints, it.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT | WAYPOINTFLAG_CUSTOM_JP), { for (int j = 0; j < 32; ++j) { @@ -1555,7 +1625,7 @@ void waypoint_save_links() fputs(file, strcat("//", "WAYPOINT_TIME ", waypoint_time, "\n")); int c = 0; - IL_EACH(g_waypoints, !(it.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_CUSTOM_JP)), + IL_EACH(g_waypoints, !(it.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT | WAYPOINTFLAG_CUSTOM_JP)), { for(int j = 0; j < 32; ++j) { @@ -1662,7 +1732,7 @@ void waypoint_saveall() float waypoint_loadall() { string s; - float file, cwp, cwb, fl; + int file, cwp, cwb, fl; vector m1, m2; cwp = 0; cwb = 0; @@ -1729,6 +1799,8 @@ float waypoint_loadall() if (!s) break; fl = stof(s); + if (fl & WAYPOINTFLAG_NORELINK__DEPRECATED) + fl &= ~WAYPOINTFLAG_NORELINK__DEPRECATED; waypoint_spawn(m1, m2, fl); if (m1 == m2) cwp = cwp + 1; @@ -1832,7 +1904,7 @@ void waypoint_spawnforteleporter_boxes(entity e, int teleport_flag, vector org1, { entity w; entity dw; - w = waypoint_spawn(org1, org2, WAYPOINTFLAG_GENERATED | teleport_flag | WAYPOINTFLAG_NORELINK); + w = waypoint_spawn(org1, org2, WAYPOINTFLAG_GENERATED | teleport_flag); dw = waypoint_spawn(destination1, destination2, WAYPOINTFLAG_GENERATED); // one way link to the destination w.wp00_original = dw; @@ -1912,7 +1984,7 @@ void waypoint_showlink(entity wp1, entity wp2, int display_type) if (!(wp1 && wp2)) return; - if (waypoint_is_hardwiredlink(wp1, wp2)) + if (waypoint_is_hardwiredlink(wp1, wp2) || wp1.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT | WAYPOINTFLAG_CUSTOM_JP)) te_beam(NULL, wp1.origin, wp2.origin); else if (display_type == 1) te_lightning2(NULL, wp1.origin, wp2.origin); @@ -2014,11 +2086,12 @@ void botframe_showwaypointlinks() wp = trace_ent; if (wp != it.wp_aimed) { - str = sprintf("\necho ^2WP info^7: entity: %d, flags: %d, origin: %s\n", etof(wp), wp.wpflags, vtos(wp.origin)); + string wp_type_str = waypoint_get_type_name(wp); + str = sprintf("\necho Entity %d: %s^7, flags: %d, origin: %s\n", etof(wp), wp_type_str, wp.wpflags, vtos(wp.origin)); if (wp.wpisbox) str = strcat(str, sprintf("echo \" absmin: %s, absmax: %s\"\n", vtos(wp.absmin), vtos(wp.absmax))); stuffcmd(it, str); - str = sprintf("entity: %d\nflags: %d\norigin: %s", etof(wp), wp.wpflags, vtos(wp.origin)); + str = sprintf("Entity %d: %s^7\nflags: %d\norigin: %s", etof(wp), wp_type_str, wp.wpflags, vtos(wp.origin)); if (wp.wpisbox) str = strcat(str, sprintf(" \nabsmin: %s\nabsmax: %s", vtos(wp.absmin), vtos(wp.absmax))); debug_text_3d(wp.origin, str, 0, 7, '0 0 0'); @@ -2088,7 +2161,7 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en } float bestdist = maxdist; - IL_EACH(g_waypoints, it != wp && !(it.wpflags & WAYPOINTFLAG_NORELINK), + IL_EACH(g_waypoints, it != wp && !(it.wpflags & WPFLAGMASK_NORELINK), { float d = vlen(wp.origin - it.origin) + vlen(it.origin - porg); if(d < bestdist) @@ -2186,7 +2259,6 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en } // automatically create missing waypoints -.entity botframe_autowaypoints_lastwp0, botframe_autowaypoints_lastwp1; void botframe_autowaypoints_fix(entity p, float walkfromwp, .entity fld) { float r = botframe_autowaypoints_fix_from(p, walkfromwp, p.(fld), fld); @@ -2282,6 +2354,8 @@ LABEL(next) }); } +//.entity botframe_autowaypoints_lastwp0; +.entity botframe_autowaypoints_lastwp1; void botframe_autowaypoints() { FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it) && !IS_DEAD(it), {