ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/move.C
(Generate patch)

Comparing deliantra/server/server/move.C (file contents):
Revision 1.15 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.36 by root, Sun Feb 7 04:22:33 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#ifndef __CEXTRACT__ 26#ifndef __CEXTRACT__
27# include <sproto.h> 27# include <sproto.h>
28#endif
29
30#ifdef COZY_SERVER
31// use a ptotoype
32extern int same_party (partylist *a, partylist *b);
33#endif 28#endif
34 29
35/* 30/*
36 * move_object() tries to move object op in the direction "dir". 31 * move_object() tries to move object op in the direction "dir".
37 * If it fails (something blocks the passage), it returns 0, 32 * If it fails (something blocks the passage), it returns 0,
38 * otherwise 1. 33 * otherwise 1.
39 * This is an improvement from the previous move_ob(), which 34 * This is an improvement from the previous move_ob(), which
40 * removed and inserted objects even if they were unable to move. 35 * removed and inserted objects even if they were unable to move.
41 */ 36 */
42
43int 37int
44move_object (object *op, int dir) 38move_object (object *op, int dir)
45{ 39{
46 return move_ob (op, dir, op); 40 return op->move (dir);
47} 41}
48
49 42
50/* object op is trying to move in direction dir. 43/* object op is trying to move in direction dir.
51 * originator is typically the same as op, but 44 * originator is typically the same as op, but
52 * can be different if originator is causing op to 45 * can be different if originator is causing op to
53 * move (originator is pushing op) 46 * move (originator is pushing op)
… …
57 * very similiar to move_object. 50 * very similiar to move_object.
58 */ 51 */
59int 52int
60move_ob (object *op, int dir, object *originator) 53move_ob (object *op, int dir, object *originator)
61{ 54{
55 return op->move (dir, originator);
56}
57
58int
59object::move (int dir, object *originator)
60{
62 sint16 newx = op->x + freearr_x[dir]; 61 sint16 newx = x + freearr_x[dir];
63 sint16 newy = op->y + freearr_y[dir]; 62 sint16 newy = y + freearr_y[dir];
64 object *tmp;
65 maptile *m;
66 int mflags;
67 63
68 if (op == NULL) 64 mapxy pos (this);
69 { 65 pos.move (dir);
70 LOG (llevError, "Trying to move NULL.\n");
71 return 0;
72 }
73 66
74 m = op->map;
75 mflags = get_map_flags (m, &m, newx, newy, &newx, &newy);
76
77 /* If the space the player is trying to is out of the map, 67 /* If the space the object is moving to is out of the map,
78 * bail now - we know it can't work. 68 * bail now - we know it can't work.
79 */ 69 */
80 if (mflags & P_OUT_OF_MAP) 70 if (!pos.normalise ())
81 return 0; 71 return 0;
82 72
83 /* Is this space blocked? Players with wizpass are immune to 73 /* Is this space blocked? Players with wizpass are immune to
84 * this condition. 74 * this condition.
85 */ 75 */
86 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS)) 76 if (blocked_link (this, pos.m, pos.x, pos.y) && !flag [FLAG_WIZPASS])
87 return 0; 77 return 0;
88 78
79 // check tail movability
80 if (more && !more->move (dir, more->head))
81 return 0;
82
89 /* 0.94.2 - we need to set the direction for the new animation code. 83 /* we need to set the direction for the new animation code.
90 * it uses it to figure out face to use - I can't see it 84 * it uses it to figure out face to use - I can't see it
91 * breaking anything, but it might. 85 * breaking anything, but it might.
92 */ 86 */
93 if (op->more && !move_ob (op->more, dir, op->more->head))
94 return 0;
95
96 op->direction = dir; 87 direction = dir;
97 88
98 if (op->will_apply & 4) 89 if (will_apply & 4)
99 check_earthwalls (op, m, newx, newy); 90 check_earthwalls (this, pos.m, pos.x, pos.y);
100 91
101 if (op->will_apply & 8) 92 if (will_apply & 8)
102 check_doors (op, m, newx, newy); 93 check_doors (this, pos.m, pos.x, pos.y);
103
104 /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying
105 * to remove a removed object, and this function was the culprit. A possible
106 * guess I have is that check_doors above ran into a trap, killing the
107 * monster.
108 *
109 * Unfortunately, it doesn't appear that the calling functions of move_object
110 * deal very well with op being killed, so all this might do is just
111 * migrate the problem someplace else.
112 */
113
114 if (QUERY_FLAG (op, FLAG_REMOVED))
115 {
116 LOG (llevDebug, "move_object: monster has been removed - will not process further\n");
117 /* Was not successful, but don't want to try and move again */
118 return 1;
119 }
120 94
121 /* If this is a tail portion, just want to tell caller that move is 95 /* If this is a tail portion, just want to tell caller that move is
122 * ok - the caller will deal with actual object removal/insertion 96 * ok - the caller will deal with actual object removal/insertion
123 */ 97 */
124 if (op->head) 98 if (head)
125 return 1; 99 return 1;
126 100
127 if (m != op->map && op->contr) 101 if (pos.m != map && contr)
128 { 102 {
129 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 103 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
130 return 0; 104 return 0;
131 105
132 op->remove (); 106 remove ();
133 107
134 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy))) 108 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (pos.m), ARG_INT (pos.x), ARG_INT (pos.y)))
135 return 0; 109 return 0;
136 110
137 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy))) 111 if (INVOKE_MAP (ENTER, pos.m, ARG_PLAYER (contr), ARG_INT (pos.x), ARG_INT (pos.y)))
138 return 0; 112 return 0;
139 } 113 }
140 else
141 op->remove ();
142
143 /* we already have newx, newy, and m, so lets use them.
144 * In addition, this fixes potential crashes, because multipart object was
145 * on edge of map, +=x, +=y doesn't make correct coordinates.
146 */
147 for (tmp = op; tmp != NULL; tmp = tmp->more)
148 {
149 tmp->x += freearr_x[dir];
150 tmp->y += freearr_y[dir];
151 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y);
152 }
153 114
154 /* insert_ob_in_map will deal with any tiling issues */ 115 /* insert_ob_in_map will deal with any tiling issues */
155 insert_ob_in_map (op, m, originator, 0); 116 pos.insert (this, originator);
156 117
157 return 1; 118 return 1;
158} 119}
159
160 120
161/* 121/*
162 * transfer_ob(): Move an object (even linked objects) to another spot 122 * transfer_ob(): Move an object (even linked objects) to another spot
163 * on the same map. 123 * on the same map.
164 * 124 *
… …
182 i = find_first_free_spot (op, op->map, x, y); 142 i = find_first_free_spot (op, op->map, x, y);
183 143
184 if (i == -1) 144 if (i == -1)
185 return 0; /* No free spot */ 145 return 0; /* No free spot */
186 146
187 if (op->head != NULL)
188 op = op->head; 147 op = op->head_ ();
189 op->remove (); 148 op->remove ();
149
190 for (tmp = op; tmp != NULL; tmp = tmp->more) 150 for (object *tmp = op; tmp; tmp = tmp->more)
191 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 151 {
192 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 152 tmp->x = x + freearr_x[i] + tmp->arch->x;
153 tmp->y = y + freearr_y[i] + tmp->arch->y;
154 }
193 155
194 tmp = insert_ob_in_map (op, op->map, originator, 0); 156 op = insert_ob_in_map (op, op->map, originator, 0);
195 if (tmp) 157
196 return 0; 158 return !op;
197 else
198 return 1;
199} 159}
200 160
201/* 161/*
202 * Return value: 1 if object was destroyed, 0 otherwise. 162 * Return value: 1 if object was destroyed, 0 otherwise.
203 * Modified so that instead of passing the 'originator' that had no 163 * Modified so that instead of passing the 'originator' that had no
… …
211 * one of another type. 171 * one of another type.
212 */ 172 */
213int 173int
214teleport (object *teleporter, uint8 tele_type, object *user) 174teleport (object *teleporter, uint8 tele_type, object *user)
215{ 175{
216 object *altern; 176 if (!user)
217 int i, j, k, nrofalt = 0; 177 return 0;
178
218 object *other_teleporter, *tmp; 179 object *other_teleporter = 0;
219 maptile *m; 180 int nrofalt = 0;
220 sint16 sx, sy;
221 181
222 if (user == NULL)
223 return 0;
224 if (user->head != NULL)
225 user = user->head; 182 user = user->head_ ();
226 183
227 /* Find all other teleporters within range. This range 184 /* Find all other teleporters within range. This range
228 * should really be setable by some object attribute instead of 185 * should really be setable by some object attribute instead of
229 * using hard coded values. 186 * using hard coded values.
230 */ 187 */
231 for (i = -5; i < 6; i++) 188 unordered_mapwalk (mapwalk_buf, teleporter, -5, -5, 5, 5)
232 for (j = -5; j < 6; j++)
233 { 189 {
234 if (i == 0 && j == 0) 190 mapspace &ms = m->at (nx, ny);
235 continue;
236 /* Perhaps this should be extended to support tiled maps */
237 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
238 continue;
239 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
240 191
241 while (other_teleporter) 192 for (object *tmp = ms.top; tmp; tmp = tmp->below)
193 if (tmp->type == tele_type)
242 { 194 {
243 if (other_teleporter->type == tele_type) 195 if ((dx || dy) && !rndm (++nrofalt))
196 other_teleporter = tmp;
197
244 break; 198 break;
245 other_teleporter = other_teleporter->above;
246 } 199 }
247 if (other_teleporter && !(RANDOM () % ++nrofalt))
248 altern = other_teleporter;
249 } 200 }
250 201
251 if (!nrofalt) 202 if (!nrofalt)
252 { 203 {
253 LOG (llevError, "No alternative teleporters around!\n"); 204 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
205 teleporter->debug_desc (), user->debug_desc ());
254 return 0; 206 return 0;
255 } 207 }
256 208
257 other_teleporter = altern;
258 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 209 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
259 210
260 /* if k==-1, unable to find a free spot. If this is shop 211 /* if k==-1, unable to find a free spot. If this is shop
261 * mat that the player is using, find someplace to move 212 * mat that the player is using, find someplace to move
262 * the player - otherwise, player can get trapped in the shops 213 * the player - otherwise, player can get trapped in the shops
263 * that appear in random dungeons. We basically just make 214 * that appear in random dungeons. We basically just make
264 * sure the space isn't no pass (eg wall), and don't care 215 * sure the space isn't no pass (eg wall), and don't care
265 * about is alive. 216 * about is alive.
266 */ 217 */
267 if (k == -1) 218 if (k == -1)
268 { 219 {
269 if (tele_type == SHOP_MAT && user->type == PLAYER) 220 if (tele_type == SHOP_MAT && user->is_player ())
270 { 221 {
271 for (k = 1; k < 9; k++) 222 for (k = 1; k < 9; k++)
272 { 223 {
224 maptile *m;
225 sint16 sx, sy;
226
273 if (get_map_flags (other_teleporter->map, &m, 227 if (get_map_flags (other_teleporter->map, &m,
274 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP) 228 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP)
275 continue; 229 continue;
276 230
277 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy))) 231 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy)))
278 break; 232 break;
279
280 } 233 }
234
281 if (k == 9) 235 if (k == 9)
282 { 236 {
283 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n", 237 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n",
284 &other_teleporter->name, other_teleporter->x, other_teleporter->y); 238 &other_teleporter->name, other_teleporter->x, other_teleporter->y);
285 return 0; 239 return 0;
… …
287 } 241 }
288 else 242 else
289 return 0; 243 return 0;
290 } 244 }
291 245
292 user->remove (); 246 return !other_teleporter->map->insert (
293 247 user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k]
294 /* Update location for the object */ 248 );
295 for (tmp = user; tmp != NULL; tmp = tmp->more)
296 {
297 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
298 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
299 }
300 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
301 return (tmp == NULL);
302}
303
304void
305recursive_roll (object *op, int dir, object *pusher)
306{
307 if (!roll_ob (op, dir, pusher))
308 {
309 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
310 return;
311 }
312 (void) move_ob (pusher, dir, pusher);
313 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
314 return;
315} 249}
316 250
317/* 251/*
318 * This is a new version of blocked, this one handles objects 252 * This is a new version of blocked, this one handles objects
319 * that can be passed through by monsters with the CAN_PASS_THRU defined. 253 * that can be passed through by monsters with the CAN_PASS_THRU defined.
320 * 254 *
321 * very new version handles also multipart objects 255 * very new version handles also multipart objects
322 * This is currently only used for the boulder roll code. 256 * This is currently only used for the boulder roll code.
323 * Returns 1 if object does not fit, 0 if it does. 257 * Returns 1 if object does not fit, 0 if it does.
324 */ 258 */
325 259static int
326int
327try_fit (object *op, maptile *m, int x, int y) 260try_fit (object *op, maptile *m, int x, int y)
328{ 261{
329 object *tmp, *more; 262 object *tmp, *more;
330 sint16 tx, ty; 263 sint16 tx, ty;
331 int mflags; 264 int mflags;
… …
363/* 296/*
364 * this is not perfect yet. 297 * this is not perfect yet.
365 * it does not roll objects behind multipart objects properly. 298 * it does not roll objects behind multipart objects properly.
366 * Support for rolling multipart objects is questionable. 299 * Support for rolling multipart objects is questionable.
367 */ 300 */
368 301static int
369int
370roll_ob (object *op, int dir, object *pusher) 302roll_ob (object *op, int dir, object *pusher)
371{ 303{
372 object *tmp;
373 sint16 x, y; 304 sint16 x, y;
374 int flags; 305 int flags;
375 maptile *m; 306 maptile *m;
376 MoveType move_block; 307 MoveType move_block;
377 308
… …
379 op = op->head; 310 op = op->head;
380 311
381 x = op->x + freearr_x[dir]; 312 x = op->x + freearr_x[dir];
382 y = op->y + freearr_y[dir]; 313 y = op->y + freearr_y[dir];
383 314
384 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 315 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
316 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
317 > pusher->stats.Str))
385 return 0; 318 return 0;
386 319
387 m = op->map; 320 m = op->map;
388 flags = get_map_flags (m, &m, x, y, &x, &y); 321 flags = get_map_flags (m, &m, x, y, &x, &y);
389 322
… …
393 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 326 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
394 327
395 /* If the target space is not blocked, no need to look at the objects on it */ 328 /* If the target space is not blocked, no need to look at the objects on it */
396 if ((op->move_type & move_block) == op->move_type) 329 if ((op->move_type & move_block) == op->move_type)
397 { 330 {
398 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 331 for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
399 { 332 {
400 if (tmp->head == op) 333 if (tmp->head == op)
401 continue; 334 continue;
335
402 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 336 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
403 return 0; 337 return 0;
404 } 338 }
405 } 339 }
340
406 if (try_fit (op, m, x, y)) 341 if (try_fit (op, m, x, y))
407 return 0; 342 return 0;
408 343
409 op->remove (); 344 op->move (dir);
410 for (tmp = op; tmp != NULL; tmp = tmp->more) 345
411 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
412 insert_ob_in_map (op, op->map, pusher, 0);
413 return 1; 346 return 1;
347}
348
349void
350recursive_roll (object *op, int dir, object *pusher)
351{
352 if (!roll_ob (op, dir, pusher))
353 {
354 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
355 return;
356 }
357
358 move_ob (pusher, dir, pusher);
359 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
360 return;
414} 361}
415 362
416/* returns 1 if pushing invokes a attack, 0 when not */ 363/* returns 1 if pushing invokes a attack, 0 when not */
417int 364int
418push_ob (object *who, int dir, object *pusher) 365push_ob (object *who, int dir, object *pusher)
… …
428 CLEAR_FLAG (who, FLAG_SLEEP); 375 CLEAR_FLAG (who, FLAG_SLEEP);
429 376
430 /* player change place with his pets or summoned creature */ 377 /* player change place with his pets or summoned creature */
431 /* TODO: allow multi arch pushing. Can't be very difficult */ 378 /* TODO: allow multi arch pushing. Can't be very difficult */
432 if (who->more == NULL 379 if (who->more == NULL
433#ifdef COZY_SERVER
434 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher) 380 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
435#else
436 && owner == pusher 381 || owner == pusher)
437#endif
438 ) 382 )
439 { 383 {
440 int temp; 384 int temp;
441 maptile *m; 385 maptile *m;
442 386
… …
454 pusher->map = who->map; 398 pusher->map = who->map;
455 who->map = m; 399 who->map = m;
456 400
457 insert_ob_in_map (who, who->map, pusher, 0); 401 insert_ob_in_map (who, who->map, pusher, 0);
458 insert_ob_in_map (pusher, pusher->map, pusher, 0); 402 insert_ob_in_map (pusher, pusher->map, pusher, 0);
403
459 return 0; 404 return 0;
460 } 405 }
461
462 406
463 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 407 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
464 /* In original we have here a unaggressive check only - that was the reason why */ 408 /* In original we have here a unaggressive check only - that was the reason why */
465 /* we so often become an enemy of friendly monsters... */ 409 /* we so often become an enemy of friendly monsters... */
466 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 410 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
467
468 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 411 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
469 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 412 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
470 { 413 {
471 if (pusher->contr->run_on) /* only when we run */ 414 if (pusher->contr->run_on) /* only when we run */
472 { 415 {
473 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s !!", &who->name); 416 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
474 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ 417 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
475 who->enemy = pusher; 418 who->enemy = pusher;
476 return 1; 419 return 1;
477 } 420 }
478 else 421 else
479 { 422 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s. H<You have to run if you wish to attack unnagressive NPCs.>", &who->name);
480 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
481 }
482 } 423 }
483 424
484 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 425 /* now, let's test stand still. we NEVER can push stand_still monsters. */
485 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 426 if (QUERY_FLAG (who, FLAG_STAND_STILL))
486 { 427 {
487 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s.", &who->name); 428 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name);
488 return 0; 429 return 0;
489 } 430 }
490 431
491 /* This block is basically if you are pushing friendly but 432 /* This block is basically if you are pushing friendly but
492 * non pet creaturs. 433 * non pet creaturs.
… …
496 */ 437 */
497 438
498 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 439 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
499 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 440 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
500 if (QUERY_FLAG (who, FLAG_WIZ) || 441 if (QUERY_FLAG (who, FLAG_WIZ) ||
501 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 442 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
502 random_roll (str2, str2 / 2 + str2 * 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 443 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir))
503 { 444 {
504 if (who->type == PLAYER) 445 if (who->type == PLAYER)
505 {
506 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 446 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
507 } 447
508 return 0; 448 return 0;
509 } 449 }
510 450
511 /* If we get here, the push succeeded. 451 /* If we get here, the push succeeded.
512 * Let everyone know the status. 452 * Let everyone know the status.
513 */ 453 */
514 if (who->type == PLAYER) 454 if (who->type == PLAYER)
515 {
516 new_draw_info_format (NDI_UNIQUE, 0, who, "%s pushed you.", &pusher->name); 455 new_draw_info_format (NDI_UNIQUE, 0, who, "%s pushed you.", &pusher->name);
517 } 456
518 if (pusher->type == PLAYER) 457 if (pusher->type == PLAYER)
519 {
520 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You pushed %s back.", &who->name); 458 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You pushed %s back.", &who->name);
521 }
522 459
523 return 1; 460 return 1;
524} 461}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines