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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.82 by elmex, Wed Jan 3 02:30:52 2007 UTC vs.
Revision 1.221 by root, Wed Dec 31 17:35:38 2008 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#include <algorithm> 32#include <algorithm>
34#include <functional> 33#include <functional>
35 34
36player * 35playervec players;
37find_player (const char *plname)
38{
39 for_all_players (pl)
40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
41 return pl;
42
43 return 0;
44}
45 36
46void 37void
47display_motd (const object *op) 38display_motd (const object *op)
48{ 39{
49 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
123 114
124 news[0] = '\0'; 115 news[0] = '\0';
125 subject[0] = '\0'; 116 subject[0] = '\0';
126 size = 0; 117 size = 0;
127 118
128 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
129 { 120 {
130 if (*buf == '#') 121 if (*buf == '#')
131 continue; 122 continue;
132 123
133 if (*buf == '%') 124 if (*buf == '%')
134 { /* send one news */ 125 { /* send one news */
135 if (size > 0) 126 if (size > 0)
136 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
131
137 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
138 strip_endline (subject); 133 strip_endline (subject);
139 size = 0; 134 size = 0;
140 news[0] = '\0'; 135 news[0] = '\0';
141 } 136 }
… …
150 size += strlen (buf); 145 size += strlen (buf);
151 } 146 }
152 } 147 }
153 148
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 149 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 150 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 151 close_and_delete (fp, comp);
157} 152}
158 153
159/* This loads the first map an puts the player on it. */ 154/* This loads the first map an puts the player on it. */
160static void 155static void
… …
164 op->x = -1; 159 op->x = -1;
165 op->y = -1; 160 op->y = -1;
166} 161}
167 162
168void 163void
169player::enter_map () 164player::activate ()
170{ 165{
171 object *tmp = object::create (); 166 if (active)
167 return;
172 168
173 EXIT_PATH (tmp) = maplevel; 169 players.insert (this);
174 EXIT_X (tmp) = ob->x; 170 ob->remove ();
175 EXIT_Y (tmp) = ob->y; 171 ob->map = 0;
176 ob->enter_exit (tmp); 172 ob->activate_recursive ();
173 CLEAR_FLAG (ob, FLAG_FRIENDLY);
174 add_friendly_object (ob);
175}
177 176
178 tmp->destroy (); 177void
178player::deactivate ()
179{
180 if (!active)
181 return;
182
183 terminate_all_pets (ob);
184 remove_friendly_object (ob);
185 ob->deactivate_recursive ();
186
187 if (ob->map)
188 maplevel = ob->map->path;
189
190 ob->remove ();
191 ob->enemy = 0; // sometimes keeps an extra refcount on itself
192 ob->map = 0;
193 party = 0;
194
195 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
196
197 players.erase (this);
179} 198}
180 199
181// connect the player with a specific client 200// connect the player with a specific client
182// also changed, rationalises, and fixes some incorrect settings 201// also changes, rationalises, and fixes some incorrect settings
183void 202void
184player::connect (client *ns) 203player::connect (client *ns)
185{ 204{
186 this->ns = ns; 205 this->ns = ns;
187 ns->pl = this; 206 ns->pl = this;
188 207
189 next = first_player; 208 run_on = 0;
190 first_player = this; 209 fire_on = 0;
210 ob->close_container (); //TODO: client-specific
191 211
192 ns->update_look = 0; 212 ns->update_look = 0;
193 ns->look_position = 0; 213 ns->look_position = 0;
194 214
195 clear_los (ob); 215 clear_los ();
216
217 ns->reset_stats ();
196 218
197 /* make sure he's a player -- needed because of class change. */ 219 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid 220 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race; 221 ob->race = ob->arch->race;
200 222
201 if (!legal_range (ob, shoottype)) 223 ob->update_weight ();
202 shoottype = range_none;
203
204 ob->carrying = sum_weight (ob);
205 link_player_skills (ob); 224 link_skills ();
206 225
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 226 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208 227
209 assign (title, ob->arch->clone.name); 228 assign (title, ob->arch->object::name);
210
211 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
212 * from the class, and not race. I don't see any way to get the class information
213 * to then update this. I don't think this will actually break anything - anyone
214 * that can use armour should be able to use a shield. What this may 'break'
215 * are features new characters get, eg, if someone starts up with a Q, they
216 * should be able to use a shield. However, old Q's won't get that advantage.
217 */
218 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219 SET_FLAG (ob, FLAG_USE_SHIELD);
220 229
221 /* if it's a dragon player, set the correct title here */ 230 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob)) 231 if (is_dragon_pl (ob))
223 { 232 {
224 object *tmp, *abil = 0, *skin = 0; 233 object *tmp, *abil = 0, *skin = 0;
225 234
226 shstr_cmp dragon_ability_force ("dragon_ability_force");
227 shstr_cmp dragon_skin_force ("dragon_skin_force");
228
229 for (tmp = ob->inv; tmp; tmp = tmp->below) 235 for (tmp = ob->inv; tmp; tmp = tmp->below)
230 if (tmp->type == FORCE) 236 if (tmp->type == FORCE)
231 if (tmp->arch->name == dragon_ability_force) 237 if (tmp->arch->archname == shstr_dragon_ability_force)
232 abil = tmp; 238 abil = tmp;
233 else if (tmp->arch->name == dragon_skin_force) 239 else if (tmp->arch->archname == shstr_dragon_skin_force)
234 skin = tmp; 240 skin = tmp;
235 241
236 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
237 } 243 }
238 244
239 CLEAR_FLAG (ob, FLAG_FRIENDLY);
240 add_friendly_object (ob);
241
242 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 246
246 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this);
247 248
248 ob->update_stats (); 249 ob->update_stats ();
250
249 ns->floorbox_update (); 251 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob); 252 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0); 253 esrv_add_spells (this, 0);
253 254
254 ob->activate_recursive (); 255 activate ();
255 enter_map ();
256 256
257 send_rules (ob); 257 send_rules (ob);
258 send_news (ob); 258 send_news (ob);
259 display_motd (ob); 259 display_motd (ob);
260 260
… …
264 264
265void 265void
266player::disconnect () 266player::disconnect ()
267{ 267{
268 if (ob) 268 if (ob)
269 ob->deactivate_recursive (); 269 {
270 ob->close_container (); //TODO: client-specific
271 ob->drop_unpaid_items ();
272 }
270 273
271 //TODO: don't be so harsh and destroy :)
272 if (ns) 274 if (ns)
273 { 275 {
274 if (enable_save) 276 if (active)
275 {
276 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 277 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277 save (true);
278 }
279 278
280 INVOKE_PLAYER (DISCONNECT, this); 279 INVOKE_PLAYER (DISCONNECT, this);
281 280
282 client *ns = this->ns; 281 ns->reset_stats ();
283 ns->send_packet ("goodbye");
284 ns->flush ();
285 ns->pl = 0; 282 ns->pl = 0;
286 this->ns = 0; 283 ns = 0;
287
288 ns->destroy ();
289 destroy ();
290 } 284 }
285
286 observe = ob;
287
288 deactivate ();
291} 289}
292 290
293// the need for this function can be explained 291// the need for this function can be explained
294// by load_object not returning the object 292// by load_object not returning the object
295void 293void
296player::set_object (object *op) 294player::set_object (object *op)
297{ 295{
298 ob = op; 296 ob = observe = op;
299 ob->contr = this; /* this aren't yet in archetype */ 297 ob->contr = this; /* this aren't yet in archetype */
300 298
299 ob->speed = 1.0f;
301 ob->speed_left = 0.5; 300 ob->speed_left = 0.5f;
302 ob->speed = 1.0; 301
303 ob->direction = 5; /* So player faces south */ 302 ob->direction = 5; /* So player faces south */
304 ob->stats.wc = 2;
305 ob->run_away = 25; /* Then we panick... */
306 303
307 ob->roll_stats (); 304 ob->flag [FLAG_READY_WEAPON] = false;
305 ob->flag [FLAG_READY_SKILL] = false;
306 ob->flag [FLAG_READY_BOW] = false;
307
308 for (object *op = ob->inv; op; op = op->below)
309 if (op->flag [FLAG_APPLIED])
310 switch (op->type)
311 {
312 case SKILL:
313 ob->flag [FLAG_APPLIED] = false;
314 break;
315
316 case WAND:
317 case ROD:
318 case HORN:
319 case BOW:
320 ranged_ob = op;
321 break;
322
323 case WEAPON:
324 combat_ob = op;
325 break;
326 }
327
328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329 ob->deactivate (); // change_weapon activates, fix this better
330}
331
332void
333player::set_observe (object *op)
334{
335 observe = op ? op : ob;
336 do_los = 1;
308} 337}
309 338
310player::player () 339player::player ()
311{ 340{
312 /* There are some elements we want initialised to non zero value - 341 /* There are some elements we want initialised to non zero value -
313 * we deal with that below this point. 342 * we deal with that below this point.
314 */ 343 */
315 outputs_sync = 16; /* Every 2 seconds */ 344 outputs_sync = 4;
316 outputs_count = 8; /* Keeps present behaviour */ 345 outputs_count = 4;
317 unapply = unapply_nochoice; 346 unapply = unapply_nochoice;
318 347
319 savebed_map = first_map_path; /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
320 349
321 gen_sp_armour = 10; 350 gen_sp_armour = 10;
322 last_speed = -1;
323 shoottype = range_none;
324 bowtype = bow_normal; 351 bowtype = bow_normal;
325 petmode = pet_normal; 352 petmode = pet_normal;
326 listening = 10;
327 usekeys = containers; 353 usekeys = containers;
328 last_weapon_sp = -1;
329 peaceful = 1; /* default peaceful */ 354 peaceful = 1; /* default peaceful */
330 do_los = 1; 355 do_los = 1;
331 356
332 /* we need to clear these to -1 and not zero - otherwise, 357 weapon_sp = 1.0f;
333 * if a player quits and starts a new character, we wont 358 weapon_sp_left = 0.5f;
334 * send new values to the client, as things like exp start
335 * at zero.
336 */
337 for (int i = 0; i < NUM_SKILLS; i++)
338 last_skill_exp[i] = -1;
339
340 for (int i = 0; i < NROFATTACKS; i++)
341 last_resist[i] = -1;
342
343 last_stats.exp = -1;
344 last_weight = (uint32) - 1;
345} 359}
346 360
347void 361void
348player::do_destroy () 362player::do_destroy ()
349{ 363{
350 disconnect (); 364 disconnect ();
351 365
352 save (false);
353 enable_save = false;
354
355 attachable::do_destroy (); 366 attachable::do_destroy ();
356
357 terminate_all_pets (ob);
358
359 if (first_player != this)
360 {
361 player *prev = first_player;
362
363 while (prev && prev->next && prev->next != this)
364 prev = prev->next;
365
366 if (prev->next != this)
367 {
368 LOG (llevError, "Free_player: Can't find previous player.\n");
369 abort ();
370 }
371
372 prev->next = next;
373 }
374 else
375 first_player = next;
376 367
377 if (ob) 368 if (ob)
378 { 369 {
379 ob->destroy_inv (false); 370 ob->destroy_inv (false);
380 ob->destroy (); 371 ob->destroy ();
381 } 372 }
373
374 ob = observe = 0;
382} 375}
383 376
384player::~player () 377player::~player ()
385{ 378{
386 /* Clear item stack */ 379 /* Clear item stack */
… …
395player::create () 388player::create ()
396{ 389{
397 player *pl = new player; 390 player *pl = new player;
398 391
399 pl->set_object (arch_to_object (get_player_archetype (0))); 392 pl->set_object (arch_to_object (get_player_archetype (0)));
393
394 pl->ob->roll_stats ();
395 pl->ob->stats.wc = 2;
396 pl->ob->run_away = 25; /* Then we panick... */
397
400 set_first_map (pl->ob); 398 set_first_map (pl->ob);
401 399
402 return pl; 400 return pl;
403} 401}
404 402
… …
408 * Note: there MUST be at least one player archetype! 406 * Note: there MUST be at least one player archetype!
409 */ 407 */
410archetype * 408archetype *
411get_player_archetype (archetype *at) 409get_player_archetype (archetype *at)
412{ 410{
413 archetype *start = at; 411 // archetypes could have been reloaded
412 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414 if (!nat)
415 return at;
416
417 archvec::iterator i = archetypes.find (nat);
414 418
415 for (;;) 419 for (;;)
416 { 420 {
417 if (at == NULL || at->next == NULL) 421 if (++i == archetypes.end ())
418 at = first_archetype; 422 i = archetypes.begin ();
419 else 423 else if (*i == at)
420 at = at->next; 424 cleanup ("not a single player archetype found");
421 425
422 if (at->clone.type == PLAYER) 426 if ((*i)->type == PLAYER)
423 return at; 427 return *i;
424
425 if (at == start)
426 {
427 LOG (llevError, "No Player archetypes\n");
428 exit (-1);
429 }
430 } 428 }
431} 429}
432 430
433object * 431object *
434get_nearest_player (object *mon) 432get_nearest_player (object *mon)
… …
436 object *op = NULL; 434 object *op = NULL;
437 objectlink *ol; 435 objectlink *ol;
438 unsigned lastdist; 436 unsigned lastdist;
439 rv_vector rv; 437 rv_vector rv;
440 438
441 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 439 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
442 { 440 {
443 /* We should not find free objects on this friendly list, but it
444 * does periodically happen. Given that, lets deal with it.
445 * While unlikely, it is possible the next object on the friendly
446 * list is also free, so encapsulate this in a while loop.
447 */
448 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
449 {
450 object *tmp = ol->ob;
451
452 /* Can't do much more other than log the fact, because the object
453 * itself will have been cleared.
454 */
455 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
456 ol = ol->next;
457 remove_friendly_object (tmp);
458 if (!ol)
459 return op;
460 }
461
462 /* Remove special check for player from this. First, it looks to cause
463 * some crashes (ol->ob->contr not set properly?), but secondly, a more
464 * complicated method of state checking would be needed in any case -
465 * as it was, a clever player could type quit, and the function would
466 * skip them over while waiting for confirmation. Remove
467 * on_same_map check, as can_detect_enemy also does this
468 */
469 if (!can_detect_enemy (mon, ol->ob, &rv)) 441 if (!can_detect_enemy (mon, ol->ob, &rv))
470 continue; 442 continue;
471 443
472 if (lastdist > rv.distance) 444 if (lastdist > rv.distance)
473 { 445 {
… …
549 x = mon->x; 521 x = mon->x;
550 y = mon->y; 522 y = mon->y;
551 m = mon->map; 523 m = mon->map;
552 dir = rv.direction; 524 dir = rv.direction;
553 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 525 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
554 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 526 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527
555 /* If we can't solve it within the search distance, return now. */ 528 /* If we can't solve it within the search distance, return now. */
556 if (diff > max) 529 if (diff > max)
557 return 0; 530 return 0;
531
558 while (diff > 1 && max > 0) 532 while (diff > 1 && max > 0)
559 { 533 {
560 lastx = x; 534 lastx = x;
561 lasty = y; 535 lasty = y;
562 lastmap = m; 536 lastmap = m;
… …
644 max--; 618 max--;
645 lastdir = dir; 619 lastdir = dir;
646 if (!firstdir) 620 if (!firstdir)
647 firstdir = dir; 621 firstdir = dir;
648 } 622 }
623
649 if (diff <= 1) 624 if (diff <= 1)
650 { 625 {
651 /* Recalculate diff (distance) because we may not have actually 626 /* Recalculate diff (distance) because we may not have actually
652 * headed toward player for entire distance. 627 * headed toward player for entire distance.
653 */ 628 */
654 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 629 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
655 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 630 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
656 } 631 }
632
657 if (diff > max) 633 if (diff > max)
658 return 0; 634 return 0;
659 } 635 }
636
660 /* If we reached the max, didn't find a direction in time */ 637 /* If we reached the max, didn't find a direction in time */
661 if (!max) 638 if (!max)
662 return 0; 639 return 0;
663 640
664 return firstdir; 641 return firstdir;
665} 642}
666 643
667void 644void
668give_initial_items (object *pl, treasurelist * items) 645give_initial_items (object *pl, treasurelist *items)
669{ 646{
670 object *op, *next = NULL;
671
672 if (pl->randomitems != NULL) 647 if (pl->randomitems)
673 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 648 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
674 649
675 for (op = pl->inv; op; op = next) 650 for (object *next, *op = pl->inv; op; op = next)
676 { 651 {
677 next = op->below; 652 next = op->below;
678 653
679 /* Forces get applied per default, unless they have the 654 /* Forces get applied per default, unless they have the
680 * flag "neutral" set. Sorry but I can't think of a better way 655 * flag "neutral" set. Sorry but I can't think of a better way
… …
685 /* we never give weapons/armour if these cannot be used 660 /* we never give weapons/armour if these cannot be used
686 * by this player due to race restrictions 661 * by this player due to race restrictions
687 */ 662 */
688 if (pl->type == PLAYER) 663 if (pl->type == PLAYER)
689 { 664 {
690 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 665 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
666 &&
691 (op->type == ARMOUR || op->type == BOOTS || 667 (op->type == ARMOUR || op->type == BOOTS
692 op->type == CLOAK || op->type == HELMET || 668 || op->type == CLOAK || op->type == HELMET
693 op->type == SHIELD || op->type == GLOVES || 669 || op->type == SHIELD || op->type == GLOVES
670 || op->type == BRACERS || op->type == GIRDLE))
694 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 671 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
695 { 672 {
696 op->destroy (); 673 op->destroy ();
697 continue; 674 continue;
698 } 675 }
699 } 676 }
… …
722 if (op->nrof > 1) 699 if (op->nrof > 1)
723 op->nrof = 1; 700 op->nrof = 1;
724 } 701 }
725 702
726 if (op->type == SPELLBOOK && op->inv) 703 if (op->type == SPELLBOOK && op->inv)
727 {
728 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 704 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
729 }
730 705
731 /* Give starting characters identified, uncursed, and undamned 706 /* Give starting characters identified, uncursed, and undamned
732 * items. Just don't identify gold or silver, or it won't be 707 * items. Just don't identify gold or silver, or it won't be
733 * merged properly. 708 * merged properly.
734 */ 709 */
735 if (need_identify (op)) 710 if (need_identify (op))
736 { 711 {
737 SET_FLAG (op, FLAG_IDENTIFIED); 712 SET_FLAG (op, FLAG_IDENTIFIED);
738 CLEAR_FLAG (op, FLAG_CURSED); 713 CLEAR_FLAG (op, FLAG_CURSED);
739 CLEAR_FLAG (op, FLAG_DAMNED); 714 CLEAR_FLAG (op, FLAG_DAMNED);
740 } 715 }
716
741 if (op->type == SPELL) 717 if (op->type == SPELL)
742 { 718 {
743 op->destroy (); 719 op->destroy ();
744 continue; 720 continue;
745 } 721 }
… …
747 { 723 {
748 SET_FLAG (op, FLAG_CAN_USE_SKILL); 724 SET_FLAG (op, FLAG_CAN_USE_SKILL);
749 op->stats.exp = 0; 725 op->stats.exp = 0;
750 op->level = 1; 726 op->level = 1;
751 } 727 }
752 /* lock all 'normal items by default */ 728 else /* lock all 'normal items by default */
753 else
754 SET_FLAG (op, FLAG_INV_LOCKED); 729 SET_FLAG (op, FLAG_INV_LOCKED);
755 } /* for loop of objects in player inv */ 730 } /* for loop of objects in player inv */
756 731
757 /* Need to set up the skill pointers */ 732 /* Need to set up the skill pointers */
758 link_player_skills (pl); 733 pl->contr->link_skills ();
759} 734}
760 735
761void 736void
762get_party_password (object *op, partylist *party) 737get_party_password (object *op, partylist *party)
763{ 738{
… …
778roll_stat (void) 753roll_stat (void)
779{ 754{
780 int a[4], i, j, k; 755 int a[4], i, j, k;
781 756
782 for (i = 0; i < 4; i++) 757 for (i = 0; i < 4; i++)
783 a[i] = (int) RANDOM () % 6 + 1; 758 a[i] = (int) rndm (6) + 1;
784 759
785 for (i = 0, j = 0, k = 7; i < 4; i++) 760 for (i = 0, j = 0, k = 7; i < 4; i++)
786 if (a[i] < k) 761 if (a[i] < k)
787 k = a[i], j = i; 762 k = a[i], j = i;
788 763
… …
794} 769}
795 770
796void 771void
797object::roll_stats () 772object::roll_stats ()
798{ 773{
799 int statsort [7]; 774 int statsort [NUM_STATS];
800 775
801 for (;;) 776 for (;;)
802 { 777 {
803 int sum = 0; 778 int sum = 0;
804 for (int i = 7; i--; ) 779 for (int i = NUM_STATS; i--; )
805 sum += statsort [i] = roll_stat (); 780 sum += statsort [i] = roll_stat ();
806 781
807 if (sum >= 82 && sum <= 116) 782 if (sum >= 82 && sum <= 116)
808 break; 783 break;
809 } 784 }
810 785
811 // Sort the stats so that rerolling is easier... 786 // Sort the stats so that rerolling is easier...
812 std::sort (statsort, statsort + 7, std::greater<int>()); 787 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
813 788
789 for (int i = 0; i < NUM_STATS; ++i)
814 stats.Str = statsort[0]; 790 stats.stat (i) = statsort [i];
815 stats.Dex = statsort[1];
816 stats.Con = statsort[2];
817 stats.Int = statsort[3];
818 stats.Wis = statsort[4];
819 stats.Pow = statsort[5];
820 stats.Cha = statsort[6];
821 791
822 stats.exp = 0; 792 stats.exp = 0;
823 stats.ac = 0; 793 stats.ac = 0;
824 794
825 stats.hp = stats.maxhp; 795 stats.hp = stats.maxhp;
… …
837} 807}
838 808
839void 809void
840object::swap_stats (int a, int b) 810object::swap_stats (int a, int b)
841{ 811{
842 int tmp = get_attr_value (&contr->orig_stats, a); 812 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
843 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
844 set_attr_value (&contr->orig_stats, b, tmp);
845 813
814 for (int i = 0; i < NUM_STATS; ++i)
846 stats.Str = contr->orig_stats.Str; 815 stats.stat (i) = contr->orig_stats.stat (i);
847 stats.Dex = contr->orig_stats.Dex;
848 stats.Con = contr->orig_stats.Con;
849 stats.Int = contr->orig_stats.Int;
850 stats.Wis = contr->orig_stats.Wis;
851 stats.Pow = contr->orig_stats.Pow;
852 stats.Cha = contr->orig_stats.Cha;
853 816
854 //TODO: the following code looks so borked and should, at the very least, 817 //TODO: the following code looks so borked and should, at the very least,
855 // be merged with the similar code in roll_stats 818 // be merged with the similar code in roll_stats
856 stats.ac = 0; 819 stats.ac = 0;
857 820
… …
876static void 839static void
877start_info (object *op) 840start_info (object *op)
878{ 841{
879 char buf[MAX_BUF]; 842 char buf[MAX_BUF];
880 843
881 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 844 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
882 new_draw_info (NDI_UNIQUE, 0, op, buf); 845 new_draw_info (NDI_UNIQUE, 0, op, buf);
883 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
884 //new_draw_info (NDI_UNIQUE, 0, op, " ");
885} 846}
886 847
887/* This function takes the key that is passed, and does the 848/* This function takes the key that is passed, and does the
888 * appropriate action with it (change race, or other things). 849 * appropriate action with it (change race, or other things).
889 * The function name is for historical reasons - now we have 850 * The function name is for historical reasons - now we have
890 * separate race and class; this actually changes the RACE, 851 * separate race and class; this actually changes the RACE,
891 * not the class. 852 * not the class.
892 */ 853 */
893int 854void
894key_change_class (object *op, char key) 855player::chargen_race_done ()
895{ 856{
896 int tmp_loop;
897
898 if (key == 'd' || key == 'D')
899 {
900 char buf[MAX_BUF];
901
902 /* this must before then initial items are given */ 857 /* this must before then initial items are given */
903 esrv_new_player (op->contr, op->weight + op->carrying); 858 esrv_new_player (ob->contr);
904 859
905 treasurelist *tl = find_treasurelist ("starting_wealth"); 860 treasurelist *tl = treasurelist::find ("starting_wealth");
906 if (tl) 861 if (tl)
907 create_treasure (tl, op, 0, 0, 0); 862 create_treasure (tl, ob, 0, 0, 0);
908 863
909 INVOKE_PLAYER (BIRTH, op->contr); 864 INVOKE_PLAYER (BIRTH, ob->contr);
910 INVOKE_PLAYER (LOGIN, op->contr); 865 INVOKE_PLAYER (LOGIN, ob->contr);
911 866
912 op->contr->ns->state = ST_PLAYING; 867 ob->contr->ns->state = ST_PLAYING;
913 868
914 if (op->msg) 869 if (ob->msg)
915 op->msg = NULL; 870 ob->msg = 0;
916 871
917 /* We create this now because some of the unique maps will need it
918 * to save here.
919 */
920 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
921 make_path_to_file (buf);
922
923#ifdef AUTOSAVE
924 op->contr->last_save_tick = pticks;
925#endif
926 start_info (op); 872 start_info (ob);
927 CLEAR_FLAG (op, FLAG_WIZ); 873 CLEAR_FLAG (ob, FLAG_WIZ);
928 give_initial_items (op, op->randomitems); 874 give_initial_items (ob, ob->randomitems);
929 link_player_skills (op);
930 esrv_send_inventory (op, op); 875 esrv_send_inventory (ob, ob);
931 op->update_stats (); 876 ob->update_stats ();
932 877
933 /* This moves the player to a different start map, if there 878 /* This moves the player to a different start map, if there
934 * is one for this race 879 * is one for this race
935 */ 880 */
936 if (*first_map_ext_path) 881 if (*first_map_ext_path)
937 { 882 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
938 object *tmp;
939 char mapname[MAX_BUF];
940
941 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
942 tmp = object::create ();
943 EXIT_PATH (tmp) = mapname;
944 EXIT_X (tmp) = op->x;
945 EXIT_Y (tmp) = op->y;
946 op->enter_exit (tmp); /* we don't really care if it succeeded;
947 * if the map isn't there, then stay on the
948 * default initial map */
949 tmp->destroy ();
950 }
951 else 883 else
952 LOG (llevDebug, "first_map_ext_path not set\n"); 884 LOG (llevDebug, "first_map_ext_path not set\n");
885}
953 886
954 return 0; 887void
955 } 888player::chargen_race_next ()
956 889{
957 /* Following actually changes the race - this is the default command 890 /* Following actually changes the race - this is the default command
958 * if we don't match with one of the options above. 891 * if we don't match with one of the options above.
959 */ 892 */
960 893
961 tmp_loop = 0; 894 do
962 while (!tmp_loop)
963 { 895 {
964 shstr name = op->name; 896 shstr name = ob->name;
965 int x = op->x, y = op->y; 897 int x = ob->x, y = ob->y;
966 898
967 op->remove_statbonus (); 899 ob->remove_statbonus ();
968 op->remove (); 900 ob->remove ();
969 op->arch = get_player_archetype (op->arch); 901 ob->arch = get_player_archetype (ob->arch);
970 op->arch->clone.copy_to (op); 902 ob->arch->copy_to (ob);
971 op->instantiate (); 903 ob->instantiate ();
972 op->stats = op->contr->orig_stats; 904 ob->stats = ob->contr->orig_stats;
973 op->name = op->name_pl = name; 905 ob->name = ob->name_pl = name;
974 op->x = x; 906 ob->x = x;
975 op->y = y; 907 ob->y = y;
976 SET_ANIMATION (op, 2); /* So player faces south */ 908 SET_ANIMATION (ob, 2); /* So player faces south */
977 insert_ob_in_map (op, op->map, op, 0); 909 insert_ob_in_map (ob, ob->map, ob, 0);
978 assign (op->contr->title, op->arch->clone.name); 910 assign (ob->contr->title, ob->arch->object::name);
979 op->add_statbonus (); 911 ob->add_statbonus ();
980 tmp_loop = allowed_class (op);
981 } 912 }
913 while (!allowed_class (ob));
982 914
983 update_object (op, UP_OBJ_FACE); 915 update_object (ob, UP_OBJ_FACE);
984 esrv_update_item (UPD_FACE, op, op); 916 esrv_update_item (UPD_FACE, ob, ob);
985 op->update_stats (); 917 ob->update_stats ();
986 op->stats.hp = op->stats.maxhp; 918 ob->stats.hp = ob->stats.maxhp;
987 op->stats.sp = op->stats.maxsp; 919 ob->stats.sp = ob->stats.maxsp;
988 op->stats.grace = 0; 920 ob->stats.grace = 0;
989
990 if (op->msg)
991 new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994 return 0;
995}
996
997int
998key_confirm_quit (object *op, char key)
999{
1000 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001 {
1002 op->contr->ns->state = ST_PLAYING;
1003 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004 return 1;
1005 }
1006
1007 INVOKE_PLAYER (LOGOUT, op->contr);
1008 INVOKE_PLAYER (QUIT, op->contr);
1009
1010 op->contr->enable_save = false;
1011
1012 terminate_all_pets (op);
1013 op->remove ();
1014 op->direction = 0;
1015 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1016
1017 strcpy (op->contr->killer, "quit");
1018 check_score (op);
1019 op->contr->party = 0;
1020 op->contr->own_title[0] = '\0';
1021 op->contr->destroy ();
1022
1023 return 1;
1024} 921}
1025 922
1026void 923void
1027flee_player (object *op) 924flee_player (object *op)
1028{ 925{
… …
1034 LOG (llevDebug, "Fleeing player is dead.\n"); 931 LOG (llevDebug, "Fleeing player is dead.\n");
1035 CLEAR_FLAG (op, FLAG_SCARED); 932 CLEAR_FLAG (op, FLAG_SCARED);
1036 return; 933 return;
1037 } 934 }
1038 935
1039 if (op->enemy == NULL) 936 if (!op->enemy)
1040 { 937 {
1041 LOG (llevDebug, "Fleeing player had no enemy.\n"); 938 LOG (llevDebug, "Fleeing player had no enemy.\n");
1042 CLEAR_FLAG (op, FLAG_SCARED); 939 CLEAR_FLAG (op, FLAG_SCARED);
1043 return; 940 return;
1044 } 941 }
1045 942
1046 /* Seen some crashes here. Since we don't store an
1047 * op->enemy_count, it is possible that something destroys the
1048 * actual enemy, and the object is recycled.
1049 */
1050 if (op->enemy->map == NULL)
1051 {
1052 CLEAR_FLAG (op, FLAG_SCARED);
1053 op->enemy = NULL;
1054 return;
1055 }
1056
1057 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 943 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1058 { 944 {
1059 op->enemy = NULL; 945 op->enemy = NULL;
1060 CLEAR_FLAG (op, FLAG_SCARED); 946 CLEAR_FLAG (op, FLAG_SCARED);
1061 return; 947 return;
… …
1064 get_rangevector (op, op->enemy, &rv, 0); 950 get_rangevector (op, op->enemy, &rv, 0);
1065 951
1066 dir = absdir (4 + rv.direction); 952 dir = absdir (4 + rv.direction);
1067 for (diff = 0; diff < 3; diff++) 953 for (diff = 0; diff < 3; diff++)
1068 { 954 {
1069 int m = 1 - (RANDOM () & 2); 955 int m = 1 - rndm (2) * 2;
1070 956
1071 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 957 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1072 return; 958 return;
1073 } 959 }
1074 960
1075 /* Cornered, get rid of scared */ 961 /* Cornered, get rid of scared */
1076 CLEAR_FLAG (op, FLAG_SCARED); 962 CLEAR_FLAG (op, FLAG_SCARED);
1077 op->enemy = NULL; 963 op->enemy = NULL;
1078} 964}
1079 965
1080
1081/* check_pick sees if there is stuff to be picked up/picks up stuff. 966/* check_pick sees if there is stuff to be picked up/picks up stuff.
1082 * IT returns 1 if the player should keep on moving, 0 if he should 967 * It returns 1 if the player should keep on moving, 0 if he should
1083 * stop. 968 * stop.
1084 */ 969 */
1085int 970int
1086check_pick (object *op) 971check_pick (object *op)
1087{ 972{
1088 object *tmp, *next; 973 object *tmp, *next;
1089 int stop = 0; 974 int stop = 0;
1090 int j, k, wvratio; 975 int wvratio;
1091 char putstring[128], tmpstr[16];
1092 976
1093 /* if you're flying, you cna't pick up anything */ 977 /* if you're flying, you cna't pick up anything */
1094 if (op->move_type & MOVE_FLYING) 978 if (op->move_type & MOVE_FLYING)
1095 return 1; 979 return 1;
1096 980
1097 next = op->below; 981 next = op->below;
1098 982
983 int cnt = MAX_ITEM_PER_DROP;
984#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
985
1099 /* loop while there are items on the floor that are not marked as 986 /* loop while there are items on the floor that are not marked as
1100 * destroyed */ 987 * destroyed */
1101 while (next && !next->destroyed ()) 988 while (next && !next->destroyed ())
1102 { 989 {
1103 tmp = next; 990 tmp = next;
1104 next = tmp->below; 991 next = tmp->below;
1105 992
993 if (cnt <= 0)
994 {
995 op->failmsg ("Couldn't pickup all items at once.");
996 return 0;
997 }
998
1106 if (op->destroyed ()) 999 if (op->destroyed ())
1107 return 0; 1000 return 0;
1108 1001
1109 if (!can_pick (op, tmp)) 1002 if (!can_pick (op, tmp))
1110 continue; 1003 continue;
1111 1004
1112 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1005 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1113 { 1006 {
1114 if (item_matched_string (op, tmp, op->contr->search_str)) 1007 if (item_matched_string (op, tmp, op->contr->search_str))
1115 pick_up (op, tmp); 1008 CHK_PICK_PICKUP;
1009
1116 continue; 1010 continue;
1117 } 1011 }
1118 1012
1119 /* high not bit set? We're using the old autopickup model */ 1013 /* pickup handling */
1014 if (op->contr->mode & PU_DEBUG)
1015 {
1016 /* some debugging code to figure out item information */
1017 const char *str = tmp->name
1018 ? format ("item name: %s item type: %d weight/value: %d",
1019 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
1020 : format ("item name: %s item type: %d weight/value: %d",
1021 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1022
1023 new_draw_info (NDI_UNIQUE, 0, op, str);
1024 }
1025
1026 if (op->contr->mode & PU_INHIBIT)
1027 return 1;
1028
1029 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
1030 return 1;
1031
1032 /* philosophy:
1033 * It's easy to grab an item type from a pile, as long as it's
1034 * generic. This takes no game-time. For more detailed pickups
1035 * and selections, select-items should be used. This is a
1036 * grab-as-you-run type mode that's really useful for arrows for
1037 * example.
1038 * The drawback: right now it has no frontend, so you need to
1039 * stick the bits you want into a calculator in hex mode and then
1040 * convert to decimal and then 'pickup <#>
1041 */
1042
1043 /* the first two modes are exclusive: if NOTHING we return, if
1044 * STOP then we stop. All the rest are applied sequentially,
1045 * meaning if any test passes, the item gets picked up. */
1046
1047 /* if mode is set to pick nothing up, return */
1048 if (op->contr->mode == PU_NOTHING)
1049 return 1;
1050
1051 /* if mode is set to stop when encountering objects, return */
1052 /* take STOP before INHIBIT since it doesn't actually pick
1053 * anything up */
1054 if (op->contr->mode & PU_STOP)
1055 return 0;
1056
1057 /* useful for going into stores and not losing your settings... */
1058 /* and for battles wher you don't want to get loaded down while
1059 * fighting */
1060 if (op->contr->mode & PU_INHIBIT)
1061 return 1;
1062
1063 /* prevent us from turning into auto-thieves :) */
1064 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1065 continue;
1066
1067 /* ignore known cursed objects */
1068 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1069 continue;
1070
1071 /* all food and drink if desired */
1072 /* question: don't pick up known-poisonous stuff? */
1120 if (!(op->contr->mode & PU_NEWMODE)) 1073 if (op->contr->mode & PU_FOOD)
1074 if (tmp->type == FOOD)
1121 { 1075 {
1122 switch (op->contr->mode) 1076 CHK_PICK_PICKUP;
1077 continue;
1078 }
1079
1080 if (op->contr->mode & PU_DRINK)
1081 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1082 {
1083 CHK_PICK_PICKUP;
1084 continue;
1085 }
1086
1087 if (op->contr->mode & PU_POTION)
1088 if (tmp->type == POTION)
1089 {
1090 CHK_PICK_PICKUP;
1091 continue;
1092 }
1093
1094 /* spellbooks, skillscrolls and normal books/scrolls */
1095 if (op->contr->mode & PU_SPELLBOOK)
1096 if (tmp->type == SPELLBOOK)
1097 {
1098 CHK_PICK_PICKUP;
1099 continue;
1100 }
1101
1102 if (op->contr->mode & PU_SKILLSCROLL)
1103 if (tmp->type == SKILLSCROLL)
1104 {
1105 CHK_PICK_PICKUP;
1106 continue;
1107 }
1108
1109 if (op->contr->mode & PU_READABLES)
1110 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1111 {
1112 CHK_PICK_PICKUP;
1113 continue;
1114 }
1115
1116 /* wands/staves/rods/horns */
1117 if (op->contr->mode & PU_MAGIC_DEVICE)
1118 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1119 {
1120 CHK_PICK_PICKUP;
1121 continue;
1122 }
1123
1124 /* pick up all magical items */
1125 if (op->contr->mode & PU_MAGICAL)
1126 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1127 {
1128 CHK_PICK_PICKUP;
1129 continue;
1130 }
1131
1132 if (op->contr->mode & PU_VALUABLES)
1133 {
1134 if (tmp->type == MONEY || tmp->type == GEM)
1123 { 1135 {
1124 case 0: 1136 CHK_PICK_PICKUP;
1125 return 1; /* don't pick up */ 1137 continue;
1126 case 1:
1127 pick_up (op, tmp);
1128 return 1;
1129 case 2:
1130 pick_up (op, tmp);
1131 return 0;
1132 case 3:
1133 return 0; /* stop before pickup */
1134 case 4:
1135 pick_up (op, tmp);
1136 break;
1137 case 5:
1138 pick_up (op, tmp);
1139 stop = 1;
1140 break;
1141 case 6:
1142 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1143 pick_up (op, tmp);
1144 break;
1145
1146 case 7:
1147 if (tmp->type == MONEY || tmp->type == GEM)
1148 pick_up (op, tmp);
1149 break;
1150
1151 default:
1152 /* use value density */
1153 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1154 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1155 pick_up (op, tmp);
1156 } 1138 }
1157 } 1139 }
1158 else 1140
1159 { /* old model */ 1141 /* rings & amulets - talismans seems to be typed AMULET */
1160 /* NEW pickup handling */ 1142 if (op->contr->mode & PU_JEWELS)
1143 if (tmp->type == RING || tmp->type == AMULET)
1144 {
1145 CHK_PICK_PICKUP;
1146 continue;
1147 }
1148
1149 /* we don't forget dragon food */
1150 if (op->contr->mode & PU_FLESH)
1151 if (tmp->type == FLESH)
1152 {
1153 CHK_PICK_PICKUP;
1154 continue;
1155 }
1156
1157 /* bows and arrows. Bows are good for selling! */
1161 if (op->contr->mode & PU_DEBUG) 1158 if (op->contr->mode & PU_BOW)
1159 if (tmp->type == BOW)
1160 {
1161 CHK_PICK_PICKUP;
1162 continue;
1163 }
1164
1165 if (op->contr->mode & PU_ARROW)
1166 if (tmp->type == ARROW)
1167 {
1168 CHK_PICK_PICKUP;
1169 continue;
1170 }
1171
1172 /* all kinds of armor etc. */
1173 if (op->contr->mode & PU_ARMOUR)
1174 if (tmp->type == ARMOUR)
1175 {
1176 CHK_PICK_PICKUP;
1177 continue;
1178 }
1179
1180 if (op->contr->mode & PU_HELMET)
1181 if (tmp->type == HELMET)
1182 {
1183 CHK_PICK_PICKUP;
1184 continue;
1185 }
1186
1187 if (op->contr->mode & PU_SHIELD)
1188 if (tmp->type == SHIELD)
1189 {
1190 CHK_PICK_PICKUP;
1191 continue;
1192 }
1193
1194 if (op->contr->mode & PU_BOOTS)
1195 if (tmp->type == BOOTS)
1196 {
1197 CHK_PICK_PICKUP;
1198 continue;
1199 }
1200
1201 if (op->contr->mode & PU_GLOVES)
1202 if (tmp->type == GLOVES)
1203 {
1204 CHK_PICK_PICKUP;
1205 continue;
1206 }
1207
1208 if (op->contr->mode & PU_CLOAK)
1209 if (tmp->type == CLOAK)
1210 {
1211 CHK_PICK_PICKUP;
1212 continue;
1213 }
1214
1215 /* hoping to catch throwing daggers here */
1216 if (op->contr->mode & PU_MISSILEWEAPON)
1217 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1218 {
1219 CHK_PICK_PICKUP;
1220 continue;
1221 }
1222
1223 /* careful: chairs and tables are weapons! */
1224 if (op->contr->mode & PU_ALLWEAPON)
1225 {
1226 if (tmp->type == WEAPON && tmp->name != NULL)
1162 { 1227 {
1163 /* some debugging code to figure out item information */ 1228 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1164 if (tmp->name != NULL) 1229 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1165 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1166 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1167 else
1168 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1169 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1170
1171 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1172 }
1173
1174 /* philosophy:
1175 * It's easy to grab an item type from a pile, as long as it's
1176 * generic. This takes no game-time. For more detailed pickups
1177 * and selections, select-items should be used. This is a
1178 * grab-as-you-run type mode that's really useful for arrows for
1179 * example.
1180 * The drawback: right now it has no frontend, so you need to
1181 * stick the bits you want into a calculator in hex mode and then
1182 * convert to decimal and then 'pickup <#>
1183 */
1184
1185 /* the first two modes are exclusive: if NOTHING we return, if
1186 * STOP then we stop. All the rest are applied sequentially,
1187 * meaning if any test passes, the item gets picked up. */
1188
1189 /* if mode is set to pick nothing up, return */
1190
1191 if (op->contr->mode & PU_NOTHING)
1192 return 1;
1193
1194 /* if mode is set to stop when encountering objects, return */
1195 /* take STOP before INHIBIT since it doesn't actually pick
1196 * anything up */
1197
1198 if (op->contr->mode & PU_STOP)
1199 return 0;
1200
1201 /* useful for going into stores and not losing your settings... */
1202 /* and for battles wher you don't want to get loaded down while
1203 * fighting */
1204 if (op->contr->mode & PU_INHIBIT)
1205 return 1;
1206
1207 /* prevent us from turning into auto-thieves :) */
1208 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1209 continue;
1210
1211 /* ignore known cursed objects */
1212 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1213 continue;
1214
1215 /* all food and drink if desired */
1216 /* question: don't pick up known-poisonous stuff? */
1217 if (op->contr->mode & PU_FOOD)
1218 if (tmp->type == FOOD)
1219 {
1220 pick_up (op, tmp);
1221 continue;
1222 }
1223
1224 if (op->contr->mode & PU_DRINK)
1225 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1226 {
1227 pick_up (op, tmp);
1228 continue;
1229 }
1230
1231 if (op->contr->mode & PU_POTION)
1232 if (tmp->type == POTION)
1233 {
1234 pick_up (op, tmp);
1235 continue;
1236 }
1237
1238 /* spellbooks, skillscrolls and normal books/scrolls */
1239 if (op->contr->mode & PU_SPELLBOOK)
1240 if (tmp->type == SPELLBOOK)
1241 {
1242 pick_up (op, tmp);
1243 continue;
1244 }
1245
1246 if (op->contr->mode & PU_SKILLSCROLL)
1247 if (tmp->type == SKILLSCROLL)
1248 {
1249 pick_up (op, tmp);
1250 continue;
1251 }
1252
1253 if (op->contr->mode & PU_READABLES)
1254 if (tmp->type == BOOK || tmp->type == SCROLL)
1255 {
1256 pick_up (op, tmp);
1257 continue;
1258 }
1259
1260 /* wands/staves/rods/horns */
1261 if (op->contr->mode & PU_MAGIC_DEVICE)
1262 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1263 {
1264 pick_up (op, tmp);
1265 continue;
1266 }
1267
1268 /* pick up all magical items */
1269 if (op->contr->mode & PU_MAGICAL)
1270 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1271 {
1272 pick_up (op, tmp);
1273 continue;
1274 }
1275
1276 if (op->contr->mode & PU_VALUABLES)
1277 {
1278 if (tmp->type == MONEY || tmp->type == GEM)
1279 { 1230 {
1280 pick_up (op, tmp); 1231 CHK_PICK_PICKUP;
1281 continue; 1232 continue;
1282 } 1233 }
1283 } 1234 }
1284 1235
1285 /* rings & amulets - talismans seems to be typed AMULET */
1286 if (op->contr->mode & PU_JEWELS)
1287 if (tmp->type == RING || tmp->type == AMULET) 1236 if (tmp->type == WEAPON && tmp->name == NULL)
1288 {
1289 pick_up (op, tmp);
1290 continue;
1291 }
1292
1293 /* we don't forget dragon food */
1294 if (op->contr->mode & PU_FLESH)
1295 if (tmp->type == FLESH)
1296 {
1297 pick_up (op, tmp);
1298 continue;
1299 }
1300
1301 /* bows and arrows. Bows are good for selling! */
1302 if (op->contr->mode & PU_BOW)
1303 if (tmp->type == BOW)
1304 {
1305 pick_up (op, tmp);
1306 continue;
1307 }
1308
1309 if (op->contr->mode & PU_ARROW)
1310 if (tmp->type == ARROW)
1311 {
1312 pick_up (op, tmp);
1313 continue;
1314 }
1315
1316 /* all kinds of armor etc. */
1317 if (op->contr->mode & PU_ARMOUR)
1318 if (tmp->type == ARMOUR)
1319 {
1320 pick_up (op, tmp);
1321 continue;
1322 }
1323
1324 if (op->contr->mode & PU_HELMET)
1325 if (tmp->type == HELMET)
1326 {
1327 pick_up (op, tmp);
1328 continue;
1329 }
1330
1331 if (op->contr->mode & PU_SHIELD)
1332 if (tmp->type == SHIELD)
1333 {
1334 pick_up (op, tmp);
1335 continue;
1336 }
1337
1338 if (op->contr->mode & PU_BOOTS)
1339 if (tmp->type == BOOTS)
1340 {
1341 pick_up (op, tmp);
1342 continue;
1343 }
1344
1345 if (op->contr->mode & PU_GLOVES)
1346 if (tmp->type == GLOVES)
1347 {
1348 pick_up (op, tmp);
1349 continue;
1350 }
1351
1352 if (op->contr->mode & PU_CLOAK)
1353 if (tmp->type == CLOAK)
1354 {
1355 pick_up (op, tmp);
1356 continue;
1357 }
1358
1359 /* hoping to catch throwing daggers here */
1360 if (op->contr->mode & PU_MISSILEWEAPON)
1361 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1362 {
1363 pick_up (op, tmp);
1364 continue;
1365 }
1366
1367 /* careful: chairs and tables are weapons! */
1368 if (op->contr->mode & PU_ALLWEAPON)
1369 { 1237 {
1370 if (tmp->type == WEAPON && tmp->name != NULL) 1238 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1371 { 1239 {
1372 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1240 CHK_PICK_PICKUP;
1373 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1374 {
1375 pick_up (op, tmp);
1376 continue; 1241 continue;
1377 }
1378 }
1379
1380 if (tmp->type == WEAPON && tmp->name == NULL)
1381 {
1382 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1383 {
1384 pick_up (op, tmp);
1385 continue;
1386 }
1387 } 1242 }
1388 } 1243 }
1244 }
1389 1245
1390 /* misc stuff that's useful */ 1246 /* misc stuff that's useful */
1391 if (op->contr->mode & PU_KEY) 1247 if (op->contr->mode & PU_KEY)
1392 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1248 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1393 { 1249 {
1394 pick_up (op, tmp); 1250 CHK_PICK_PICKUP;
1395 continue; 1251 continue;
1396 } 1252 }
1397 1253
1398 /* any of the last 4 bits set means we use the ratio for value 1254 /* any of the last 4 bits set means we use the ratio for value
1399 * pickups */ 1255 * pickups */
1400 if (op->contr->mode & PU_RATIO) 1256 if (op->contr->mode & PU_RATIO)
1257 {
1258 /* use value density to decide what else to grab */
1259 /* >=7 was >= op->contr->mode */
1260 /* >=7 is the old standard setting. Now we take the last 4 bits
1261 */
1262 wvratio = op->contr->mode & PU_RATIO;
1263 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1401 { 1264 {
1402 /* use value density to decide what else to grab */ 1265#if 0
1403 /* >=7 was >= op->contr->mode */ 1266 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1404 /* >=7 is the old standard setting. Now we take the last 4 bits 1267 if (tmp->name != NULL)
1405 * and multiply them by 5, giving 0..15*5== 5..75 */
1406 wvratio = (op->contr->mode & PU_RATIO) * 5;
1407 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1408 { 1268 {
1409 pick_up (op, tmp);
1410#if 0
1411 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1412 if (tmp->name != NULL)
1413 {
1414 fprintf (stderr, "%s", tmp->name); 1269 fprintf (stderr, "%s", tmp->name);
1415 } 1270 }
1416 else 1271 else
1417 fprintf (stderr, "%s", tmp->arch->name); 1272 fprintf (stderr, "%s", tmp->arch->archname);
1418 fprintf (stderr, ",%d] = ", tmp->type); 1273 fprintf (stderr, ",%d] = ", tmp->type);
1419 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1274 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1420#endif 1275#endif
1276 CHK_PICK_PICKUP;
1421 continue; 1277 continue;
1422 }
1423 } 1278 }
1424 } /* the new pickup model */ 1279 } /* the new pickup model */
1425 } 1280 }
1426 1281
1427 return !stop; 1282 return !stop;
… …
1433 * found object is returned. 1288 * found object is returned.
1434 */ 1289 */
1435object * 1290object *
1436find_arrow (object *op, const char *type) 1291find_arrow (object *op, const char *type)
1437{ 1292{
1438 object *tmp = NULL;
1439
1440 for (op = op->inv; op; op = op->below) 1293 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1441 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1442 tmp = find_arrow (op, type);
1443 else if (op->type == ARROW && op->race == type) 1294 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1295 return splay (tmp);
1296
1297 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1298 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1299 if (object *arrow = find_arrow (tmp, type))
1300 {
1301 splay (tmp);
1444 return op; 1302 return arrow;
1303 }
1304
1445 return tmp; 1305 return 0;
1446} 1306}
1447 1307
1448/* 1308/*
1449 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1309 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1450 * against the target. A full test is not performed, simply a basic test 1310 * against the target. A full test is not performed, simply a basic test
1451 * of resistances. The archer is making a quick guess at what he sees down 1311 * of resistances. The archer is making a quick guess at what he sees down
1452 * the hall. Failing that it does it's best to pick the highest plus arrow. 1312 * the hall. Failing that it does it's best to pick the highest plus arrow.
1453 */ 1313 */
1454
1455object * 1314object *
1456find_better_arrow (object *op, object *target, const char *type, int *better) 1315find_better_arrow (object *op, object *target, const char *type, int *better)
1457{ 1316{
1458 object *tmp = NULL, *arrow, *ntmp; 1317 object *tmp = NULL, *arrow, *ntmp;
1459 int attacknum, attacktype, betterby = 0, i; 1318 int attacknum, attacktype, betterby = 0, i;
… …
1474 } 1333 }
1475 } 1334 }
1476 else if (arrow->type == ARROW && arrow->race == type) 1335 else if (arrow->type == ARROW && arrow->race == type)
1477 { 1336 {
1478 /* allways prefer assasination/slaying */ 1337 /* allways prefer assasination/slaying */
1479 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1338 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1480 { 1339 {
1481 if (arrow->attacktype & AT_DEATH) 1340 if (arrow->attacktype & AT_DEATH)
1482 { 1341 {
1483 *better = 100; 1342 *better = 100;
1484 return arrow; 1343 return arrow;
… …
1492 else 1351 else
1493 { 1352 {
1494 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1353 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1495 { 1354 {
1496 attacktype = 1 << attacknum; 1355 attacktype = 1 << attacknum;
1497 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1356 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1498 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1357 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1499 { 1358 {
1500 tmp = arrow; 1359 tmp = arrow;
1501 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1360 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1502 } 1361 }
1503 } 1362 }
1504 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1363 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1505 { 1364 {
1506 tmp = arrow; 1365 tmp = arrow;
… …
1512 betterby = 1 + arrow->magic + arrow->stats.dam; 1371 betterby = 1 + arrow->magic + arrow->stats.dam;
1513 } 1372 }
1514 } 1373 }
1515 } 1374 }
1516 } 1375 }
1376
1517 if (tmp == NULL && arrow == NULL) 1377 if (tmp == NULL && arrow == NULL)
1518 return find_arrow (op, type); 1378 return find_arrow (op, type);
1519 1379
1520 *better = betterby; 1380 *better = betterby;
1521 return tmp; 1381 return tmp;
… …
1525 * find_better_arrow to find a decent arrow to use. 1385 * find_better_arrow to find a decent arrow to use.
1526 * op = the shooter 1386 * op = the shooter
1527 * type = bow->race 1387 * type = bow->race
1528 * dir = fire direction 1388 * dir = fire direction
1529 */ 1389 */
1530
1531object * 1390object *
1532pick_arrow_target (object *op, const char *type, int dir) 1391pick_arrow_target (object *op, const char *type, int dir)
1533{ 1392{
1534 object *tmp = NULL; 1393 object *tmp = NULL;
1535 maptile *m; 1394 maptile *m;
… …
1552 for (i = 0, found = 0; i < 20; i++) 1411 for (i = 0, found = 0; i < 20; i++)
1553 { 1412 {
1554 x += freearr_x[dir]; 1413 x += freearr_x[dir];
1555 y += freearr_y[dir]; 1414 y += freearr_y[dir];
1556 mflags = get_map_flags (m, &m, x, y, &x, &y); 1415 mflags = get_map_flags (m, &m, x, y, &x, &y);
1416
1557 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1417 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1558 { 1418 {
1559 tmp = NULL; 1419 tmp = 0;
1560 break; 1420 break;
1561 } 1421 }
1562 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1422 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1563 { 1423 {
1564 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1424 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1565 * perhaps a bad assumption. 1425 * perhaps a bad assumption.
1566 */ 1426 */
1567 tmp = NULL; 1427 tmp = 0;
1568 break; 1428 break;
1569 } 1429 }
1430
1570 if (mflags & P_IS_ALIVE) 1431 if (mflags & P_IS_ALIVE)
1571 {
1572 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1432 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1573 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1433 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1574 {
1575 found++;
1576 break;
1577 }
1578 if (found)
1579 break; 1434 break;
1580 }
1581 } 1435 }
1582 if (tmp == NULL) 1436
1437 if (!tmp)
1583 return find_arrow (op, type); 1438 return find_arrow (op, type);
1584 1439
1585 if (tmp->head) 1440 if (tmp->head)
1586 tmp = tmp->head; 1441 tmp = tmp->head;
1587 1442
… …
1600 */ 1455 */
1601int 1456int
1602fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1457fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1603{ 1458{
1604 object *left, *bow; 1459 object *left, *bow;
1605 int bowspeed, mflags; 1460 int mflags;
1606 maptile *m; 1461 maptile *m;
1607 1462
1608 if (!dir) 1463 if (!dir)
1609 { 1464 {
1610 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1465 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1611 return 0; 1466 return 0;
1612 } 1467 }
1613 1468
1614 if (op->type == PLAYER) 1469 if (op->contr)
1615 bow = op->contr->ranges[range_bow]; 1470 bow = op->current_weapon;
1616 else 1471 else
1617 { 1472 {
1618 for (bow = op->inv; bow; bow = bow->below) 1473 for (bow = op->inv; bow; bow = bow->below)
1619 /* Don't check for applied - monsters don't apply bows - in that way, they 1474 /* Don't check for applied - monsters don't apply bows - in that way, they
1620 * don't need to switch back and forth between bows and weapons. 1475 * don't need to switch back and forth between bows and weapons.
… …
1625 if (!bow) 1480 if (!bow)
1626 { 1481 {
1627 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1482 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1628 return 0; 1483 return 0;
1629 } 1484 }
1485
1486 // optimisation: move object to top so we will find it quickly again
1487 if (bow->below)
1488 {
1489 bow->remove ();
1490 op->insert (bow);
1491 }
1630 } 1492 }
1631 1493
1632 if (!bow->race || !bow->skill) 1494 if (!bow->race || !bow->skill)
1633 { 1495 {
1634 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1496 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1635 return 0; 1497 return 0;
1636 } 1498 }
1637
1638 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1639
1640 /* penalize ROF for bestarrow */
1641 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1642 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1643
1644 if (bowspeed < 1)
1645 bowspeed = 1;
1646 1499
1647 if (arrow == NULL) 1500 if (arrow == NULL)
1648 { 1501 {
1649 if ((arrow = find_arrow (op, bow->race)) == NULL) 1502 if ((arrow = find_arrow (op, bow->race)) == NULL)
1650 { 1503 {
1651 if (op->type == PLAYER) 1504 if (op->type == PLAYER)
1652 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1505 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1653 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1506 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1654 else 1507 else
1655 CLEAR_FLAG (op, FLAG_READY_BOW); 1508 CLEAR_FLAG (op, FLAG_READY_BOW);
1509
1656 return 0; 1510 return 0;
1657 } 1511 }
1658 } 1512 }
1659 1513
1660 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1514 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1668 } 1522 }
1669 1523
1670 /* this should not happen, but sometimes does */ 1524 /* this should not happen, but sometimes does */
1671 if (arrow->nrof == 0) 1525 if (arrow->nrof == 0)
1672 { 1526 {
1527 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1673 arrow->destroy (); 1528 arrow->destroy ();
1674 return 0; 1529 return 0;
1675 } 1530 }
1676 1531
1677 left = arrow; /* these are arrows left to the player */ 1532 left = arrow; /* these are arrows left to the player */
1678 arrow = get_split_ob (arrow, 1); 1533 arrow = arrow->split ();
1679 if (!arrow) 1534 if (!arrow)
1680 { 1535 {
1681 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1536 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1682 return 0; 1537 return 0;
1683 } 1538 }
1684 1539
1685 arrow->set_owner (op); 1540 arrow->set_owner (op);
1686 arrow->skill = bow->skill; 1541 arrow->skill = bow->skill;
1687 arrow->direction = dir; 1542 arrow->direction = dir;
1688 1543
1544 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1545 arrow->stats.hp = arrow->stats.dam;
1546 arrow->stats.grace = arrow->attacktype;
1547
1548 if (arrow->slaying)
1549 arrow->spellarg = strdup (arrow->slaying);
1550
1551#if 0
1552 if (player *pl = op->contr)
1553 {
1554 float speed = pl->weapon_sp;
1555
1556 /* penalize ROF for bestarrow */
1557 if (pl->bowtype == bow_bestarrow)
1558 speed *= .9f;
1559 else
1560 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1561
1562 op->speed_left += speed - op->speed;
1563 }
1564#endif
1565
1566 SET_ANIMATION (arrow, arrow->direction);
1567
1568 /* update the speed */
1569 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1570 + bow->stats.dam / 7.f;
1571
1572 arrow->set_speed (max (arrow->speed, 2.f));
1573 arrow->speed_left = 0;
1574
1575 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1576
1689 if (op->type == PLAYER) 1577 if (op->type == PLAYER)
1690 { 1578 {
1691 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1692 op->update_stats ();
1693 }
1694
1695 SET_ANIMATION (arrow, arrow->direction);
1696 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1697 arrow->stats.hp = arrow->stats.dam;
1698 arrow->stats.grace = arrow->attacktype;
1699 if (arrow->slaying != NULL)
1700 arrow->spellarg = strdup (arrow->slaying);
1701
1702 /* Note that this was different for monsters - they got their level
1703 * added to the damage. I think the strength bonus is more proper.
1704 */
1705
1706 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1707
1708 /* update the speed */
1709 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1710 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1711
1712 arrow->set_speed (max (arrow->speed, 1.0));
1713 arrow->speed_left = 0;
1714
1715 if (op->type == PLAYER)
1716 {
1717 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1719 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1579 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1580 wc -= dex_bonus[op->stats.Dex];
1581
1582 if (!arrow->slaying)
1583 arrow->slaying = op->slaying;
1584
1585 arrow->attacktype |= op->attacktype;
1722 } 1586 }
1723 else 1587 else
1724 { 1588 {
1725 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726 arrow->level = op->level; 1589 arrow->level = op->level;
1727 } 1590 arrow->stats.wc -= bow->magic;
1728 1591
1729 if (arrow->attacktype == AT_PHYSICAL) 1592 if (!arrow->slaying)
1593 arrow->slaying = bow->slaying;
1594
1730 arrow->attacktype |= bow->attacktype; 1595 arrow->attacktype |= bow->attacktype;
1596 }
1731 1597
1732 if (bow->slaying) 1598 wc -= arrow->level;
1733 arrow->slaying = bow->slaying; 1599 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1734 1600
1601 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1735 arrow->move_type = MOVE_FLY_LOW; 1602 arrow->move_type = MOVE_FLY_LOW;
1736 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1603 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1737 1604
1738 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1605 op->play_sound (sound_find ("fire_arrow"));
1739 m->insert (arrow, sx, sy, op); 1606 m->insert (arrow, sx, sy, op);
1740 1607
1741 if (!arrow->destroyed ()) 1608 if (!arrow->destroyed ())
1742 move_arrow (arrow); 1609 move_arrow (arrow);
1743
1744 if (op->type == PLAYER)
1745 {
1746 if (left->destroyed ())
1747 esrv_del_item (op->contr, left->count);
1748 else
1749 esrv_send_item (op, left);
1750 }
1751 1610
1752 return 1; 1611 return 1;
1753} 1612}
1754 1613
1755/* Special fire code for players - this takes into 1614/* Special fire code for players - this takes into
… …
1760 * hence the function name. 1619 * hence the function name.
1761 */ 1620 */
1762int 1621int
1763player_fire_bow (object *op, int dir) 1622player_fire_bow (object *op, int dir)
1764{ 1623{
1765 int ret = 0, wcmod = 0; 1624 int ret;
1766 1625
1767 if (op->contr->bowtype == bow_bestarrow) 1626 if (op->contr->bowtype == bow_bestarrow)
1768 { 1627 {
1769 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1628 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1770 } 1629 }
1771 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1630 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1772 { 1631 {
1773 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1632 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1774 wcmod = -1;
1775
1776 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1633 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1777 } 1634 }
1778 else if (op->contr->bowtype == bow_threewide) 1635 else if (op->contr->bowtype == bow_threewide)
1779 { 1636 {
1780 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1637 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1781 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1638 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1782 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1639 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1783 } 1640 }
1784 else if (op->contr->bowtype == bow_spreadshot) 1641 else if (op->contr->bowtype == bow_spreadshot)
1785 { 1642 {
1786 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1643 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1787 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1644 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1788 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1645 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1789
1790 } 1646 }
1791 else 1647 else
1792 { 1648 {
1793 /* Simple case */ 1649 /* Simple case */
1794 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1650 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1795 } 1651 }
1652
1796 return ret; 1653 return ret;
1797} 1654}
1798
1799 1655
1800/* Fires a misc (wand/rod/horn) object in 'dir'. 1656/* Fires a misc (wand/rod/horn) object in 'dir'.
1801 * Broken apart from 'fire' to keep it more readable. 1657 * Broken apart from 'fire' to keep it more readable.
1802 */ 1658 */
1803void 1659void
1804fire_misc_object (object *op, int dir) 1660fire_misc_object (object *op, int dir)
1805{ 1661{
1806 object *item; 1662 object *item = op->contr->ranged_ob;
1807 1663
1808 if (!op->contr->ranges[range_misc]) 1664 if (!item)
1809 { 1665 {
1810 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1666 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1811 return; 1667 return;
1812 } 1668 }
1813 1669
1814 item = op->contr->ranges[range_misc];
1815 if (!item->inv) 1670 if (!item->inv)
1816 { 1671 {
1817 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1672 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1818 return; 1673 return;
1819 } 1674 }
1675
1676 if (!op->change_weapon (item))
1677 return;
1678
1820 if (item->type == WAND) 1679 if (item->type == WAND)
1821 { 1680 {
1822 if (item->stats.food <= 0) 1681 if (item->stats.food <= 0)
1823 { 1682 {
1824 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1683 op->contr->play_sound (sound_find ("wand_poof"));
1825 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1684 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1685
1826 return; 1686 return;
1827 } 1687 }
1828 } 1688 }
1829 else if (item->type == ROD || item->type == HORN) 1689 else if (item->type == ROD || item->type == HORN)
1830 { 1690 {
1831 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1691 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1692
1693 // using the maximum of the rods charge allows at least one spell cast
1694 // for a rod or horn, this fixes some broken rods.
1695 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1832 { 1696 {
1833 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1697 op->contr->play_sound (sound_find ("wand_poof"));
1698
1834 if (item->type == ROD) 1699 if (item->type == ROD)
1835 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1700 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1836 else 1701 else
1837 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1702 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1703
1838 return; 1704 return;
1839 } 1705 }
1840 } 1706 }
1841 1707
1842 if (cast_spell (op, item, dir, item->inv, NULL)) 1708 if (cast_spell (op, item, dir, item->inv, NULL))
1843 { 1709 {
1844 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1710 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1711
1845 if (item->type == WAND) 1712 if (item->type == WAND)
1846 { 1713 {
1847 if (!(--item->stats.food)) 1714 if (!(--item->stats.food))
1848 { 1715 {
1849 object *tmp; 1716 object *tmp;
1850 1717
1851 if (item->arch) 1718 if (item->arch)
1852 { 1719 {
1853 CLEAR_FLAG (item, FLAG_ANIMATE); 1720 CLEAR_FLAG (item, FLAG_ANIMATE);
1854 item->face = item->arch->clone.face; 1721 item->face = item->arch->face;
1855 item->set_speed (0); 1722 item->set_speed (0);
1856 } 1723 }
1857 1724
1858 if ((tmp = item->in_player ())) 1725 if (object *pl = item->visible_to ())
1859 esrv_update_item (UPD_ANIM, tmp, item); 1726 esrv_update_item (UPD_ANIM, pl, item);
1860 } 1727 }
1861 } 1728 }
1862 else if (item->type == ROD || item->type == HORN) 1729 else if (item->type == ROD || item->type == HORN)
1863 drain_rod_charge (item); 1730 drain_rod_charge (item);
1864 } 1731 }
1865} 1732}
1866 1733
1867/* Received a fire command for the player - go and do it. 1734/* Received a fire command for the player - go and do it.
1868 */ 1735 */
1869void 1736bool
1870fire (object *op, int dir) 1737fire (object *op, int dir)
1871{ 1738{
1872 int spellcost = 0; 1739 int spellcost = 0;
1740
1741 player *pl = op->contr;
1742
1743 if (pl->golem)
1744 {
1745 control_golem (op->contr->golem, dir);
1746 return false;
1747 }
1748
1749 object *ob = pl->ranged_ob;
1750
1751 if (!ob)
1752 return false;
1753
1754 if (op->speed_left > 0.f)
1755 --op->speed_left;
1756 else
1757 return false;
1758
1759 if (!op->change_weapon (ob))
1760 return false;
1873 1761
1874 /* check for loss of invisiblity/hide */ 1762 /* check for loss of invisiblity/hide */
1875 if (action_makes_visible (op)) 1763 if (action_makes_visible (op))
1876 make_visible (op); 1764 make_visible (op);
1877 1765
1878 switch (op->contr->shoottype) 1766 switch (ob->type)
1879 { 1767 {
1880 case range_none: 1768 case BOW:
1881 return;
1882
1883 case range_bow:
1884 player_fire_bow (op, dir); 1769 player_fire_bow (op, dir);
1885 return; 1770 break;
1886 1771
1887 case range_magic: /* Casting spells */ 1772 case SPELL:
1888 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1773 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1889 return; 1774 break;
1890 1775
1891 case range_misc: 1776 case BUILDER:
1777 apply_map_builder (op, dir);
1778 break;
1779
1780 case SKILL:
1781 do_skill (op, op, ob, dir, 0);
1782 break;
1783
1784 default:
1892 fire_misc_object (op, dir); 1785 fire_misc_object (op, dir);
1893 return; 1786 break;
1894
1895 case range_golem: /* Control summoned monsters from scrolls */
1896 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1897 {
1898 op->contr->ranges[range_golem] = 0;
1899 op->contr->shoottype = range_none;
1900 }
1901 else
1902 control_golem (op->contr->ranges[range_golem], dir);
1903 return;
1904
1905 case range_skill:
1906 if (!op->chosen_skill)
1907 {
1908 if (op->type == PLAYER)
1909 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1910 return;
1911 }
1912 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1913 return;
1914 case range_builder:
1915 apply_map_builder (op, dir);
1916 return;
1917 default:
1918 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1919 return;
1920 } 1787 }
1921}
1922 1788
1923 1789 return true;
1790}
1924 1791
1925/* find_key 1792/* find_key
1926 * We try to find a key for the door as passed. If we find a key 1793 * We try to find a key for the door as passed. If we find a key
1927 * and successfully use it, we return the key, otherwise NULL 1794 * and successfully use it, we return the key, otherwise NULL
1928 * This function merges both normal and locked door, since the logic 1795 * This function merges both normal and locked door, since the logic
… …
1930 * pl is the player, 1797 * pl is the player,
1931 * inv is the objects inventory to searched 1798 * inv is the objects inventory to searched
1932 * door is the door we are trying to match against. 1799 * door is the door we are trying to match against.
1933 * This function can be called recursively to search containers. 1800 * This function can be called recursively to search containers.
1934 */ 1801 */
1935
1936object * 1802object *
1937find_key (object *pl, object *container, object *door) 1803find_key (object *pl, object *container, object *door)
1938{ 1804{
1939 object *tmp, *key; 1805 object *tmp, *key;
1940 1806
1941 /* Should not happen, but sanity checking is never bad */ 1807 /* Should not happen, but sanity checking is never bad */
1942 if (container->inv == NULL) 1808 if (!container->inv)
1943 return NULL; 1809 return 0;
1944 1810
1945 /* First, lets try to find a key in the top level inventory */ 1811 /* First, lets try to find a key in the top level inventory */
1946 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1812 for (tmp = container->inv; tmp; tmp = tmp->below)
1947 { 1813 {
1948 if (door->type == DOOR && tmp->type == KEY) 1814 if (door->type == DOOR && tmp->type == KEY)
1949 break; 1815 break;
1950 /* For sanity, we should really check door type, but other stuff 1816 /* For sanity, we should really check door type, but other stuff
1951 * (like containers) can be locked with special keys 1817 * (like containers) can be locked with special keys
1952 */ 1818 */
1953 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1819 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1954 break; 1820 break;
1955 } 1821 }
1822
1956 /* No key found - lets search inventories now */ 1823 /* No key found - lets search inventories now */
1957 /* If we find and use a key in an inventory, return at that time. 1824 /* If we find and use a key in an inventory, return at that time.
1958 * otherwise, if we search all the inventories and still don't find 1825 * otherwise, if we search all the inventories and still don't find
1959 * a key, return 1826 * a key, return
1960 */ 1827 */
1961 if (!tmp) 1828 if (!tmp)
1962 { 1829 {
1963 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1830 for (tmp = container->inv; tmp; tmp = tmp->below)
1964 { 1831 {
1965 /* No reason to search empty containers */ 1832 /* No reason to search empty containers */
1966 if (tmp->type == CONTAINER && tmp->inv) 1833 if (tmp->type == CONTAINER && tmp->inv)
1967 { 1834 {
1968 if ((key = find_key (pl, tmp, door)) != NULL) 1835 if ((key = find_key (pl, tmp, door)))
1969 return key; 1836 return key;
1970 } 1837 }
1971 } 1838 }
1839
1972 if (!tmp) 1840 if (!tmp)
1973 return NULL; 1841 return NULL;
1974 } 1842 }
1843
1975 /* We get down here if we have found a key. Now if its in a container, 1844 /* We get down here if we have found a key. Now if its in a container,
1976 * see if we actually want to use it 1845 * see if we actually want to use it
1977 */ 1846 */
1978 if (pl != container) 1847 if (pl != container)
1979 { 1848 {
… …
2000 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1869 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2001 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1870 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2002 return NULL; 1871 return NULL;
2003 } 1872 }
2004 } 1873 }
1874
2005 return tmp; 1875 return tmp;
2006} 1876}
2007 1877
2008/* moved door processing out of move_player_attack. 1878/* moved door processing out of move_player_attack.
2009 * returns 1 if player has opened the door with a key 1879 * returns 1 if player has opened the door with a key
… …
2011 * 0 otherwise 1881 * 0 otherwise
2012 */ 1882 */
2013static int 1883static int
2014player_attack_door (object *op, object *door) 1884player_attack_door (object *op, object *door)
2015{ 1885{
2016 /* If its a door, try to find a use a key. If we do destroy the door, 1886 /* If its a door, try to find a key. If we do destroy the door,
2017 * might as well return immediately as there is nothing more to do - 1887 * might as well return immediately as there is nothing more to do -
2018 * otherwise, we fall through to the rest of the code. 1888 * otherwise, we fall through to the rest of the code.
2019 */ 1889 */
2020 object *key = find_key (op, op, door); 1890 object *key = find_key (op, op, door);
2021 1891
2022 /* IF we found a key, do some extra work */ 1892 /* If we found a key, do some extra work */
2023 if (key) 1893 if (key)
2024 { 1894 {
2025 object *container = key->env; 1895 object *container = key->env;
2026 1896
2027 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2028 if (action_makes_visible (op)) 1897 if (action_makes_visible (op))
2029 make_visible (op); 1898 make_visible (op);
1899
2030 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1900 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2031 spring_trap (door->inv, op); 1901 spring_trap (door->inv, op);
1902
2032 if (door->type == DOOR) 1903 if (door->type == DOOR)
2033 {
2034 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1904 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2035 }
2036 else if (door->type == LOCKED_DOOR) 1905 else if (door->type == LOCKED_DOOR)
2037 { 1906 {
2038 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1907 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2039 remove_door2 (door); /* remove door without violence ;-) */ 1908 remove_door2 (door); /* remove door without violence ;-) */
2040 } 1909 }
1910
2041 /* Do this after we print the message */ 1911 /* Do this after we print the message */
2042 decrease_ob (key); /* Use up one of the keys */ 1912 key->decrease (); /* Use up one of the keys */
2043 /* Need to update the weight the container the key was in */ 1913
2044 if (container != op)
2045 esrv_update_item (UPD_WEIGHT, op, container);
2046 return 1; /* Nothing more to do below */ 1914 return 1; /* Nothing more to do below */
2047 } 1915 }
2048 else if (door->type == LOCKED_DOOR) 1916 else if (door->type == LOCKED_DOOR)
2049 { 1917 {
2050 /* Might as well return now - no other way to open this */ 1918 /* Might as well return now - no other way to open this */
2051 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1919 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2052 return 1; 1920 return 1;
2053 } 1921 }
1922
2054 return 0; 1923 return 0;
2055} 1924}
2056 1925
2057/* This function is just part of a breakup from move_player. 1926/* This function is just part of a breakup from move_player.
2058 * It should keep the code cleaner. 1927 * It should keep the code cleaner.
2059 * When this is called, the players direction has been updated 1928 * When this is called, the players direction has been updated
2060 * (taking into account confusion.) The player is also actually 1929 * (taking into account confusion.) The player is also actually
2061 * going to try and move (not fire weapons). 1930 * going to try and move (not fire weapons).
2062 */ 1931 */
2063void 1932bool
2064move_player_attack (object *op, int dir) 1933move_player_attack (object *op, int dir)
2065{ 1934{
2066 object *tmp, *mon;
2067 sint16 nx, ny;
2068 int on_battleground; 1935 int on_battleground;
2069 maptile *m;
2070 1936
2071 nx = freearr_x[dir] + op->x; 1937 sint16 nx = freearr_x[dir] + op->x;
2072 ny = freearr_y[dir] + op->y; 1938 sint16 ny = freearr_y[dir] + op->y;
2073 1939
2074 on_battleground = op_on_battleground (op, 0, 0); 1940 on_battleground = op_on_battleground (op, 0, 0);
1941
1942 if (out_of_map (op->map, nx, ny))
1943 return false;
1944
1945 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1946 {
1947 --op->speed_left;
1948 return true;
1949 }
2075 1950
2076 /* If braced, or can't move to the square, and it is not out of the 1951 /* If braced, or can't move to the square, and it is not out of the
2077 * map, attack it. Note order of if statement is important - don't 1952 * map, attack it. Note order of if statement is important - don't
2078 * want to be calling move_ob if braced, because move_ob will move the 1953 * want to be calling move_ob if braced, because move_ob will move the
2079 * player. This is a pretty nasty hack, because if we could 1954 * player. This is a pretty nasty hack, because if we could
2080 * move to some space, it then means that if we are braced, we should 1955 * move to some space, it then means that if we are braced, we should
2081 * do nothing at all. As it is, if we are braced, we go through 1956 * do nothing at all. As it is, if we are braced, we go through
2082 * quite a bit of processing. However, it probably is less than what 1957 * quite a bit of processing. However, it probably is less than what
2083 * move_ob uses. 1958 * move_ob uses.
2084 */ 1959 */
2085 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 1960 maptile *m = op->map->xy_find (nx, ny);
1961
1962 /* Go through all the objects, and find ones of interest. Only stop if
1963 * we find a monster - that is something we know we want to attack.
1964 * if its a door or barrel (can roll) see if there may be monsters
1965 * on the space
1966 */
1967 object *mon;
1968 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
1969 {
1970 if ((mon->flag [FLAG_ALIVE]
1971 || mon->type == LOCKED_DOOR
1972 || mon->flag [FLAG_CAN_ROLL])
1973 && mon != op)
1974 break;
2086 { 1975 }
2087 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 1976
1977 if (!mon) /* This happens anytime the player tries to move */
1978 return false; /* into a wall */
1979
1980 mon = mon->head_ ();
1981
1982 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1983 if (op->contr->weapon_sp_left > 0.f)
1984 if (player_attack_door (op, mon))
1985 {
1986 --op->contr->weapon_sp_left;
1987 return true;
2088 { 1988 }
2089 m = get_map_from_coord (op->map, &nx, &ny); 1989
2090 if (!m) 1990 /* The following deals with possibly attacking peaceful
2091 return; /* Don't think this should happen */ 1991 * or friendly creatures. Basically, all players are considered
1992 * unaggressive. If the moving player has peaceful set, then the
1993 * object should be pushed instead of attacked. It is assumed that
1994 * if you are braced, you will not attack friends accidently,
1995 * and thus will not push them.
1996 */
1997
1998 /* If the creature is a pet, push it even if the player is not
1999 * peaceful. Our assumption is the creature is a pet if the
2000 * player owns it and it is either friendly or unagressive.
2001 */
2002 if (op->type == PLAYER
2003 && ((mon->owner && mon->owner->contr
2004 && same_party (mon->owner->contr->party, op->contr->party))
2005 || mon->owner == op)
2006 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2007 {
2008 /* If we're braced, we don't want to switch places with it */
2009 if (op->contr->braced)
2010 return false;
2011
2012 if (op->speed_left > 0.f)
2013 {
2014 --op->speed_left;
2015
2016 op->play_sound (sound_find ("push_player"));
2017 push_ob (mon, dir, op);
2018
2019 if (action_makes_visible (op))
2020 make_visible (op);
2021
2022 return true;
2092 } 2023 }
2093 else 2024 else
2094 m = op->map;
2095
2096 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2097 {
2098 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2099 return; 2025 return false;
2100 } 2026 }
2101 2027
2102 mon = 0;
2103 /* Go through all the objects, and find ones of interest. Only stop if
2104 * we find a monster - that is something we know we want to attack.
2105 * if its a door or barrel (can roll) see if there may be monsters
2106 * on the space
2107 */
2108 while (tmp)
2109 {
2110 if (tmp == op)
2111 {
2112 tmp = tmp->above;
2113 continue;
2114 }
2115
2116 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2117 {
2118 mon = tmp;
2119 break;
2120 }
2121
2122 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2123 mon = tmp;
2124
2125 tmp = tmp->above;
2126 }
2127
2128 if (!mon) /* This happens anytime the player tries to move */
2129 return; /* into a wall */
2130
2131 if (mon->head)
2132 mon = mon->head;
2133
2134 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2135 if (player_attack_door (op, mon))
2136 return;
2137
2138 /* The following deals with possibly attacking peaceful
2139 * or frienddly creatures. Basically, all players are considered
2140 * unaggressive. If the moving player has peaceful set, then the
2141 * object should be pushed instead of attacked. It is assumed that
2142 * if you are braced, you will not attack friends accidently,
2143 * and thus will not push them.
2144 */
2145
2146 /* If the creature is a pet, push it even if the player is not
2147 * peaceful. Our assumption is the creature is a pet if the
2148 * player owns it and it is either friendly or unagressive.
2149 */
2150 if ((op->type == PLAYER)
2151#if COZY_SERVER
2152 &&
2153 ((mon->owner && mon->owner->contr
2154 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2155#else
2156 && mon->owner == op
2157#endif
2158 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2159 {
2160 /* If we're braced, we don't want to switch places with it */
2161 if (op->contr->braced)
2162 return;
2163 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2164 (void) push_ob (mon, dir, op);
2165 if (op->contr->tmp_invis || op->hide)
2166 make_visible (op);
2167 return;
2168 }
2169
2170 /* in certain circumstances, you shouldn't attack friendly 2028 /* in certain circumstances, you shouldn't attack friendly
2171 * creatures. Note that if you are braced, you can't push 2029 * creatures. Note that if you are braced, you can't push
2172 * someone, but put it inside this loop so that you won't 2030 * someone, but put it inside this loop so that you won't
2173 * attack them either. 2031 * attack them either.
2174 */ 2032 */
2175 if ((mon->type == PLAYER || mon->enemy != op) && 2033 if ((mon->type == PLAYER || mon->enemy != op)
2176 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2034 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2177#ifdef PROHIBIT_PLAYERKILL
2178 (op->contr->peaceful 2035 && ((op->contr->peaceful
2179 || (mon->type == PLAYER 2036 || (mon->type == PLAYER && mon->contr->peaceful))
2180 && mon->contr->
2181 peaceful)) &&
2182#else
2183 op->contr->peaceful &&
2184#endif
2185 !on_battleground)) 2037 && !on_battleground))
2038 {
2039 if (op->speed_left > 0.f)
2186 { 2040 {
2041 --op->speed_left;
2042
2187 if (!op->contr->braced) 2043 if (!op->contr->braced)
2188 { 2044 {
2189 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2045 op->play_sound (sound_find ("push_player"));
2190 (void) push_ob (mon, dir, op); 2046 push_ob (mon, dir, op);
2191 } 2047 }
2192 else 2048 else
2193 new_draw_info (0, 0, op, "You withhold your attack"); 2049 op->statusmsg ("You withhold your attack");
2194 2050
2195 if (op->contr->tmp_invis || op->hide) 2051 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2196 make_visible (op); 2052 make_visible (op);
2197 }
2198 2053
2054 return true;
2055 }
2056 }
2199 /* If the object is a boulder or other rollable object, then 2057 /* If the object is a boulder or other rollable object, then
2200 * roll it if not braced. You can't roll it if you are braced. 2058 * roll it if not braced. You can't roll it if you are braced.
2201 */ 2059 */
2202 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2060 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2061 {
2062 if (op->speed_left > 0.f)
2203 { 2063 {
2064 --op->speed_left;
2065
2204 recursive_roll (mon, dir, op); 2066 recursive_roll (mon, dir, op);
2205 if (action_makes_visible (op)) 2067 if (action_makes_visible (op))
2206 make_visible (op); 2068 make_visible (op);
2207 }
2208 2069
2070 return true;
2071 }
2072 }
2209 /* Any generic living creature. Including things like doors. 2073 /* Any generic living creature. Including things like doors.
2210 * Way it works is like this: First, it must have some hit points 2074 * Way it works is like this: First, it must have some hit points
2211 * and be living. Then, it must be one of the following: 2075 * and be living. Then, it must be one of the following:
2212 * 1) Not a player, 2) A player, but of a different party. Note 2076 * 1) Not a player, 2) A player, but of a different party. Note
2213 * that party_number -1 is no party, so attacks can still happen. 2077 * that party_number -1 is no party, so attacks can still happen.
2214 */ 2078 */
2215
2216 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2079 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2217 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2080 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2218 { 2081 {
2219 2082 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2220 /* If the player hasn't hit something this tick, and does
2221 * so, give them speed boost based on weapon speed. Doing
2222 * it here is better than process_players2, which basically
2223 * incurred a 1 tick offset.
2224 */
2225 if (!op->contr->has_hit)
2226 { 2083 {
2227 op->speed_left += op->speed / op->contr->weapon_sp; 2084 --op->contr->weapon_sp_left;
2228
2229 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2230 }
2231 2085
2232 skill_attack (mon, op, 0, 0, 0); 2086 skill_attack (mon, op, 0, 0, 0);
2233
2234 /* If attacking another player, that player gets automatic
2235 * hitback, and doesn't loose luck either.
2236 * Disable hitback on the battleground or if the target is
2237 * the wiz.
2238 */
2239 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2240 {
2241 short luck = mon->stats.luck;
2242
2243 mon->contr->has_hit = 1;
2244 skill_attack (op, mon, 0, 0, 0);
2245 mon->stats.luck = luck;
2246 }
2247 2087
2248 if (action_makes_visible (op)) 2088 if (action_makes_visible (op))
2249 make_visible (op); 2089 make_visible (op);
2250 }
2251 } /* if player should attack something */
2252}
2253 2090
2254int 2091 return true;
2092 }
2093 }
2094
2095 return false;
2096}
2097
2098bool
2255move_player (object *op, int dir) 2099move_player (object *op, int dir)
2256{ 2100{
2257 int pick; 2101 int pick;
2258 2102
2259 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2103 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2260 return 0; 2104 return 0;
2261 2105
2262 /* Sanity check: make sure dir is valid */ 2106 /* Sanity check: make sure dir is valid */
2263 if ((dir < 0) || (dir >= 9)) 2107 if ((dir < 0) || (dir >= 9))
2264 { 2108 {
2265 LOG (llevError, "move_player: invalid direction %d\n", dir); 2109 LOG (llevError, "move_player: invalid direction %d\n", dir);
2266 return 0; 2110 return 0;
2267 } 2111 }
2268 2112
2269 /* peterm: added following line */ 2113 /* peterm: added following line */
2270 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2114 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2271 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2115 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2272 2116
2273 op->facing = dir; 2117 op->facing = dir;
2274 2118
2275 if (op->hide) 2119 if (op->flag [FLAG_HIDDEN])
2276 do_hidden_move (op); 2120 do_hidden_move (op);
2277 2121
2122 bool retval;
2123
2278 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2124 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2279 /*nop */ ; 2125 retval = RESULT_INT (0);
2280 else if (op->contr->fire_on) 2126 else if (op->contr->fire_on)
2281 fire (op, dir); 2127 retval = fire (op, dir);
2282 else 2128 else
2283 { 2129 {
2284 move_player_attack (op, dir); 2130 retval = move_player_attack (op, dir);
2285 pick = check_pick (op); 2131 pick = check_pick (op);
2286 } 2132 }
2287 2133
2288 /* Add special check for newcs players and fire on - this way, the 2134 /* Add special check for newcs players and fire on - this way, the
2289 * server can handle repeat firing. 2135 * server can handle repeat firing.
… …
2296 /* Update how the player looks. Use the facing, so direction may 2142 /* Update how the player looks. Use the facing, so direction may
2297 * get reset to zero. This allows for full animation capabilities 2143 * get reset to zero. This allows for full animation capabilities
2298 * for players. 2144 * for players.
2299 */ 2145 */
2300 animate_object (op, op->facing); 2146 animate_object (op, op->facing);
2301 return 0; 2147
2148 return retval;
2302} 2149}
2303 2150
2304/* This is similar to handle_player, below, but is only used by the 2151/* This is similar to handle_player, below, but is only used by the
2305 * new client/server stuff. 2152 * new client/server stuff.
2306 * This is sort of special, in that the new client/server actually uses 2153 * This is sort of special, in that the new client/server actually uses
2307 * the new speed values for commands. 2154 * the new speed values for commands.
2308 * 2155 *
2309 * Returns true if there are more actions we can do. 2156 * Returns true if there are more actions we can do. Should not do
2157 * many actions in a row, as that would be too unfair to other
2158 * players.
2310 */ 2159 */
2311int 2160bool
2312handle_newcs_player (object *op) 2161handle_newcs_player (object *op)
2313{ 2162{
2314 if (op->contr->hidden)
2315 {
2316 op->invisible = 1000;
2317 /* the socket code flashes the player visible/invisible
2318 * depending on the value of invisible, so we need to
2319 * alternate it here for it to work correctly.
2320 */
2321 if (pticks & 2)
2322 op->invisible--;
2323 }
2324 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2325 {
2326 op->invisible--;
2327 if (!op->invisible)
2328 {
2329 make_visible (op);
2330 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2331 }
2332 }
2333
2334 if (QUERY_FLAG (op, FLAG_SCARED)) 2163 if (QUERY_FLAG (op, FLAG_SCARED))
2335 { 2164 {
2336 flee_player (op); 2165 if (op->speed_left > 0.f)
2337 /* If player is still scared, that is his action for this tick */
2338 if (QUERY_FLAG (op, FLAG_SCARED))
2339 { 2166 {
2340 op->speed_left--; 2167 --op->speed_left;
2168 flee_player (op);
2169
2341 return 0; 2170 return true;
2342 } 2171 }
2172 else
2173 return false;
2343 } 2174 }
2344
2345 /* I've been seeing crashes where the golem has been destroyed, but
2346 * the player object still points to the defunct golem. The code that
2347 * destroys the golem looks correct, and it doesn't always happen, so
2348 * put this in a a workaround to clean up the golem pointer.
2349 */
2350 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2351 op->contr->ranges[range_golem] = 0;
2352 2175
2353 /* call this here - we also will call this in do_ericserver, but 2176 /* call this here - we also will call this in do_ericserver, but
2354 * the players time has been increased when doericserver has been 2177 * the players time has been increased when doericserver has been
2355 * called, so we recheck it here. 2178 * called, so we recheck it here.
2356 */ 2179 */
2357 op->contr->ns->handle_command (); 2180 if (op->contr->ns->handle_command ())
2358
2359 if (op->speed_left < 0)
2360 return 0; 2181 return true;
2361 2182
2362 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2183 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2363 {
2364 /* All move commands take 1 tick, at least for now */
2365 op->speed_left--;
2366
2367 /* Instead of all the stuff below, let move_player take care
2368 * of it. Also, some of the skill stuff is only put in
2369 * there, as well as the confusion stuff.
2370 */
2371 move_player (op, op->direction); 2184 return move_player (op, op->direction);
2372 if (op->speed_left > 0)
2373 return 1;
2374 else
2375 return 0;
2376 }
2377 2185
2378 return 0; 2186 return false;
2379} 2187}
2380 2188
2381int 2189int
2382save_life (object *op) 2190save_life (object *op)
2383{ 2191{
… …
2385 return 0; 2193 return 0;
2386 2194
2387 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2195 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2388 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2196 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2389 { 2197 {
2390 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2198 op->play_sound (sound_find ("ob_evaporate"));
2391 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2199 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2392
2393 if (op->contr)
2394 esrv_del_item (op->contr, tmp->count);
2395 2200
2396 tmp->destroy (); 2201 tmp->destroy ();
2397 CLEAR_FLAG (op, FLAG_LIFESAVE); 2202 CLEAR_FLAG (op, FLAG_LIFESAVE);
2398 2203
2399 if (op->stats.hp < 0) 2204 if (op->stats.hp < 0)
… …
2412 return 0; 2217 return 0;
2413} 2218}
2414 2219
2415/* This goes throws the inventory and removes unpaid objects, and puts them 2220/* This goes throws the inventory and removes unpaid objects, and puts them
2416 * back in the map (location and map determined by values of env). This 2221 * back in the map (location and map determined by values of env). This
2417 * function will descend into containers. op is the object to start the search 2222 * function will descend into containers. op is the object to start the search
2418 * from. 2223 * from.
2419 */ 2224 */
2225static void
2226drop_unpaid_items (object *op, object *env)
2227{
2228 while (op)
2229 {
2230 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2231
2232 if (QUERY_FLAG (op, FLAG_UNPAID))
2233 op->insert_at (env);
2234 else if (op->inv)
2235 drop_unpaid_items (op->inv, env);
2236
2237 op = next;
2238 }
2239}
2240
2420void 2241void
2421remove_unpaid_objects (object *op, object *env) 2242object::drop_unpaid_items ()
2422{ 2243{
2423 object *next; 2244 if (!flag [FLAG_REMOVED])
2424 2245 ::drop_unpaid_items (inv, this);
2425 while (op)
2426 {
2427 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2428
2429 if (QUERY_FLAG (op, FLAG_UNPAID))
2430 {
2431 if (env->type == PLAYER)
2432 esrv_del_item (env->contr, op->count);
2433
2434 op->insert_at (env);
2435 }
2436 else if (op->inv)
2437 remove_unpaid_objects (op->inv, env);
2438
2439 op = next;
2440 }
2441} 2246}
2442 2247
2443/* 2248/*
2444 * Returns pointer a static string containing gravestone text 2249 * Returns pointer a static string containing gravestone text
2445 * Moved from apply.c to player.c - player.c is what 2250 * Moved from apply.c to player.c - player.c is what
2446 * actually uses this function. player.c may not be quite the 2251 * actually uses this function. player.c may not be quite the
2447 * best, a misc file for object actions is probably better, 2252 * best, a misc file for object actions is probably better,
2448 * but there isn't one in the server directory. 2253 * but there isn't one in the server directory.
2449 */ 2254 */
2450char * 2255const char *
2451gravestone_text (object *op) 2256gravestone_text (object *op)
2452{ 2257{
2453 static char buf2[MAX_BUF]; 2258 static dynbuf_text buf;
2454 char buf[MAX_BUF];
2455 time_t now = time (NULL);
2456 2259
2457 strcpy (buf2, " R.I.P.\n\n"); 2260 buf << "---- R.I.P. ----\n\n"
2261 << op->name;
2262
2458 if (op->type == PLAYER) 2263 if (op->type == PLAYER)
2459 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2264 buf << " the " << op->contr->title;
2460 else
2461 sprintf (buf, "%s\n", &op->name);
2462 2265
2463 strncat (buf2, " ", 20 - strlen (buf) / 2); 2266 buf << "\n\n";
2464 strcat (buf2, buf); 2267
2268 buf << "who was level ";
2269 buf << (sint32)op->level << "\n\n" // OO breakdown
2270 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2271
2465 if (op->type == PLAYER) 2272 if (op->type == PLAYER)
2466 sprintf (buf, "who was in level %d when killed\n", op->level); 2273 buf << "by " << op->contr->killer_name () << ".\n\n";
2467 else
2468 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2469 2274
2470 strncat (buf2, " ", 20 - strlen (buf) / 2);
2471 strcat (buf2, buf);
2472 if (op->type == PLAYER)
2473 { 2275 {
2474 sprintf (buf, "by %s.\n\n", op->contr->killer); 2276 static char buf2[128];
2475 strncat (buf2, " ", 21 - strlen (buf) / 2); 2277 time_t now = time (NULL);
2476 strcat (buf2, buf);
2477 }
2478
2479 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2278 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2480 strncat (buf2, " ", 20 - strlen (buf) / 2); 2279 buf << buf2;
2481 strcat (buf2, buf); 2280 }
2482 2281
2483 return buf2; 2282 return buf;
2484} 2283}
2485 2284
2486void 2285void
2487do_some_living (object *op) 2286do_some_living (object *op)
2488{ 2287{
… …
2495 int rate_grace = 2000; 2294 int rate_grace = 2000;
2496 const int max_hp = 1; 2295 const int max_hp = 1;
2497 const int max_sp = 1; 2296 const int max_sp = 1;
2498 const int max_grace = 1; 2297 const int max_grace = 1;
2499 2298
2500 if (op->contr->outputs_sync) 2299 if (op->contr->hidden)
2300 {
2301 op->invisible = 1000;
2302 /* the socket code flashes the player visible/invisible
2303 * depending on the value of invisible, so we need to
2304 * alternate it here for it to work correctly.
2305 */
2306 if (pticks & 2)
2307 op->invisible--;
2501 { 2308 }
2502 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2309 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2503 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2310 {
2504 flush_output_element (op, &op->contr->outputs[i]); 2311 if (!op->invisible--)
2312 {
2313 make_visible (op);
2314 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2315 }
2505 } 2316 }
2506 2317
2507 if (op->contr->ns->state == ST_PLAYING) 2318 if (op->contr->ns->state == ST_PLAYING)
2508 { 2319 {
2509 /* these next three if clauses make it possible to SLOW DOWN 2320 /* these next three if clauses make it possible to SLOW DOWN
… …
2528 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2339 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2529 else 2340 else
2530 { 2341 {
2531 gen_grace = op->stats.maxgrace; 2342 gen_grace = op->stats.maxgrace;
2532 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2343 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2533 }
2534
2535 /* Regenerate Spell Points */
2536 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2537 {
2538 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2539 if (op->stats.sp < op->stats.maxsp)
2540 {
2541 op->stats.sp++;
2542 /* dms do not consume food */
2543 if (!QUERY_FLAG (op, FLAG_WIZ))
2544 {
2545 op->stats.food--;
2546 if (op->contr->digestion < 0)
2547 op->stats.food += op->contr->digestion;
2548 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2549 op->stats.food = last_food;
2550 }
2551 }
2552
2553 if (max_sp > 1)
2554 {
2555 over_sp = (gen_sp + 10) / rate_sp;
2556 if (over_sp > 0)
2557 {
2558 if (op->stats.sp < op->stats.maxsp)
2559 {
2560 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2561
2562 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2563 op->stats.sp--;
2564
2565 if (op->stats.sp > op->stats.maxsp)
2566 op->stats.sp = op->stats.maxsp;
2567 }
2568 op->last_sp = 0;
2569 }
2570 else
2571 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2572 }
2573 else
2574 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2575 } 2344 }
2576 2345
2577 /* Regenerate Grace */ 2346 /* Regenerate Grace */
2578 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2347 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2579 if (--op->last_grace < 0) 2348 if (--op->last_grace < 0)
… …
2600 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2369 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2601 } 2370 }
2602 /* wearing stuff doesn't detract from grace generation. */ 2371 /* wearing stuff doesn't detract from grace generation. */
2603 } 2372 }
2604 2373
2374 if (op->stats.food > 0)
2375 {
2605 /* Regenerate Hit Points */ 2376 /* Regenerate Spell Points */
2606 if (--op->last_heal < 0) 2377 if (!op->contr->golem && --op->last_sp < 0)
2607 {
2608 if (op->stats.hp < op->stats.maxhp)
2609 { 2378 {
2610 op->stats.hp++; 2379 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2611 /* dms do not consume food */ 2380
2612 if (!QUERY_FLAG (op, FLAG_WIZ)) 2381 if (op->stats.sp < op->stats.maxsp)
2613 { 2382 {
2383 op->stats.sp++;
2384
2385 /* dms do not consume food */
2386 if (!QUERY_FLAG (op, FLAG_WIZ))
2387 {
2614 op->stats.food--; 2388 op->stats.food--;
2389
2615 if (op->contr->digestion < 0) 2390 if (op->contr->digestion < 0)
2616 op->stats.food += op->contr->digestion; 2391 op->stats.food += op->contr->digestion;
2617 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2392 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2618 op->stats.food = last_food; 2393 op->stats.food = last_food;
2394 }
2619 } 2395 }
2620 }
2621 2396
2622 if (max_hp > 1) 2397 if (max_sp > 1)
2623 {
2624 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2625 if (over_hp > 0)
2626 { 2398 {
2627 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2399 over_sp = (gen_sp + 10) / rate_sp;
2400 if (over_sp > 0)
2401 {
2402 if (op->stats.sp < op->stats.maxsp)
2403 {
2404 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2405
2406 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2407 op->stats.sp--;
2408
2409 if (op->stats.sp > op->stats.maxsp)
2410 op->stats.sp = op->stats.maxsp;
2411 }
2412
2628 op->last_heal = 0; 2413 op->last_sp = 0;
2414 }
2415 else
2416 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2629 } 2417 }
2630 else 2418 else
2419 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2420 }
2421
2422 /* Regenerate Hit Points */
2423 if (--op->last_heal < 0)
2424 {
2425 if (op->stats.hp < op->stats.maxhp)
2631 { 2426 {
2632 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2427 op->stats.hp++;
2428
2429 /* dms do not consume food */
2430 if (!QUERY_FLAG (op, FLAG_WIZ))
2431 {
2432 op->stats.food--;
2433
2434 if (op->contr->digestion < 0)
2435 op->stats.food += op->contr->digestion;
2436 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2437 op->stats.food = last_food;
2438 }
2633 } 2439 }
2440
2441 if (max_hp > 1)
2442 {
2443 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2444
2445 if (over_hp > 0)
2446 {
2447 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2448 op->last_heal = 0;
2449 }
2450 else
2451 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2634 } 2452 }
2635 else 2453 else
2636 {
2637 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2454 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2638 } 2455 }
2639 } 2456 }
2640 2457
2641 /* Digestion */ 2458 /* Digestion */
2642 if (--op->last_eat < 0) 2459 if (--op->last_eat < 0)
2643 { 2460 {
2644#ifdef COZY_SERVER 2461 int bonus = max (0, op->contr->digestion),
2645 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2462 penalty = max (0, -op->contr->digestion);
2646 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2647#else
2648 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2649#endif
2650 2463
2651 if (op->contr->gen_hp > 0)
2652 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2464 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2653 else
2654 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2655 2465
2656 /* dms do not consume food */ 2466 /* dms do not consume food */
2657 if (!QUERY_FLAG (op, FLAG_WIZ)) 2467 if (!QUERY_FLAG (op, FLAG_WIZ))
2658 op->stats.food--; 2468 op->stats.food--;
2659 } 2469 }
2660 2470
2661 if (op->stats.food < 0 && op->stats.hp >= 0) 2471 if (op->stats.food < 0 && op->stats.hp >= 0)
2662 { 2472 {
2663 object *tmp, *flesh = 0; 2473 object *flesh = 0;
2664 2474
2665 for (tmp = op->inv; tmp; tmp = tmp->below) 2475 for_inv_removable (op, tmp)
2666 { 2476 {
2667 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2477 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2478 continue;
2479
2480 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2668 { 2481 {
2669 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2482 op->statusmsg ("You blindly grab for a bite of food. "
2670 { 2483 "H<To prevent you from starving, you ate some random item from your backpack.>");
2671 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2672 manual_apply (op, tmp, 0); 2484 manual_apply (op, tmp, 0);
2485
2673 if (op->stats.food >= 0 || op->stats.hp < 0) 2486 if (op->stats.food >= 0 || op->stats.hp < 0)
2674 break; 2487 break;
2675 } 2488 }
2676 else if (tmp->type == FLESH) 2489 else if (tmp->type == FLESH)
2677 flesh = tmp; 2490 flesh = tmp;
2678 } /* End if paid for object */ 2491 }
2679 } /* end of for loop */
2680 2492
2681 /* If player is still starving, it means they don't have any food, so 2493 /* If player is still starving, it means they don't have any food, so
2682 * eat flesh instead. 2494 * eat flesh instead.
2683 */ 2495 */
2684 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2496 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2685 { 2497 {
2686 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2498 op->statusmsg ("You blindly grab for a bite of food. "
2499 "H<To prevent you from starving, you ate some random item from your backpack.>");
2687 manual_apply (op, flesh, 0); 2500 manual_apply (op, flesh, 0);
2688 } 2501 }
2502
2503 // If player is still starving, alert him!
2504 if (op->stats.food < 0)
2505 op->failmsg ("You are starving! "
2506 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2507 }
2508
2509 if (op->stats.food < 0)
2689 } 2510 {
2511 op->stats.hp += op->stats.food;
2512 op->stats.food = 0;
2690 2513
2691 while (op->stats.food < 0 && op->stats.hp >= 0) 2514 if (op->stats.hp < 0)
2692 op->stats.food++, op->stats.hp--; 2515 {
2516 op->contr->killer = archetype::get ("killer_starvation");
2517 op->contr->killer->destroy ();
2518 }
2519 }
2693 2520
2521 /* killer should be set here already */
2694 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2522 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2695 kill_player (op); 2523 kill_player (op);
2696 } 2524 }
2697} 2525}
2698 2526
… …
2702 * file. 2530 * file.
2703 */ 2531 */
2704void 2532void
2705kill_player (object *op) 2533kill_player (object *op)
2706{ 2534{
2535 int x, y;
2707 char buf[MAX_BUF]; 2536 char buf[MAX_BUF];
2708 int x, y;
2709
2710 //int i;
2711 maptile *map; /* this is for resurrection */ 2537 maptile *map; /* this is for resurrection */
2712
2713 /* int z;
2714 int num_stats_lose;
2715 int lost_a_stat;
2716 int lose_this_stat;
2717 int this_stat; */
2718 int will_kill_again; 2538 int will_kill_again;
2719 archetype *at; 2539 archetype *at;
2720 object *tmp; 2540 object *tmp;
2721 2541
2722 if (save_life (op)) 2542 if (save_life (op))
2723 return; 2543 return;
2724 2544
2545 /* restore player */
2546 at = archetype::find ("poisoning");
2547 if (object *tmp = present_arch_in_ob (at, op))
2548 {
2549 tmp->destroy ();
2550 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2551 }
2552
2553 at = archetype::find ("confusion");
2554 if (object *tmp = present_arch_in_ob (at, op))
2555 {
2556 tmp->destroy ();
2557 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2558 }
2559
2560 cure_disease (op, 0, 0); /* remove any disease */
2561
2562 max_it (op->stats.hp , op->stats.maxhp);
2563 max_it (op->stats.sp , op->stats.maxsp);
2564 max_it (op->stats.grace, op->stats.maxgrace);
2565
2566 if (op->stats.food <= 0)
2567 op->stats.food = 999;
2568
2569 // remove all spell effects that are active
2570 // to avoid long-term effects such as word-of-recall
2571 for (object *item = op->inv; item; )
2572 {
2573 object *next = item->below;
2574
2575 if (item->type == SPELL_EFFECT && item->active)
2576 item->destroy ();
2577
2578 item = next;
2579 }
2725 2580
2726 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2581 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2727 * in cities ONLY!!! It is very important that this doesn't get abused. 2582 * in cities ONLY!!! It is very important that this doesn't get abused.
2728 * Look at op_on_battleground() for more info --AndreasV 2583 * Look at op_on_battleground() for more info --AndreasV
2729 */ 2584 */
2730 if (op_on_battleground (op, &x, &y)) 2585 if (op_on_battleground (op, &x, &y))
2731 { 2586 {
2732 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2587 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2733 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2588 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2734 2589
2735 /* restore player */
2736 at = archetype::find ("poisoning");
2737 if (object *tmp = present_arch_in_ob (at, op))
2738 {
2739 tmp->destroy ();
2740 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2741 }
2742
2743 at = archetype::find ("confusion");
2744 if (object *tmp = present_arch_in_ob (at, op))
2745 {
2746 tmp->destroy ();
2747 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2748 }
2749
2750 cure_disease (op, 0); /* remove any disease */
2751 op->stats.hp = op->stats.maxhp;
2752 if (op->stats.food <= 0)
2753 op->stats.food = 999;
2754
2755 /* create a bodypart-trophy to make the winner happy */ 2590 /* create a bodypart-trophy to make the winner happy */
2756 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2591 if (object *tmp = arch_to_object (archetype::find ("finger")))
2757 { 2592 {
2758 sprintf (buf, "%s's finger", &op->name); 2593 tmp->name = format ("%s's finger" , &op->name);
2759 tmp->name = buf; 2594 tmp->name_pl = format ("%s's fingers", &op->name);
2760 sprintf (buf, " This finger has been cut off %s\n"
2761 " the %s, when he was defeated at\n level %d by %s.\n",
2762 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2763 tmp->msg = buf; 2595 tmp->msg = format (
2596 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2597 &op->name, op->contr->title,
2598 (int)op->level,
2599 op->contr->killer_name ()
2600 );
2764 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2601 tmp->value = 0, tmp->type = 0;
2765 tmp->materialname = NULL; 2602 tmp->materialname = "organics";
2766 op->insert_at (tmp, op); 2603 tmp->insert_at (op, tmp);
2767 } 2604 }
2768 2605
2769 /* teleport defeated player to new destination */ 2606 /* teleport defeated player to new destination */
2770 transfer_ob (op, x, y, 0, NULL); 2607 transfer_ob (op, x, y, 0, NULL);
2771 op->contr->braced = 0; 2608 op->contr->braced = 0;
… …
2774 2611
2775 INVOKE_PLAYER (DEATH, op->contr); 2612 INVOKE_PLAYER (DEATH, op->contr);
2776 2613
2777 command_kill_pets (op, 0); 2614 command_kill_pets (op, 0);
2778 2615
2779 if (op->stats.food < 0) 2616 op->contr->play_sound (sound_find ("player_dies"));
2780 {
2781 if (op->contr->explore)
2782 {
2783 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2784 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2785 op->stats.food = 999;
2786 return;
2787 }
2788 sprintf (buf, "%s starved to death.", &op->name);
2789 strcpy (op->contr->killer, "starvation");
2790 }
2791 else
2792 {
2793 if (op->contr->explore)
2794 {
2795 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2796 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2797 op->stats.hp = op->stats.maxhp;
2798 return;
2799 }
2800 sprintf (buf, "%s died.", &op->name);
2801 }
2802
2803 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2804 2617
2805 /* save the map location for corpse, gravestone */ 2618 /* save the map location for corpse, gravestone */
2806 x = op->x; 2619 x = op->x;
2807 y = op->y; 2620 y = op->y;
2808 map = op->map; 2621 map = op->map;
… …
2836 2649
2837 lost_a_stat = 0; 2650 lost_a_stat = 0;
2838 2651
2839 for (z = 0; z < num_stats_lose; z++) 2652 for (z = 0; z < num_stats_lose; z++)
2840 { 2653 {
2841 i = RANDOM () % NUM_STATS; 2654 i = rndm (NUM_STATS);
2842 2655
2843 if (settings.stat_loss_on_death) 2656 if (settings.stat_loss_on_death)
2844 { 2657 {
2845 /* Pick a random stat and take a point off it. Tell the player 2658 /* Pick a random stat and take a point off it. Tell the player
2846 * what he lost. 2659 * what he lost.
… …
2897 } 2710 }
2898 } 2711 }
2899 2712
2900 if (lose_this_stat) 2713 if (lose_this_stat)
2901 { 2714 {
2902 this_stat = get_attr_value (&(dep->stats), i); 2715 this_stat = get_attr_value (&dep->stats, i);
2903 /* We could try to do something clever like find another 2716 /* We could try to do something clever like find another
2904 * stat to reduce if this fails. But chances are, if 2717 * stat to reduce if this fails. But chances are, if
2905 * stats have been depleted to -50, all are pretty low 2718 * stats have been depleted to -50, all are pretty low
2906 * and should be roughly the same, so it shouldn't make a 2719 * and should be roughly the same, so it shouldn't make a
2907 * difference. 2720 * difference.
… …
2915 lost_a_stat = 1; 2728 lost_a_stat = 1;
2916 } 2729 }
2917 } 2730 }
2918 } 2731 }
2919 } 2732 }
2733
2920 /* If no stat lost, tell the player. */ 2734 /* If no stat lost, tell the player. */
2921 if (!lost_a_stat) 2735 if (!lost_a_stat)
2922 { 2736 {
2923 /* determine_god() seems to not work sometimes... why is this? 2737 /* determine_god() seems to not work sometimes... why is this?
2924 Should I be using something else? GD */ 2738 Should I be using something else? GD */
2925 const char *god = determine_god (op); 2739 shstr_tmp god = determine_god (op);
2926 2740
2927 if (god && (strcmp (god, "none"))) 2741 if (god != shstr_none)
2928 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2742 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", &god);
2929 else 2743 else
2930 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2744 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2931 } 2745 }
2932#else 2746#else
2933 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2747 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2934#endif 2748#endif
2935 2749
2936 /* Put a gravestone up where the character 'almost' died. List the 2750 /* Put a gravestone up where the character 'almost' died. List the
2937 * exp loss on the stone. 2751 * exp loss on the stone.
2938 */ 2752 */
2939 tmp = arch_to_object (archetype::find ("gravestone")); 2753 tmp = arch_to_object (archetype::find ("gravestone"));
2940 sprintf (buf, "%s's gravestone", &op->name); 2754 tmp->name = format ("%s's gravestone", &op->name);
2941 tmp->name = buf; 2755 tmp->name_pl = format ("%s's gravestones", &op->name);
2942 sprintf (buf, "%s's gravestones", &op->name); 2756 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2943 tmp->name_pl = buf; 2757 &op->name, op->contr->title, op->contr->killer_name ());
2944 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2945 tmp->msg = buf;
2946 tmp->x = op->x, tmp->y = op->y; 2758 tmp->x = op->x, tmp->y = op->y;
2947 insert_ob_in_map (tmp, op->map, NULL, 0); 2759 insert_ob_in_map (tmp, op->map, NULL, 0);
2948 2760
2949 /**************************************/ 2761 /**************************************/
2950 /* */ 2762 /* */
2951 /* Subtract the experience points, */ 2763 /* Subtract the experience points, */
2952 /* if we died cause of food, give us */
2953 /* food, and reset HP's... */
2954 /* */ 2764 /* */
2955 /**************************************/ 2765 /**************************************/
2956 2766
2957 /* remove any poisoning and confusion the character may be suffering. */
2958 /* restore player */
2959 at = archetype::find ("poisoning");
2960 tmp = present_arch_in_ob (at, op);
2961
2962 if (tmp)
2963 {
2964 tmp->destroy ();
2965 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2966 }
2967
2968 at = archetype::find ("confusion");
2969 tmp = present_arch_in_ob (at, op);
2970 if (tmp)
2971 {
2972 tmp->destroy ();
2973 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2974 }
2975
2976 cure_disease (op, 0); /* remove any disease */
2977
2978 /*add_exp(op, (op->stats.exp * -0.20)); */ 2767 /*add_exp(op, (op->stats.exp * -0.20)); */
2979 apply_death_exp_penalty (op); 2768 apply_death_exp_penalty (op);
2980 if (op->stats.food < 100)
2981 op->stats.food = 900;
2982 op->stats.hp = op->stats.maxhp;
2983 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2984 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2985 2769
2986 /* 2770 /*
2987 * Check to see if the player is in a shop. IF so, then check to see if
2988 * the player has any unpaid items. If so, remove them and put them back 2771 * Check to see if the player has any unpaid items. If so, remove them
2989 * in the map. 2772 * and put them back in the map.
2990 */ 2773 */
2991 2774 op->drop_unpaid_items ();
2992 if (is_in_shop (op))
2993 remove_unpaid_objects (op->inv, op);
2994 2775
2995 /****************************************/ 2776 /****************************************/
2996 /* */ 2777 /* */
2997 /* Move player to his current respawn- */ 2778 /* Move player to his current respawn- */
2998 /* position (usually last savebed) */ 2779 /* position (usually last savebed) */
2999 /* */ 2780 /* */
3000 /****************************************/ 2781 /****************************************/
3001 2782
3002 enter_player_savebed (op); 2783 enter_player_savebed (op);
3003 2784
3004 /* Save the player before inserting the force to reduce
3005 * chance of abuse.
3006 */
3007 op->contr->braced = 0; 2785 op->contr->braced = 0;
3008 op->contr->save ();
3009 2786
3010 /* it is possible that the player has blown something up 2787 /* it is possible that the player has blown something up
3011 * at his savebed location, and that can have long lasting 2788 * at his savebed location, and that can have long lasting
3012 * spell effects. So first see if there is a spell effect 2789 * spell effects. So first see if there is a spell effect
3013 * on the space that might harm the player. 2790 * on the space that might harm the player.
… …
3022 object *force; 2799 object *force;
3023 int at; 2800 int at;
3024 2801
3025 force = get_archetype (FORCE_NAME); 2802 force = get_archetype (FORCE_NAME);
3026 /* 50 ticks should be enough time for the spell to abate */ 2803 /* 50 ticks should be enough time for the spell to abate */
3027 force->speed = 0.1; 2804 force->speed = 0.1f;
3028 force->speed_left = -5.0; 2805 force->speed_left = -5.f;
3029 SET_FLAG (force, FLAG_APPLIED); 2806 SET_FLAG (force, FLAG_APPLIED);
3030 for (at = 0; at < NROFATTACKS; at++) 2807 for (at = 0; at < NROFATTACKS; at++)
3031 if (will_kill_again & (1 << at)) 2808 if (will_kill_again & (1 << at))
3032 force->resist[at] = 100; 2809 force->resist[at] = 100;
3033 2810
3034 insert_ob_in_ob (force, op); 2811 insert_ob_in_ob (force, op);
3035 op->update_stats (); 2812 op->update_stats ();
3036
3037 } 2813 }
3038 2814
3039 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2815 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3040} 2816}
3041 2817
3042void 2818void
3043loot_object (object *op) 2819loot_object (object *op)
3044{ /* Grab and destroy some treasure */ 2820{ /* Grab and destroy some treasure */
3045 object *tmp, *tmp2, *next; 2821 object *tmp, *tmp2, *next;
3046 2822
3047 if (op->container) 2823 op->close_container (); /* close open sack first */
3048 esrv_apply_container (op, op->container); /* close open sack first */
3049 2824
3050 for (tmp = op->inv; tmp; tmp = next) 2825 for (tmp = op->inv; tmp; tmp = next)
3051 { 2826 {
3052 next = tmp->below; 2827 next = tmp->below;
3053 2828
3054 if (tmp->invisible) 2829 if (tmp->invisible)
3055 continue; 2830 continue;
3056 2831
3057 tmp->remove (); 2832 tmp->remove ();
3058 tmp->x = op->x, tmp->y = op->y; 2833 tmp->x = op->x, tmp->y = op->y;
2834
3059 if (tmp->type == CONTAINER) 2835 if (tmp->type == CONTAINER)
3060 { /* empty container to ground */ 2836 loot_object (tmp); /* empty container to ground */
3061 loot_object (tmp); 2837
3062 }
3063 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2838 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3064 { 2839 {
3065 if (tmp->nrof > 1) 2840 if (tmp->nrof > 1)
3066 { 2841 {
3067 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2842 tmp->decrease (rndm (1, tmp->nrof - 1));
3068 tmp2->destroy ();
3069 insert_ob_in_map (tmp, op->map, NULL, 0); 2843 insert_ob_in_map (tmp, op->map, NULL, 0);
3070 } 2844 }
3071 else 2845 else
3072 tmp->destroy (); 2846 tmp->destroy ();
3073 } 2847 }
… …
3079/* 2853/*
3080 * fix_weight(): Check recursively the weight of all players, and fix 2854 * fix_weight(): Check recursively the weight of all players, and fix
3081 * what needs to be fixed. Refresh windows and fix speed if anything 2855 * what needs to be fixed. Refresh windows and fix speed if anything
3082 * was changed. 2856 * was changed.
3083 */ 2857 */
3084
3085void 2858void
3086fix_weight (void) 2859fix_weight (void)
3087{ 2860{
3088 for_all_players (pl) 2861 for_all_players (pl)
3089 { 2862 {
3090 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2863 sint32 old = pl->ob->carrying;
3091 2864
3092 if (old == sum) 2865 pl->ob->update_weight ();
3093 continue; 2866
2867 if (old != pl->ob->carrying)
2868 {
3094 pl->ob->update_stats (); 2869 pl->ob->update_stats ();
3095 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2870 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2871 }
3096 } 2872 }
3097} 2873}
3098 2874
3099void 2875void
3100fix_luck (void) 2876fix_luck (void)
… …
3142} 2918}
3143 2919
3144void 2920void
3145make_visible (object *op) 2921make_visible (object *op)
3146{ 2922{
3147 op->hide = 0; 2923 op->flag [FLAG_HIDDEN] = 0;
3148 op->invisible = 0; 2924 op->invisible = 0;
2925
3149 if (op->type == PLAYER) 2926 if (op->type == PLAYER)
3150 { 2927 {
3151 op->contr->tmp_invis = 0; 2928 op->contr->tmp_invis = 0;
3152 op->contr->invis_race = 0; 2929 op->contr->invis_race = 0;
3153 } 2930 }
2931
3154 update_object (op, UP_OBJ_FACE); 2932 update_object (op, UP_OBJ_CHANGE);
3155} 2933}
3156 2934
3157int 2935int
3158is_true_undead (object *op) 2936is_true_undead (object *op)
3159{ 2937{
3160 object *tmp = NULL;
3161
3162 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 2938 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3163 return 1; 2939 return 1;
3164 2940
3165 return 0; 2941 return 0;
3166} 2942}
3167 2943
3168/* look at the surrounding terrain to determine 2944/* look at the surrounding terrain to determine
3169 * the hideability of this object. Positive levels 2945 * the hideability of this object. Positive levels
3170 * indicate greater hideability. 2946 * indicate greater hideability.
3171 */ 2947 */
3172
3173int 2948int
3174hideability (object *ob) 2949hideability (object *ob)
3175{ 2950{
3176 int i, level = 0, mflag; 2951 int i, level = 0, mflag;
3177 sint16 x, y; 2952 sint16 x, y;
3178 2953
3179 if (!ob || !ob->map) 2954 if (!ob || !ob->map)
3180 return 0; 2955 return 0;
3181 2956
3182 /* so, on normal lighted maps, its hard to hide */ 2957 /* so, on normal lighted maps, its hard to hide */
3183 level = ob->map->darkness - 2; 2958 level = ob->map->darklevel () - 2;
3184 2959
3185 /* this also picks up whether the object is glowing. 2960 /* this also picks up whether the object is glowing.
3186 * If you carry a light on a non-dark map, its not 2961 * If you carry a light on a non-dark map, its not
3187 * as bad as carrying a light on a pitch dark map */ 2962 * as bad as carrying a light on a pitch dark map */
3188 if (has_carried_lights (ob)) 2963 if (has_carried_lights (ob))
3189 level = -(10 + (2 * ob->map->darkness)); 2964 level = -(10 + (2 * ob->map->darklevel ()));
3190 2965
3191 /* scan through all nearby squares for terrain to hide in */ 2966 /* scan through all nearby squares for terrain to hide in */
3192 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2967 for (i = 0, x = ob->x, y = ob->y;
2968 i <= SIZEOFFREE1;
2969 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3193 { 2970 {
3194 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2971 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3195 if (mflag & P_OUT_OF_MAP) 2972 if (mflag & P_OUT_OF_MAP)
3196 {
3197 continue; 2973 continue;
3198 } 2974
3199 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2975 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3200 level += 2; 2976 level += 2;
3201 else /* open terrain! */ 2977 else /* open terrain! */
3202 level -= 1; 2978 level -= 1;
3203 } 2979 }
… …
3211/* For Hidden creatures - a chance of becoming 'unhidden' 2987/* For Hidden creatures - a chance of becoming 'unhidden'
3212 * every time they move - as we subtract off 'invisibility' 2988 * every time they move - as we subtract off 'invisibility'
3213 * AND, for players, if they move into a ridiculously unhideable 2989 * AND, for players, if they move into a ridiculously unhideable
3214 * spot (surrounded by clear terrain in broad daylight). -b.t. 2990 * spot (surrounded by clear terrain in broad daylight). -b.t.
3215 */ 2991 */
3216
3217void 2992void
3218do_hidden_move (object *op) 2993do_hidden_move (object *op)
3219{ 2994{
3220 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2995 int hide = 0;
3221 object *skop;
3222 2996
3223 if (!op || !op->map) 2997 if (!op || !op->map)
3224 return; 2998 return;
3225 2999
3226 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3000 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3001 int num = random_roll (0, 19, op, PREFER_LOW);
3227 3002
3228 /* its *extremely* hard to run and sneak/hide at the same time! */ 3003 /* its *extremely* hard to run and sneak/hide at the same time! */
3229 if (op->type == PLAYER && op->contr->run_on) 3004 if (op->type == PLAYER && op->contr->run_on)
3230 {
3231 if (!skop || num >= skop->level) 3005 if (!skop || num >= skop->level)
3232 { 3006 {
3233 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3007 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3234 make_visible (op); 3008 make_visible (op);
3235 return; 3009 return;
3236 } 3010 }
3237 else 3011 else
3238 num += 20; 3012 num += 20;
3239 } 3013
3240 num += op->map->difficulty; 3014 num += op->map->difficulty;
3241 hide = hideability (op); /* modify by terrain hidden level */ 3015 hide = hideability (op); /* modify by terrain hidden level */
3242 num -= hide; 3016 num -= hide;
3017
3243 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3018 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3244 { 3019 {
3245 make_visible (op); 3020 make_visible (op);
3021
3246 if (op->type == PLAYER) 3022 if (op->type == PLAYER)
3247 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3023 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3248 } 3024 }
3249 else if (op->type == PLAYER && skop) 3025 else if (op->type == PLAYER && skop)
3250 {
3251 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3026 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3252 }
3253} 3027}
3254 3028
3255/* determine if who is standing near a hostile creature. */ 3029/* determine if who is standing near a hostile creature. */
3256 3030
3257int 3031int
… …
3305 * object op. This function works fine for monsters, 3079 * object op. This function works fine for monsters,
3306 * but we dont worry if the object isnt the top one in 3080 * but we dont worry if the object isnt the top one in
3307 * a pile (say a coin under a table would return "viewable" 3081 * a pile (say a coin under a table would return "viewable"
3308 * by this routine). Another question, should we be 3082 * by this routine). Another question, should we be
3309 * concerned with the direction the player is looking 3083 * concerned with the direction the player is looking
3310 * in? Realistically, most of use cant see stuff behind 3084 * in? Realistically, most of us can't see stuff behind
3311 * our backs...on the other hand, does the "facing" direction 3085 * our backs...on the other hand, does the "facing" direction
3312 * imply the way your head, or body is facing? Its possible 3086 * imply the way your head, or body is facing? It's possible
3313 * for them to differ. Sigh, this fctn could get a bit more complex. 3087 * for them to differ. Sigh, this fctn could get a bit more complex.
3314 * -b.t. 3088 * -b.t.
3315 * This function is now map tiling safe. 3089 * This function is now map tiling safe.
3316 */ 3090 */
3317
3318int 3091int
3319player_can_view (object *pl, object *op) 3092player_can_view (object *pl, object *op)
3320{ 3093{
3321 rv_vector rv; 3094 rv_vector rv;
3322 int dx, dy; 3095 int dx, dy;
… …
3334 3107
3335 get_rangevector (pl, op, &rv, 0x1); 3108 get_rangevector (pl, op, &rv, 0x1);
3336 3109
3337 /* starting with the 'head' part, lets loop 3110 /* starting with the 'head' part, lets loop
3338 * through the object and find if it has any 3111 * through the object and find if it has any
3339 * part that is in the los array but isnt on 3112 * part that is in the los array but isn't on
3340 * a blocked los square. 3113 * a blocked los square.
3341 * we use the archetype to figure out offsets. 3114 * we use the archetype to figure out offsets.
3342 */ 3115 */
3343 while (op) 3116 while (op)
3344 { 3117 {
3345 dx = rv.distance_x + op->arch->clone.x; 3118 dx = rv.distance_x + op->arch->x;
3346 dy = rv.distance_y + op->arch->clone.y; 3119 dy = rv.distance_y + op->arch->y;
3347 3120
3348 /* only the viewable area the player sees is updated by LOS 3121 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3349 * code, so we need to restrict ourselves to that range of values
3350 * for any meaningful values.
3351 */
3352 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3353 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3354 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3355 return 1; 3122 return 1;
3123
3356 op = op->more; 3124 op = op->more;
3357 } 3125 }
3126
3358 return 0; 3127 return 0;
3359} 3128}
3360 3129
3361/* routine for both players and monsters. We call this when 3130/* routine for both players and monsters. We call this when
3362 * there is a possibility for our action distrubing our hiding 3131 * there is a possibility for our action distrubing our hiding
3363 * place or invisiblity spell. Artefact invisiblity is not 3132 * place or invisiblity spell. Artefact invisiblity causes
3364 * effected by this. If we arent invisible to begin with, we 3133 * "noise" instead. If we arent invisible to begin with, we
3365 * return 0. 3134 * return 0.
3366 */ 3135 */
3367int 3136int
3368action_makes_visible (object *op) 3137action_makes_visible (object *op)
3369{ 3138{
3370
3371 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3139 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3372 { 3140 {
3373 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3141 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3142 {
3143 // artefact invisibility is permanent, but we still make noise
3144 // this is important for game-balance.
3145 if (op->contr)
3146 op->make_noise ();
3147
3374 return 0; 3148 return 0;
3149 }
3375 3150
3376 if (op->contr && op->contr->tmp_invis == 0) 3151 if (op->contr && op->contr->tmp_invis == 0)
3377 return 0; 3152 return 0;
3378 3153
3379 /* If monsters, they should become visible */ 3154 /* If monsters, they should become visible */
3380 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3155 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3381 { 3156 {
3382 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3157 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3383 return 1; 3158 return 1;
3384 } 3159 }
3385 } 3160 }
3161
3386 return 0; 3162 return 0;
3387} 3163}
3388 3164
3389/* op_on_battleground - checks if the given object op (usually 3165/* op_on_battleground - checks if the given object op (usually
3390 * a player) is standing on a valid battleground-tile, 3166 * a player) is standing on a valid battleground-tile,
… …
3395 * Default is to do the same as before, so only people wanting to have different points need worry about this 3171 * Default is to do the same as before, so only people wanting to have different points need worry about this
3396 */ 3172 */
3397int 3173int
3398op_on_battleground (object *op, int *x, int *y) 3174op_on_battleground (object *op, int *x, int *y)
3399{ 3175{
3400 object *tmp;
3401
3402 /* A battleground-tile needs the following attributes to be valid: 3176 /* A battleground-tile needs the following attributes to be valid:
3403 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3177 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3404 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3178 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3405 * and the exit-coordinates sp/hp must both be > 0. 3179 * and the exit-coordinates sp/hp must both be > 0.
3406 * => The intention here is to prevent abuse of the battleground- 3180 * => The intention here is to prevent abuse of the battleground-
3407 * feature (like pickable or hidden battleground tiles). */ 3181 * feature (like pickable or hidden battleground tiles). */
3408 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3182 for (object *tmp = op->below; tmp; tmp = tmp->below)
3409 { 3183 {
3410 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3184 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3411 { 3185 {
3412 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3186 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3413 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3187 && tmp->type == BATTLEGROUND
3188 && tmp->name == shstr_battleground
3189 && EXIT_X (tmp) && EXIT_Y (tmp))
3414 { 3190 {
3415 /*before we assign the exit, check if this is a teambattle */ 3191 /* before we assign the exit, check if this is a teambattle */
3416 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3192 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3417 { 3193 {
3418 object *invtmp;
3419
3420 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3194 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3421 { 3195 {
3422 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3196 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3423 { 3197 {
3424 if (x != NULL && y != NULL) 3198 if (x && y)
3425 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3199 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3200
3426 return 1; 3201 return 1;
3427 } 3202 }
3428 } 3203 }
3429 } 3204 }
3205
3430 if (x != NULL && y != NULL) 3206 if (x && y)
3431 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3207 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3208
3432 return 1; 3209 return 1;
3433 } 3210 }
3434 } 3211 }
3435 } 3212 }
3213
3436 /* If we got here, did not find a battleground */ 3214 /* If we got here, did not find a battleground */
3437 return 0; 3215 return 0;
3438} 3216}
3439 3217
3440/* 3218/*
… …
3456 char buf[MAX_BUF]; /* tmp. string buffer */ 3234 char buf[MAX_BUF]; /* tmp. string buffer */
3457 int i = 0, j = 0; 3235 int i = 0, j = 0;
3458 3236
3459 /* get the appropriate treasurelist */ 3237 /* get the appropriate treasurelist */
3460 if (atnr == ATNR_FIRE) 3238 if (atnr == ATNR_FIRE)
3461 trlist = find_treasurelist ("dragon_ability_fire"); 3239 trlist = treasurelist::find (shstr_dragon_ability_fire);
3462 else if (atnr == ATNR_COLD) 3240 else if (atnr == ATNR_COLD)
3463 trlist = find_treasurelist ("dragon_ability_cold"); 3241 trlist = treasurelist::find (shstr_dragon_ability_cold);
3464 else if (atnr == ATNR_ELECTRICITY) 3242 else if (atnr == ATNR_ELECTRICITY)
3465 trlist = find_treasurelist ("dragon_ability_elec"); 3243 trlist = treasurelist::find (shstr_dragon_ability_elec);
3466 else if (atnr == ATNR_POISON) 3244 else if (atnr == ATNR_POISON)
3467 trlist = find_treasurelist ("dragon_ability_poison"); 3245 trlist = treasurelist::find (shstr_dragon_ability_poison);
3468 3246
3469 if (trlist == NULL || who->type != PLAYER) 3247 if (trlist == NULL || who->type != PLAYER)
3470 return; 3248 return;
3471 3249
3472 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3250 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3476 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3254 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3477 return; 3255 return;
3478 } 3256 }
3479 3257
3480 /* everything seems okay - now bring on the gift: */ 3258 /* everything seems okay - now bring on the gift: */
3481 item = &(tr->item->clone); 3259 item = tr->item;
3482 3260
3483 if (item->type == SPELL) 3261 if (item->type == SPELL)
3484 { 3262 {
3485 if (check_spell_known (who, item->name)) 3263 if (check_spell_known (who, item->name))
3486 return; 3264 return;
… …
3545 { 3323 {
3546 /* forces in the treasurelist can alter the player's stats */ 3324 /* forces in the treasurelist can alter the player's stats */
3547 object *skin; 3325 object *skin;
3548 3326
3549 /* first get the dragon skin force */ 3327 /* first get the dragon skin force */
3550 shstr_cmp dragon_skin_force ("dragon_skin_force");
3551 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3328 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3552 ; 3329 ;
3553 3330
3554 if (!skin) 3331 if (!skin)
3555 return; 3332 return;
3556 3333
… …
3591 else 3368 else
3592 { 3369 {
3593 /* generate misc. treasure */ 3370 /* generate misc. treasure */
3594 tmp = arch_to_object (tr->item); 3371 tmp = arch_to_object (tr->item);
3595 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3372 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3596 tmp = insert_ob_in_ob (tmp, who); 3373 who->insert (tmp);
3597 if (who->type == PLAYER)
3598 esrv_send_item (who, tmp);
3599 } 3374 }
3600} 3375}
3601 3376
3602/** 3377/**
3603 * Unready an object for a player. This function does nothing if the object was 3378 * Unready an object for a player. This function does nothing if the object was
3604 * not readied. 3379 * not readied.
3605 */ 3380 */
3606void 3381void
3607player_unready_range_ob (player *pl, object *ob) 3382player_unready_range_ob (player *pl, object *ob)
3608{ 3383{
3609 rangetype i; 3384 if (pl->ob->current_weapon == ob)
3385 pl->ob->current_weapon = 0;
3610 3386
3611 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3387 if (pl->combat_ob == ob)
3612 { 3388 pl->combat_ob = 0;
3389
3613 if (pl->ranges[i] == ob) 3390 if (pl->ranged_ob == ob)
3614 { 3391 pl->ranged_ob = 0;
3615 pl->ranges[i] = NULL;
3616 if (pl->shoottype == i)
3617 {
3618 pl->shoottype = range_none;
3619 }
3620 }
3621 }
3622} 3392}
3393
3394sint8
3395player::darkness_at (maptile *map, int x, int y) const
3396{
3397 if (!ns)
3398 return LOS_BLOCKED;
3399
3400 int dx, dy;
3401 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3402 return LOS_BLOCKED;
3403
3404 x += dx - ns->current_x;
3405 y += dy - ns->current_y;
3406
3407 return blocked_los (x, y);
3408}
3409
3410void
3411player::infobox (const char *title, const char *msg, int color)
3412{
3413 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3414}
3415
3416void
3417player::statusmsg (const char *msg, int color)
3418{
3419 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3420}
3421
3422void
3423player::failmsg (const char *msg, int color)
3424{
3425 play_sound (sound_find ("generic_failure"));
3426 statusmsg (msg, color);
3427}
3428

Diff Legend

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