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

Diff Legend

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