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.24 by root, Thu Sep 14 23:13:49 2006 UTC vs.
Revision 1.209 by root, Thu Dec 18 05:13:38 2008 UTC

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

Diff Legend

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