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

Diff Legend

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