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.27 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.259 by root, Sun Mar 28 02:53:46 2010 UTC

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

Diff Legend

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