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

Diff Legend

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