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.17 by pippijn, Thu Sep 7 10:01:58 2006 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC

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

Diff Legend

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