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.48 by root, Tue Dec 19 05:41:22 2006 UTC vs.
Revision 1.259 by root, Sun Mar 28 02:53:46 2010 UTC

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

Diff Legend

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