ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.9 by root, Fri Aug 25 17:11:53 2006 UTC vs.
Revision 1.103 by root, Fri May 18 01:01:02 2007 UTC

1/* 1/*
2 * static char *rcsid_apply_c =
3 * "$Id: apply.C,v 1.9 2006/08/25 17:11:53 root Exp $";
4 */
5/*
6 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
7 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
8 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
9 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
10 7 *
11 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
13 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
14 (at your option) any later version. 11 * (at your option) any later version.
15 12 *
16 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
17 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 GNU General Public License for more details. 16 * GNU General Public License for more details.
20 17 *
21 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
22 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
23 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 21 *
25 The authors can be reached via e-mail to crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
26*/ 23 */
24
25#include <cmath>
27 26
28#include <global.h> 27#include <global.h>
29#include <living.h> 28#include <living.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32#include <tod.h> 31#include <tod.h>
33 32
34#ifndef __CEXTRACT__
35#include <sproto.h> 33#include <sproto.h>
36#endif
37 34
38/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
39#include <sounds.h> 36#include <sounds.h>
40 37
41/* need math lib for double-precision and pow() in dragon_eat_flesh() */
42#include <math.h>
43
44/* Can transport hold object op?
45 * This is a pretty trivial function,
46 * but in the future, possible transport may have more restrictions
47 * or weight reduction like containers
48 */
49int transport_can_hold(const object *transport, const object *op, int nrof)
50{
51 if ((op->weight *nrof + transport->carrying) > transport->weight_limit)
52 return 0;
53 else
54 return 1;
55}
56
57
58/*
59 * Player is trying to use a transport. This returns same values as
60 * manual_apply() does. This function basically checks to see if
61 * the player can use the transport, and if so, sets up the appropriate
62 * pointers.
63 */
64int apply_transport(object *pl, object *transport, int aflag) {
65
66 /* Only players can use transports right now */
67 if (pl->type != PLAYER) return 0;
68
69 // due to brokenness of transports disable them until a working alternative
70 // has been found... :(
71 // - elmex
72 new_draw_info (NDI_UNIQUE, 0, pl, "This transport is out of order!");
73 return 1;
74
75 /* If player is currently on a transport but not this transport, they need
76 * to exit first. Perhaps transport to transport transfers should be
77 * allowed.
78 */
79 if (pl->contr->transport && pl->contr->transport != transport) {
80 new_draw_info_format(NDI_UNIQUE, 0, pl,
81 "You must exit %s before you can board %s.",
82 query_name(pl->contr->transport),
83 query_name(transport));
84 return 1;
85 }
86
87 /* player is currently on a transport. This must mean he
88 * wants to exit.
89 */
90 if (pl->contr->transport) {
91 object *old_transport = pl->contr->transport, *inv;
92
93 /* Should we print a message if the player only wants to
94 * apply?
95 */
96 if (aflag & AP_APPLY) return 1;
97 new_draw_info_format(NDI_UNIQUE, 0, pl,
98 "You disembark from %s.",
99 query_name(old_transport));
100 remove_ob(pl);
101 pl->map = old_transport->map;
102 pl->x = old_transport->x;
103 pl->y = old_transport->y;
104 if (pl->contr == old_transport->contr)
105 old_transport->contr = NULL;
106
107 pl->contr->transport = NULL;
108 insert_ob_in_map(pl, pl->map, pl, 0);
109 sum_weight(old_transport);
110
111 /* Possible for more than one player to be using a transport.
112 * if that is the case, we don't want to reset the face, as the
113 * transport is still occupied.
114 */
115 for (inv=old_transport->inv; inv; inv=inv->below)
116 if (inv->type == PLAYER) break;
117 if (!inv) {
118 old_transport->face = old_transport->arch->clone.face;
119 old_transport->animation_id = old_transport->arch->clone.animation_id;
120 }
121 return 1;
122 }
123 else {
124 /* player is trying to board a transport */
125 int pc=0, p_limit;
126 object *inv;
127 const char *kv;
128
129 if (aflag & AP_UNAPPLY) return 1;
130
131 /* Can this transport hold the weight of this player? */
132 if (!transport_can_hold(transport, pl, 1)) {
133 new_draw_info_format(NDI_UNIQUE, 0, pl,
134 "The %s is unable to hold your weight!",
135 query_name(transport));
136 return 1;
137 }
138
139 /* Does this transport have space for more players? */
140 for (inv=transport->inv; inv; inv=inv->below) {
141 if (inv->type == PLAYER) pc++;
142 }
143 kv = get_ob_key_value(transport, "passenger_limit");
144 if (!kv) p_limit=1;
145 else p_limit = atoi(kv);
146 if (pc >= p_limit) {
147 new_draw_info_format(NDI_UNIQUE, 0, pl,
148 "The %s does not have space for any more people",
149 query_name(transport));
150 return 1;
151 }
152
153 /* Everything checks out OK - player can get on the transport */
154 pl->contr->transport = transport;
155 if (!transport->contr) transport->contr = pl->contr;
156 remove_ob(pl);
157 insert_ob_in_ob(pl, transport);
158 sum_weight(transport);
159 pl->map = transport->map;
160 pl->x = transport->x;
161 pl->y = transport->y;
162
163 /* Might need to update face, animation info */
164 if (!pc) {
165 const char *str;
166
167 str = get_ob_key_value(transport, "face_full");
168 if (str)
169 transport->face = &new_faces[FindFace(str,
170 transport->face->number)];
171 str = get_ob_key_value(transport, "anim_full");
172 if (str)
173 transport->animation_id = find_animation(str);
174 }
175
176 /* Does speed of this object change based on weight? */
177 kv = get_ob_key_value(transport, "weight_speed_ratio");
178 if (kv) {
179 int wsr = atoi(kv);
180 float base_speed;
181
182 kv = get_ob_key_value(transport, "base_speed");
183 if (kv) base_speed = atof(kv);
184 else base_speed = transport->arch->clone.speed;
185
186 transport->speed = base_speed - (base_speed * transport->carrying *
187 wsr) / (transport->weight_limit * 100);
188
189 /* Put some limits on min/max speeds */
190 if (transport->speed < 0.10) transport->speed = 0.10;
191 if (transport->speed > 1.0) transport->speed = 1.0;
192 }
193 } /* else if player is boarding the transport */
194
195 return 1;
196}
197
198
199
200/** 38/**
201 * Check if op should abort moving victim because of it's race or slaying. 39 * Check if op should abort moving victim because of it's race or slaying.
202 * Returns 1 if it should abort, returns 0 if it should continue. 40 * Returns 1 if it should abort, returns 0 if it should continue.
203 */ 41 */
42int
204int should_director_abort(object *op, object *victim) 43should_director_abort (object *op, object *victim)
205{ 44{
206 int arch_flag, name_flag, race_flag; 45 int arch_flag, name_flag, race_flag;
46
207 /* Get flags to determine what of arch, name, and race should be checked. 47 /* Get flags to determine what of arch, name, and race should be checked.
208 * This is stored in subtype, and is a bitmask, the LSB is the arch flag, 48 * This is stored in subtype, and is a bitmask, the LSB is the arch flag,
209 * the next is the name flag, and the last is the race flag. Also note, 49 * the next is the name flag, and the last is the race flag. Also note,
210 * if subtype is set to zero, that also goes to defaults of all affecting 50 * if subtype is set to zero, that also goes to defaults of all affecting
211 * it. Examples: 51 * it. Examples:
212 * subtype 1: only arch 52 * subtype 1: only arch
213 * subtype 3: arch or name 53 * subtype 3: arch or name
214 * subtype 5: arch or race 54 * subtype 5: arch or race
215 * subtype 7: all three 55 * subtype 7: all three
216 */ 56 */
217 if (op->subtype) 57 if (op->subtype)
218 { 58 {
219 arch_flag = (op->subtype & 1); 59 arch_flag = (op->subtype & 1);
220 name_flag = (op->subtype & 2); 60 name_flag = (op->subtype & 2);
221 race_flag = (op->subtype & 4); 61 race_flag = (op->subtype & 4);
222 } else { 62 }
63 else
64 {
223 arch_flag = 1; 65 arch_flag = 1;
224 name_flag = 1; 66 name_flag = 1;
225 race_flag = 1; 67 race_flag = 1;
226 } 68 }
69
227 /* If the director has race set, only affect objects with a arch, 70 /* If the director has race set, only affect objects with a arch,
228 * name or race that matches. 71 * name or race that matches.
229 */ 72 */
230 if ( (op->race) && 73 if ((op->race) &&
231 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp(op->race, victim->arch->name))) && 74 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) &&
232 ((!(victim->name && name_flag) || strcmp(op->race, victim->name))) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
233 ((!(victim->race && race_flag) || strcmp(op->race, victim->race))) ) { 76 ((!(victim->race && race_flag) || op->race != victim->race)))
234 return 1; 77 return 1;
235 } 78
236 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
237 * of arch, name, or race match. 80 * of arch, name, or race match.
238 */ 81 */
239 if ( (op->slaying) && (
240 ((victim->arch && arch_flag && victim->arch->name && !strcmp(op->slaying, victim->arch->name))) || 82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) ||
241 ((victim->name && name_flag && !strcmp(op->slaying, victim->name))) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
242 ((victim->race && race_flag && !strcmp(op->slaying, victim->race)))) ) { 84 ((victim->race && race_flag && op->slaying == victim->race)))
243 return 1; 85 return 1;
244 } 86
245 return 0; 87 return 0;
246} 88}
247 89
248/** 90/**
249 * This handles a player dropping money on an altar to identify stuff. 91 * This handles a player dropping money on an altar to identify stuff.
250 * It'll identify marked item, if none all items up to dropped money. 92 * It'll identify marked item, if none all items up to dropped money.
251 * Return value: 1 if money was destroyed, 0 if not. 93 * Return value: 1 if money was destroyed, 0 if not.
252 */ 94 */
95static int
253static int apply_id_altar (object *money, object *altar, object *pl) 96apply_id_altar (object *money, object *altar, object *pl)
254{ 97{
255 object *id, *marked; 98 object *id, *marked;
256 int success=0; 99 int success = 0;
257 100
258 if (pl == NULL || pl->type != PLAYER) 101 if (pl == NULL || pl->type != PLAYER)
259 return 0; 102 return 0;
260 103
261 /* Check for MONEY type is a special hack - it prevents 'nothing needs 104 /* Check for MONEY type is a special hack - it prevents 'nothing needs
262 * identifying' from being printed out more than it needs to be. 105 * identifying' from being printed out more than it needs to be.
263 */ 106 */
264 if ( ! check_altar_sacrifice (altar, money) || money->type != MONEY) 107 if (!check_altar_sacrifice (altar, money) || money->type != MONEY)
265 return 0; 108 return 0;
266 109
267 marked = find_marked_object (pl); 110 marked = find_marked_object (pl);
268 /* if the player has a marked item, identify that if it needs to be 111 /* if the player has a marked item, identify that if it needs to be
269 * identified. IF it doesn't, then go through the player inventory. 112 * identified. IF it doesn't, then go through the player inventory.
270 */ 113 */
271 if (marked && ! QUERY_FLAG (marked, FLAG_IDENTIFIED) 114 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
272 && need_identify (marked))
273 { 115 {
274 if (operate_altar (altar, &money)) { 116 if (operate_altar (altar, &money))
117 {
275 identify (marked); 118 identify (marked);
276 new_draw_info_format(NDI_UNIQUE, 0, pl, 119 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (marked, pl));
277 "You have %s.", long_desc(marked, pl));
278 if (marked->msg) { 120 if (marked->msg)
121 {
279 new_draw_info(NDI_UNIQUE, 0,pl, "The item has a story:"); 122 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:");
280 new_draw_info(NDI_UNIQUE, 0,pl, marked->msg); 123 new_draw_info (NDI_UNIQUE, 0, pl, marked->msg);
124 }
125 return money == NULL;
126 }
281 } 127 }
282 return money == NULL;
283 }
284 }
285 128
286 for (id=pl->inv; id; id=id->below) { 129 for (id = pl->inv; id; id = id->below)
130 {
287 if (!QUERY_FLAG(id, FLAG_IDENTIFIED) && !id->invisible && 131 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
288 need_identify(id)) { 132 {
289 if (operate_altar(altar,&money)) { 133 if (operate_altar (altar, &money))
290 identify(id); 134 {
291 new_draw_info_format(NDI_UNIQUE, 0, pl, 135 identify (id);
292 "You have %s.", long_desc(id, pl)); 136 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (id, pl));
293 if (id->msg) { 137 if (id->msg)
138 {
294 new_draw_info(NDI_UNIQUE, 0,pl, "The item has a story:"); 139 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:");
295 new_draw_info(NDI_UNIQUE, 0,pl, id->msg); 140 new_draw_info (NDI_UNIQUE, 0, pl, id->msg);
296 } 141 }
297 success=1; 142 success = 1;
298 /* If no more money, might as well quit now */ 143 /* If no more money, might as well quit now */
299 if (money == NULL || ! check_altar_sacrifice (altar,money)) 144 if (money == NULL || !check_altar_sacrifice (altar, money))
300 break; 145 break;
301 } 146 }
302 else { 147 else
148 {
303 LOG(llevError,"check_id_altar: Couldn't do sacrifice when we should have been able to\n"); 149 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n");
304 break; 150 break;
305 } 151 }
306 } 152 }
307 } 153 }
154 if (!success)
308 if (!success) new_draw_info(NDI_UNIQUE, 0,pl,"You have nothing that needs identifying"); 155 new_draw_info (NDI_UNIQUE, 0, pl, "You have nothing that needs identifying");
309 return money == NULL; 156 return money == NULL;
310} 157}
311 158
312/** 159/**
313 * This checks whether the object has a "on_use_yield" field, and if so generated and drops 160 * This checks whether the object has a "on_use_yield" field, and if so generated and drops
314 * matching item. 161 * matching item.
315 **/ 162 **/
163static void
316static void handle_apply_yield(object* tmp) 164handle_apply_yield (object *tmp)
317{ 165{
318 const char* yield; 166 const char *yield;
319 167
320 yield = get_ob_key_value(tmp,"on_use_yield"); 168 yield = get_ob_key_value (tmp, "on_use_yield");
321 if (yield != NULL) 169 if (yield != NULL)
322 { 170 {
323 object* drop = get_archetype(yield); 171 object *drop = get_archetype (yield);
172
324 if (tmp->env) 173 if (tmp->env)
325 { 174 {
326 drop = insert_ob_in_ob(drop,tmp->env); 175 drop = insert_ob_in_ob (drop, tmp->env);
327 if (tmp->env->type == PLAYER) 176 if (tmp->env->type == PLAYER)
328 esrv_send_item(tmp->env,drop); 177 esrv_send_item (tmp->env, drop);
329 } 178 }
330 else 179 else
331 { 180 {
332 drop->x = tmp->x; 181 drop->x = tmp->x;
333 drop->y = tmp->y; 182 drop->y = tmp->y;
334 insert_ob_in_map(drop,tmp->map,tmp,INS_BELOW_ORIGINATOR); 183 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
335 } 184 }
336 } 185 }
337} 186}
338 187
339/** 188/**
340 * Handles applying a potion. 189 * Handles applying a potion.
341 */ 190 */
191int
342int apply_potion (object * op, object * tmp) 192apply_potion (object *op, object *tmp)
343{ 193{
344 int got_one = 0, i; 194 int got_one = 0, i;
345 object *force = 0, *floor = 0; 195 object *force = 0, *floor = 0;
346 196
347 floor = get_map_ob (op->map, op->x, op->y); 197 floor = GET_MAP_OB (op->map, op->x, op->y);
348 198
349 if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 199 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
350 { 200 {
351 if (op->type == PLAYER) 201 if (op->type == PLAYER)
352 new_draw_info (NDI_UNIQUE, 0, op,
353 "Gods prevent you from using this here, it's sacred ground!" 202 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
354 );
355 CLEAR_FLAG (tmp, FLAG_APPLIED); 203 CLEAR_FLAG (tmp, FLAG_APPLIED);
356 return 0; 204 return 0;
357 } 205 }
358 206
359 if (op->type == PLAYER) 207 if (op->type == PLAYER)
360 {
361 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 208 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
362 identify (tmp); 209 identify (tmp);
363 }
364 210
365 handle_apply_yield (tmp); 211 handle_apply_yield (tmp);
366 212
367 /* Potion of restoration - only for players */ 213 /* Potion of restoration - only for players */
368 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE)) 214 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE))
… …
370 object *depl; 216 object *depl;
371 archetype *at; 217 archetype *at;
372 218
373 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 219 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
374 { 220 {
375 drain_stat (op); 221 op->drain_stat ();
376 fix_player (op); 222 op->update_stats ();
377 decrease_ob (tmp); 223 decrease_ob (tmp);
378 return 1; 224 return 1;
379 } 225 }
226
380 if ((at = find_archetype (ARCH_DEPLETION)) == NULL) 227 if (!(at = archetype::find (ARCH_DEPLETION)))
381 { 228 {
382 LOG (llevError, "Could not find archetype depletion\n"); 229 LOG (llevError, "Could not find archetype depletion\n");
383 return 0; 230 return 0;
384 } 231 }
385 depl = present_arch_in_ob (at, op); 232 depl = present_arch_in_ob (at, op);
233
386 if (depl != NULL) 234 if (depl)
387 { 235 {
388 for (i = 0; i < NUM_STATS; i++) 236 for (i = 0; i < NUM_STATS; i++)
389 if (get_attr_value (&depl->stats, i)) 237 if (depl->stats.stat (i))
390 {
391 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
392 } 239
393 remove_ob (depl); 240 depl->destroy ();
394 free_object (depl); 241 op->update_stats ();
395 fix_player (op);
396 } 242 }
397 else 243 else
398 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 244 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
399 245
400 decrease_ob (tmp); 246 decrease_ob (tmp);
… …
402 } 248 }
403 249
404 /* improvement potion - only for players */ 250 /* improvement potion - only for players */
405 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 251 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER)
406 { 252 {
407
408 for (i = 1; i < MIN (11, op->level); i++) 253 for (i = 1; i < MIN (11, op->level); i++)
409 { 254 {
410 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 255 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
411 { 256 {
412 if (op->contr->levhp[i] != 1) 257 if (op->contr->levhp[i] != 1)
… …
442 op->contr->levgrace[i] = 3; 287 op->contr->levgrace[i] = 3;
443 break; 288 break;
444 } 289 }
445 } 290 }
446 } 291 }
292
447 /* Just makes checking easier */ 293 /* Just makes checking easier */
448 if (i < MIN (11, op->level)) 294 if (i < MIN (11, op->level))
449 got_one = 1; 295 got_one = 1;
296
450 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 297 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
451 { 298 {
452 if (got_one) 299 if (got_one)
453 { 300 {
454 fix_player (op); 301 op->update_stats ();
455 new_draw_info (NDI_UNIQUE, 0, op, 302 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you");
456 "The Gods smile upon you and remake you"); 303 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image.");
457 new_draw_info (NDI_UNIQUE, 0, op, 304 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
458 "a little more in their image.");
459 new_draw_info (NDI_UNIQUE, 0, op,
460 "You feel a little more perfect.");
461 } 305 }
462 else 306 else
463 new_draw_info (NDI_UNIQUE, 0, op, 307 new_draw_info (NDI_UNIQUE, 0, op, "The potion had no effect - you are already perfect");
464 "The potion had no effect - you are already perfect");
465 } 308 }
466 else 309 else
467 { /* cursed potion */ 310 { /* cursed potion */
468 if (got_one) 311 if (got_one)
469 { 312 {
470 fix_player (op); 313 op->update_stats ();
471 new_draw_info (NDI_UNIQUE, 0, op, 314 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
472 "The Gods are angry and punish you.");
473 } 315 }
474 else 316 else
475 new_draw_info (NDI_UNIQUE, 0, op, 317 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
476 "You are fortunate that you are so pathetic.");
477 } 318 }
319
478 decrease_ob (tmp); 320 decrease_ob (tmp);
479 return 1; 321 return 1;
480 } 322 }
481 323
482 324
… …
492 object *fball; 334 object *fball;
493 335
494 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!"); 336 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!");
495 /* Explodes a fireball centered at player */ 337 /* Explodes a fireball centered at player */
496 fball = get_archetype (EXPLODING_FIREBALL); 338 fball = get_archetype (EXPLODING_FIREBALL);
497 fball->dam_modifier =
498 random_roll (1, op->level, op, PREFER_LOW) / 5 + 1; 339 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
499 fball->stats.maxhp =
500 random_roll (1, op->level, op, PREFER_LOW) / 10 + 2; 340 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
501 fball->x = op->x; 341 fball->x = op->x;
502 fball->y = op->y; 342 fball->y = op->y;
503 insert_ob_in_map (fball, op->map, NULL, 0); 343 insert_ob_in_map (fball, op->map, NULL, 0);
504 } 344 }
505 else 345 else
506 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 346 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
507 347
508 decrease_ob (tmp); 348 decrease_ob (tmp);
509 /* if youre dead, no point in doing this... */ 349 /* if youre dead, no point in doing this... */
510 if (!QUERY_FLAG (op, FLAG_REMOVED)) 350 if (!QUERY_FLAG (op, FLAG_REMOVED))
511 fix_player (op); 351 op->update_stats ();
512 return 1; 352 return 1;
513 } 353 }
514 354
515 /* Deal with protection potions */ 355 /* Deal with protection potions */
516 force = NULL; 356 force = NULL;
… …
534 force->stats.food *= 10; 374 force->stats.food *= 10;
535 for (i = 0; i < NROFATTACKS; i++) 375 for (i = 0; i < NROFATTACKS; i++)
536 if (force->resist[i] > 0) 376 if (force->resist[i] > 0)
537 force->resist[i] = -force->resist[i]; /* prot => vuln */ 377 force->resist[i] = -force->resist[i]; /* prot => vuln */
538 } 378 }
379
539 force->speed_left = -1; 380 force->speed_left = -1;
540 force = insert_ob_in_ob (force, op); 381 force = insert_ob_in_ob (force, op);
541 CLEAR_FLAG (tmp, FLAG_APPLIED); 382 CLEAR_FLAG (tmp, FLAG_APPLIED);
542 SET_FLAG (force, FLAG_APPLIED); 383 SET_FLAG (force, FLAG_APPLIED);
543 change_abil (op, force); 384 change_abil (op, force);
… …
546 } 387 }
547 388
548 /* Only thing left are the stat potions */ 389 /* Only thing left are the stat potions */
549 if (op->type == PLAYER) 390 if (op->type == PLAYER)
550 { /* only for players */ 391 { /* only for players */
551 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 392 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0)
552 && tmp->value != 0)
553 CLEAR_FLAG (tmp, FLAG_APPLIED); 393 CLEAR_FLAG (tmp, FLAG_APPLIED);
554 else 394 else
555 SET_FLAG (tmp, FLAG_APPLIED); 395 SET_FLAG (tmp, FLAG_APPLIED);
556 if (!change_abil (op, tmp)) 396 if (!change_abil (op, tmp))
557 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened."); 397 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened.");
… …
561 * that were grouped with the one consumed, his 401 * that were grouped with the one consumed, his
562 * stat will not be raised by them. fix_player just clears 402 * stat will not be raised by them. fix_player just clears
563 * up all the stats. 403 * up all the stats.
564 */ 404 */
565 CLEAR_FLAG (tmp, FLAG_APPLIED); 405 CLEAR_FLAG (tmp, FLAG_APPLIED);
566 fix_player (op); 406 op->update_stats ();
567 decrease_ob (tmp); 407 decrease_ob (tmp);
568 return 1; 408 return 1;
569} 409}
570 410
571/**************************************************************************** 411/****************************************************************************
… …
573 ****************************************************************************/ 413 ****************************************************************************/
574 414
575/** 415/**
576 * This returns the sum of nrof of item (arch name). 416 * This returns the sum of nrof of item (arch name).
577 */ 417 */
418static int
578static int check_item(object *op, const char *item) 419check_item (object *op, const char *item)
579{ 420{
580 int count=0; 421 int count = 0;
581 422
582 423
583 if (item==NULL) return 0; 424 if (item == NULL)
425 return 0;
426
584 op=op->below; 427 op = op->below;
585 while(op!=NULL) { 428 while (op != NULL)
429 {
586 if (strcmp(op->arch->name,item)==0){ 430 if (strcmp (op->arch->name, item) == 0)
431 {
587 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
588 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID) ) 433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
589 { 434 {
590 if (op->nrof == 0)/* this is necessary for artifact sacrifices --FD-- */ 435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
591 count++; 436 count++;
592 else 437 else
593 count += op->nrof; 438 count += op->nrof;
439 }
440 }
441
442 op = op->below;
594 } 443 }
595 } 444
596 op=op->below;
597 }
598 return count; 445 return count;
599} 446}
600 447
601/** 448/**
602 * This removes 'nrof' of what item->slaying says to remove. 449 * This removes 'nrof' of what item->slaying says to remove.
603 * op is typically the player, which is only 450 * op is typically the player, which is only
604 * really used to determine what space to look at. 451 * really used to determine what space to look at.
605 * Modified to only eat 'nrof' of objects. 452 * Modified to only eat 'nrof' of objects.
606 */ 453 */
454static void
607static void eat_item(object *op,const char *item, uint32 nrof) 455eat_item (object *op, const char *item, uint32 nrof)
608{ 456{
609 object *prev; 457 object *prev;
610 458
459 prev = op;
460 op = op->below;
461
462 while (op != NULL)
463 {
464 if (strcmp (op->arch->name, item) == 0)
465 {
466 if (op->nrof >= nrof)
467 {
468 decrease_ob_nr (op, nrof);
469 return;
470 }
471 else
472 {
473 decrease_ob_nr (op, op->nrof);
474 nrof -= op->nrof;
475 }
476 op = prev;
477 }
611 prev = op; 478 prev = op;
612 op=op->below; 479 op = op->below;
613
614 while(op!=NULL) {
615 if (strcmp(op->arch->name,item)==0) {
616 if (op->nrof >= nrof) {
617 decrease_ob_nr(op,nrof);
618 return;
619 } else {
620 decrease_ob_nr(op,op->nrof);
621 nrof -= op->nrof;
622 }
623 op=prev;
624 }
625 prev = op;
626 op=op->below;
627 } 480 }
628} 481}
629 482
630/** 483/**
631 * This checks to see of the player (who) is sufficient level to use a weapon 484 * This checks to see of the player (who) is sufficient level to use a weapon
632 * with improvs improvements (typically last_eat). We take an int here 485 * with improvs improvements (typically last_eat). We take an int here
633 * instead of the object so that the improvement code can pass along the 486 * instead of the object so that the improvement code can pass along the
634 * increased value to see if the object is usuable. 487 * increased value to see if the object is usuable.
635 * we return 1 (true) if the player can use the weapon. 488 * we return 1 (true) if the player can use the weapon.
636 */ 489 */
490static int
637static int check_weapon_power(const object *who, int improvs) 491check_weapon_power (const object *who, int improvs)
638{ 492{
493
639/* Old code is below (commented out). Basically, since weapons are the only 494/* Old code is below (commented out). Basically, since weapons are the only
640 * object players really have any control to improve, it's a bit harsh to 495 * object players really have any control to improve, it's a bit harsh to
641 * require high level in some combat skill, so we just use overall level. 496 * require high level in some combat skill, so we just use overall level.
642 */ 497 */
643#if 1 498#if 1
644 if (((who->level/5)+5) >= improvs) return 1; 499 if (((who->level / 5) + 5) >= improvs)
500 return 1;
501 else
645 else return 0; 502 return 0;
646 503
647#else 504#else
648 int level=0; 505 int level = 0;
649 506
650 /* The skill system hands out wc and dam bonuses to fighters 507 /* The skill system hands out wc and dam bonuses to fighters
651 * more generously than the old system (see fix_player). Thus 508 * more generously than the old system (see fix_player). Thus
652 * we need to curtail the power of player enchanted weapons. 509 * we need to curtail the power of player enchanted weapons.
653 * I changed this to 1 improvement per "fighter" level/5 -b.t. 510 * I changed this to 1 improvement per "fighter" level/5 -b.t.
654 * Note: Nothing should break by allowing this ratio to be different or 511 * Note: Nothing should break by allowing this ratio to be different or
655 * using normal level - it is just a matter of play balance. 512 * using normal level - it is just a matter of play balance.
656 */ 513 */
657 if(who->type==PLAYER) { 514 if (who->type == PLAYER)
515 {
658 object *wc_obj=NULL; 516 object *wc_obj = NULL;
659 517
660 for(wc_obj=who->inv;wc_obj;wc_obj=wc_obj->below) 518 for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
661 if (wc_obj->type == SKILL && IS_COMBAT_SKILL(wc_obj->subtype) && wc_obj->level > level) 519 if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
662 level = wc_obj->level; 520 level = wc_obj->level;
663 521
664 if (!level ) { 522 if (!level)
523 {
665 LOG(llevError,"Error: Player: %s lacks wc experience object\n",who->name); 524 LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
525 level = who->level;
526 }
527 }
528 else
666 level = who->level; 529 level = who->level;
667 }
668 }
669 else
670 level=who->level;
671 530
672 return (improvs <= ((level/5)+5)); 531 return (improvs <= ((level / 5) + 5));
673#endif 532#endif
674} 533}
675 534
676/** 535/**
677 * Returns how many items of type improver->slaying there are under op. 536 * Returns how many items of type improver->slaying there are under op.
678 * Will display a message if none found, and 1 if improver->slaying is NULL. 537 * Will display a message if none found, and 1 if improver->slaying is NULL.
679 */ 538 */
539static int
680static int check_sacrifice(object *op, const object *improver) 540check_sacrifice (object *op, const object *improver)
681{ 541{
682 int count=0; 542 int count = 0;
683 543
684 if (improver->slaying!=NULL) { 544 if (improver->slaying != NULL)
545 {
685 count = check_item(op,improver->slaying); 546 count = check_item (op, improver->slaying);
686 if (count<1) { 547 if (count < 1)
548 {
687 char buf[200]; 549 char buf[200];
550
688 sprintf(buf,"The gods want more %ss",improver->slaying); 551 sprintf (buf, "The gods want more %ss", &improver->slaying);
689 new_draw_info(NDI_UNIQUE,0,op,buf); 552 new_draw_info (NDI_UNIQUE, 0, op, buf);
690 return 0; 553 return 0;
691 } 554 }
692 } 555 }
693 else 556 else
694 count=1; 557 count = 1;
695 558
696 return count; 559 return count;
697} 560}
698 561
699/** 562/**
700 * Actually improves the weapon, and tells user. 563 * Actually improves the weapon, and tells user.
701 */ 564 */
702int improve_weapon_stat(object *op,object *improver,object *weapon, 565int
703 signed char *stat,int sacrifice_count,const char *statname) 566improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname)
704{ 567{
705 568
706 new_draw_info(NDI_UNIQUE,0,op,"Your sacrifice was accepted."); 569 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
707 *stat += sacrifice_count; 570 *stat += sacrifice_count;
708 weapon->last_eat++; 571 weapon->last_eat++;
709 new_draw_info_format(NDI_UNIQUE,0,op, 572 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
710 "Weapon's bonus to %s improved by %d",statname,sacrifice_count);
711 decrease_ob(improver); 573 decrease_ob (improver);
712 574
713 /* So it updates the players stats and the window */ 575 /* So it updates the players stats and the window */
714 fix_player(op); 576 op->update_stats ();
715 return 1; 577 return 1;
716} 578}
717 579
718/* Types of improvements, hidden in the sp field. */ 580/* Types of improvements, hidden in the sp field. */
719#define IMPROVE_PREPARE 1 581#define IMPROVE_PREPARE 1
… …
732/** 594/**
733 * This does the prepare weapon scroll. 595 * This does the prepare weapon scroll.
734 * Checks for sacrifice, and so on. 596 * Checks for sacrifice, and so on.
735 */ 597 */
736 598
599int
737int prepare_weapon(object *op, object *improver, object *weapon) 600prepare_weapon (object *op, object *improver, object *weapon)
738{ 601{
739 int sacrifice_count,i; 602 int sacrifice_count, i;
740 char buf[MAX_BUF]; 603 char buf[MAX_BUF];
741 604
742 if (weapon->level!=0) { 605 if (weapon->level != 0)
606 {
743 new_draw_info(NDI_UNIQUE,0,op,"Weapon already prepared."); 607 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared.");
744 return 0; 608 return 0;
745 } 609 }
746 for (i=0; i<NROFATTACKS; i++) 610 for (i = 0; i < NROFATTACKS; i++)
747 if (weapon->resist[i]) break; 611 if (weapon->resist[i])
612 break;
748 613
749 /* If we break out, i will be less than nrofattacks, preventing 614 /* If we break out, i will be less than nrofattacks, preventing
750 * improvement of items that already have protections. 615 * improvement of items that already have protections.
751 */ 616 */
752 if (i<NROFATTACKS || 617 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
753 weapon->stats.hp || /* regeneration */
754 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 618 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
755 weapon->stats.exp || /* speed */ 619 weapon->stats.exp || /* speed */
756 weapon->stats.ac) /* AC - only taifu's I think */ 620 weapon->stats.ac) /* AC - only taifu's I think */
757 { 621 {
758 new_draw_info(NDI_UNIQUE,0,op,"Cannot prepare magic weapons."); 622 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons.");
759 return 0; 623 return 0;
760 } 624 }
761 sacrifice_count=check_sacrifice(op,improver); 625 sacrifice_count = check_sacrifice (op, improver);
762 if (sacrifice_count<=0) 626 if (sacrifice_count <= 0)
763 return 0; 627 return 0;
764 weapon->level=isqrt(sacrifice_count); 628 weapon->level = isqrt (sacrifice_count);
765 new_draw_info(NDI_UNIQUE,0,op,"Your sacrifice was accepted."); 629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
766 eat_item(op, improver->slaying, sacrifice_count); 630 eat_item (op, improver->slaying, sacrifice_count);
767 631
768 new_draw_info_format(NDI_UNIQUE, 0, op,"Your *%s may be improved %d times.", 632 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level);
769 weapon->name,weapon->level);
770 633
771 sprintf(buf,"%s's %s",op->name,weapon->name); 634 sprintf (buf, "%s's %s", &op->name, &weapon->name);
772 FREE_AND_COPY(weapon->name, buf); 635 weapon->name = weapon->name_pl = buf;
773 FREE_AND_COPY(weapon->name_pl, buf);
774 weapon->nrof=0; /* prevents preparing n weapons in the same 636 weapon->nrof = 0; /* prevents preparing n weapons in the same
775 slot at once! */ 637 slot at once! */
776 decrease_ob(improver); 638 decrease_ob (improver);
777 weapon->last_eat=0; 639 weapon->last_eat = 0;
778 return 1; 640 return 1;
779} 641}
780 642
781 643
782/** 644/**
783 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 645 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
… …
788 * 650 *
789 * We are hiding extra information about the weapon in the level and 651 * We are hiding extra information about the weapon in the level and
790 * last_eat numbers for an object. Hopefully this won't break anything ?? 652 * last_eat numbers for an object. Hopefully this won't break anything ??
791 * level == max improve last_eat == current improve 653 * level == max improve last_eat == current improve
792 */ 654 */
655int
793int improve_weapon(object *op,object *improver,object *weapon) 656improve_weapon (object *op, object *improver, object *weapon)
794{ 657{
795 int sacrifice_count, sacrifice_needed=0; 658 int sacrifice_count, sacrifice_needed = 0;
796 659
797 if(improver->stats.sp==IMPROVE_PREPARE) { 660 if (improver->stats.sp == IMPROVE_PREPARE)
661 {
798 return prepare_weapon(op, improver, weapon); 662 return prepare_weapon (op, improver, weapon);
799 } 663 }
800 if (weapon->level==0) { 664 if (weapon->level == 0)
665 {
801 new_draw_info(NDI_UNIQUE, 0,op,"This weapon has not been prepared."); 666 new_draw_info (NDI_UNIQUE, 0, op, "This weapon has not been prepared.");
802 return 0; 667 return 0;
803 } 668 }
804 if (weapon->level==weapon->last_eat && weapon->item_power >=100) { 669 if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
670 {
805 new_draw_info(NDI_UNIQUE, 0,op,"This weapon cannot be improved any more."); 671 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more.");
806 return 0; 672 return 0;
807 } 673 }
808 if (QUERY_FLAG(weapon, FLAG_APPLIED) && 674 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
809 !check_weapon_power(op, weapon->last_eat+1)) { 675 {
810 new_draw_info(NDI_UNIQUE, 0,op,"Improving the weapon will make it too"); 676 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too");
811 new_draw_info(NDI_UNIQUE, 0,op,"powerful for you to use. Unready it if you"); 677 new_draw_info (NDI_UNIQUE, 0, op, "powerful for you to use. Unready it if you");
812 new_draw_info(NDI_UNIQUE, 0,op,"really want to improve it."); 678 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it.");
813 return 0; 679 return 0;
814 } 680 }
815 /* This just increases damage by 5 points, no matter what. No sacrifice 681 /* This just increases damage by 5 points, no matter what. No sacrifice
816 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 682 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
817 * don't put any maximum value on damage - the limit is how much the 683 * don't put any maximum value on damage - the limit is how much the
818 * weapon can be improved. 684 * weapon can be improved.
819 */ 685 */
820 if (improver->stats.sp==IMPROVE_DAMAGE) { 686 if (improver->stats.sp == IMPROVE_DAMAGE)
687 {
821 weapon->stats.dam += 5; 688 weapon->stats.dam += 5;
822 weapon->weight += 5000; /* 5 KG's */ 689 weapon->weight += 5000; /* 5 KG's */
823 new_draw_info_format(NDI_UNIQUE, 0, op, 690 new_draw_info_format (NDI_UNIQUE, 0, op, "Damage has been increased by 5 to %d", weapon->stats.dam);
824 "Damage has been increased by 5 to %d", weapon->stats.dam);
825 weapon->last_eat++; 691 weapon->last_eat++;
826 692
827 weapon->item_power++; 693 weapon->item_power++;
828 decrease_ob(improver); 694 decrease_ob (improver);
829 return 1; 695 return 1;
830 } 696 }
831 if (improver->stats.sp == IMPROVE_WEIGHT) { 697 if (improver->stats.sp == IMPROVE_WEIGHT)
698 {
832 /* Reduce weight by 20% */ 699 /* Reduce weight by 20% */
833 weapon->weight = (weapon->weight * 8)/10; 700 weapon->weight = (weapon->weight * 8) / 10;
834 if (weapon->weight < 1) weapon->weight = 1; 701 if (weapon->weight < 1)
835 new_draw_info_format(NDI_UNIQUE, 0, op, 702 weapon->weight = 1;
836 "Weapon weight reduced to %6.1f kg", 703 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon weight reduced to %6.1f kg", (float) weapon->weight / 1000.0);
837 (float)weapon->weight/1000.0);
838 weapon->last_eat++; 704 weapon->last_eat++;
839 weapon->item_power++; 705 weapon->item_power++;
840 decrease_ob(improver); 706 decrease_ob (improver);
841 return 1; 707 return 1;
842 } 708 }
843 if (improver->stats.sp == IMPROVE_ENCHANT) { 709 if (improver->stats.sp == IMPROVE_ENCHANT)
710 {
844 weapon->magic++; 711 weapon->magic++;
845 weapon->last_eat++; 712 weapon->last_eat++;
846 new_draw_info_format(NDI_UNIQUE, 0, op 713 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon magic increased to %d", weapon->magic);
847 ,"Weapon magic increased to %d",weapon->magic);
848 decrease_ob(improver); 714 decrease_ob (improver);
849 weapon->item_power++; 715 weapon->item_power++;
850 return 1; 716 return 1;
851 } 717 }
852 718
853 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex+ 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
854 weapon->stats.Pow + weapon->stats.Con + weapon->stats.Cha + 720 weapon->stats.Pow + weapon->stats.Con + weapon->stats.Cha + weapon->stats.Wis;
855 weapon->stats.Wis;
856 721
857 if (sacrifice_needed<1) 722 if (sacrifice_needed < 1)
858 sacrifice_needed =1; 723 sacrifice_needed = 1;
859 sacrifice_needed *=2; 724 sacrifice_needed *= 2;
860 725
861 sacrifice_count = check_sacrifice(op,improver); 726 sacrifice_count = check_sacrifice (op, improver);
862 if (sacrifice_count < sacrifice_needed) { 727 if (sacrifice_count < sacrifice_needed)
863 new_draw_info_format(NDI_UNIQUE, 0, op, 728 {
864 "You need at least %d %s", sacrifice_needed, improver->slaying); 729 new_draw_info_format (NDI_UNIQUE, 0, op, "You need at least %d %s", sacrifice_needed, &improver->slaying);
865 return 0; 730 return 0;
866 } 731 }
867 eat_item(op,improver->slaying, sacrifice_needed); 732 eat_item (op, improver->slaying, sacrifice_needed);
868 weapon->item_power++; 733 weapon->item_power++;
869 734
870 switch (improver->stats.sp) { 735 switch (improver->stats.sp)
736 {
871 case IMPROVE_STR: 737 case IMPROVE_STR:
872 return improve_weapon_stat(op,improver,weapon, 738 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Str), 1, "strength");
873 (signed char *) &(weapon->stats.Str),
874 1, "strength");
875 case IMPROVE_DEX: 739 case IMPROVE_DEX:
876 return improve_weapon_stat(op,improver,weapon, 740 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Dex), 1, "dexterity");
877 (signed char *) &(weapon->stats.Dex),
878 1, "dexterity");
879 case IMPROVE_CON: 741 case IMPROVE_CON:
880 return improve_weapon_stat(op,improver,weapon, 742 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Con), 1, "constitution");
881 (signed char *) &(weapon->stats.Con),
882 1, "constitution");
883 case IMPROVE_WIS: 743 case IMPROVE_WIS:
884 return improve_weapon_stat(op,improver,weapon, 744 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Wis), 1, "wisdom");
885 (signed char *) &(weapon->stats.Wis),
886 1, "wisdom");
887 case IMPROVE_CHA: 745 case IMPROVE_CHA:
888 return improve_weapon_stat(op,improver,weapon, 746 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Cha), 1, "charisma");
889 (signed char *) &(weapon->stats.Cha),
890 1, "charisma");
891 case IMPROVE_INT: 747 case IMPROVE_INT:
892 return improve_weapon_stat(op,improver,weapon, 748 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Int), 1, "intelligence");
893 (signed char *) &(weapon->stats.Int),
894 1, "intelligence");
895 case IMPROVE_POW: 749 case IMPROVE_POW:
896 return improve_weapon_stat(op,improver,weapon, 750 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Pow), 1, "power");
897 (signed char *) &(weapon->stats.Pow),
898 1, "power");
899 default: 751 default:
900 new_draw_info(NDI_UNIQUE, 0,op,"Unknown improvement type."); 752 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type.");
901 } 753 }
902 LOG(llevError,"improve_weapon: Got to end of function\n"); 754 LOG (llevError, "improve_weapon: Got to end of function\n");
903 return 0; 755 return 0;
904} 756}
905 757
906/** 758/**
907 * Handles the applying of improve/prepare/enchant weapon scroll. 759 * Handles the applying of improve/prepare/enchant weapon scroll.
908 * Checks a few things (not on a non-magic square, marked weapon, ...), 760 * Checks a few things (not on a non-magic square, marked weapon, ...),
909 * then calls improve_weapon to do the dirty work. 761 * then calls improve_weapon to do the dirty work.
910 */ 762 */
763int
911int check_improve_weapon (object *op, object *tmp) 764check_improve_weapon (object *op, object *tmp)
912{ 765{
913 object *otmp; 766 object *otmp;
914 767
915 if(op->type!=PLAYER) 768 if (op->type != PLAYER)
769 return 0;
770
771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
772 {
773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
916 return 0; 774 return 0;
917 if (!QUERY_FLAG(op, FLAG_WIZCAST) && (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) {
918 new_draw_info(NDI_UNIQUE, 0,op,"Something blocks the magic of the scroll.");
919 return 0;
920 } 775 }
776
921 otmp=find_marked_object(op); 777 otmp = find_marked_object (op);
922 if(!otmp) { 778 if (!otmp)
779 {
923 new_draw_info(NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
924 return 0; 781 return 0;
925 } 782 }
783
926 if (otmp->type != WEAPON && otmp->type != BOW) { 784 if (otmp->type != WEAPON && otmp->type != BOW)
785 {
927 new_draw_info(NDI_UNIQUE, 0,op,"Marked item is not a weapon or bow"); 786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
928 return 0; 787 return 0;
929 } 788 }
789
930 new_draw_info(NDI_UNIQUE, 0,op,"Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
931 improve_weapon(op,tmp,otmp); 791 improve_weapon (op, tmp, otmp);
932 esrv_send_item(op, otmp); 792 esrv_send_item (op, otmp);
933 return 1; 793 return 1;
934} 794}
935 795
936/** 796/**
937 * This code deals with the armour improvment scrolls. 797 * This code deals with the armour improvment scrolls.
938 * Change limits on improvement - let players go up to 798 * Change limits on improvement - let players go up to
… …
953 * the armour value of the piece of equipment exceed either 813 * the armour value of the piece of equipment exceed either
954 * the users level or 90) 814 * the users level or 90)
955 * Modified by MSW for partial resistance. Only support 815 * Modified by MSW for partial resistance. Only support
956 * changing of physical area right now. 816 * changing of physical area right now.
957 */ 817 */
818int
958int improve_armour(object *op, object *improver, object *armour) 819improve_armour (object *op, object *improver, object *armour)
959{ 820{
960 object *tmp; 821 object *tmp;
961 822
962 if (armour->magic >= settings.armor_max_enchant) { 823 if (armour->magic >= settings.armor_max_enchant)
824 {
963 new_draw_info(NDI_UNIQUE, 0,op,"This armour can not be enchanted any further."); 825 new_draw_info (NDI_UNIQUE, 0, op, "This armour can not be enchanted any further.");
964 return 0; 826 return 0;
965 } 827 }
966 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 828 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
967 * etc), so take the easy way out and don't worry about it. 829 * etc), so take the easy way out and don't worry about it.
968 * Note - maybe add scrolls which make the random artifact versions (eg, armour 830 * Note - maybe add scrolls which make the random artifact versions (eg, armour
969 * of gnarg and what not?) 831 * of gnarg and what not?)
970 */ 832 */
971 if (armour->title) { 833 if (armour->title)
834 {
972 new_draw_info(NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 835 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment.");
973 return 0; 836 return 0;
974 } 837 }
975 838
976 /* Split objects if needed. Can't insert tmp until the 839 /* Split objects if needed. Can't insert tmp until the
977 * end of this function - otherwise it will just re-merge. 840 * end of this function - otherwise it will just re-merge.
978 */ 841 */
979 if(armour->nrof > 1) 842 if (armour->nrof > 1)
980 tmp = get_split_ob(armour,armour->nrof - 1); 843 tmp = get_split_ob (armour, armour->nrof - 1);
981 else 844 else
982 tmp = NULL; 845 tmp = NULL;
983 846
984 armour->magic++; 847 armour->magic++;
985 848
986 if ( !settings.armor_speed_linear ) 849 if (!settings.armor_speed_linear)
987 { 850 {
988 int base = 100; 851 int base = 100;
989 int pow = 0; 852 int pow = 0;
853
990 while ( pow < armour->magic ) 854 while (pow < armour->magic)
991 { 855 {
992 base = base - ( base * settings.armor_speed_improvement ) / 100; 856 base = base - (base * settings.armor_speed_improvement) / 100;
993 pow++; 857 pow++;
994 } 858 }
995 859
996 ARMOUR_SPEED( armour ) = ( ARMOUR_SPEED( &armour->arch->clone ) * base ) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100;
997 } 861 }
998 else 862 else
999 ARMOUR_SPEED( armour ) = ( ARMOUR_SPEED( &armour->arch->clone ) * ( 100 + armour->magic * settings.armor_speed_improvement ) )/100; 863 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
1000 864
1001 if ( !settings.armor_weight_linear ) 865 if (!settings.armor_weight_linear)
1002 { 866 {
1003 int base = 100; 867 int base = 100;
1004 int pow = 0; 868 int pow = 0;
869
1005 while ( pow < armour->magic ) 870 while (pow < armour->magic)
1006 { 871 {
1007 base = base - ( base * settings.armor_weight_reduction ) / 100; 872 base = base - (base * settings.armor_weight_reduction) / 100;
1008 pow++; 873 pow++;
1009 } 874 }
1010 875
1011 armour->weight = ( armour->arch->clone.weight * base ) / 100; 876 armour->weight = (armour->arch->clone.weight * base) / 100;
1012 } 877 }
1013 else 878 else
1014 armour->weight = ( armour->arch->clone.weight * ( 100 - armour->magic * settings.armor_weight_reduction ) ) / 100; 879 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
1015 880
1016 if ( armour->weight <= 0 ) 881 if (armour->weight <= 0)
1017 { 882 {
1018 LOG( llevInfo, "Warning: enchanted armours can have negative weight\n." ); 883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
1019 armour->weight = 1; 884 armour->weight = 1;
1020 } 885 }
1021 886
1022 armour->item_power = get_power_from_ench(armour->arch->clone.item_power + armour->magic); 887 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic);
1023 888
1024 if (op->type == PLAYER) { 889 if (op->type == PLAYER)
890 {
1025 esrv_send_item(op, armour); 891 esrv_send_item (op, armour);
1026 if(QUERY_FLAG(armour, FLAG_APPLIED)) 892 if (QUERY_FLAG (armour, FLAG_APPLIED))
1027 fix_player(op); 893 op->update_stats ();
1028 } 894 }
1029 decrease_ob(improver); 895 decrease_ob (improver);
1030 if (tmp) { 896 if (tmp)
897 {
1031 insert_ob_in_ob(tmp, op); 898 insert_ob_in_ob (tmp, op);
1032 esrv_send_item(op, tmp); 899 esrv_send_item (op, tmp);
1033 } 900 }
1034 return 1; 901 return 1;
1035} 902}
1036 903
1037 904
1038/* 905/*
1039 * convert_item() returns 1 if anything was converted, 0 if the item was not 906 * convert_item() returns 1 if anything was converted, 0 if the item was not
… …
1047/* Takes one items and makes another. 914/* Takes one items and makes another.
1048 * converter is the object that is doing the conversion. 915 * converter is the object that is doing the conversion.
1049 * item is the object that triggered the converter - if it is not 916 * item is the object that triggered the converter - if it is not
1050 * what the converter wants, this will not do anything. 917 * what the converter wants, this will not do anything.
1051 */ 918 */
919int
1052int convert_item(object *item, object *converter) { 920convert_item (object *item, object *converter)
921{
1053 int nr=0; 922 int nr = 0;
1054 object *tmp;
1055 int is_in_shop;
1056 uint32 price_in; 923 uint32 price_in;
1057 924
1058 for(tmp = get_map_ob(converter->map, converter->x, converter->y);
1059 tmp != NULL;
1060 tmp = tmp->above) {
1061 if(tmp->type == SHOP_FLOOR)
1062 break;
1063 }
1064 is_in_shop = (tmp != NULL);
1065
1066 /* We make some assumptions - we assume if it takes money as it type, 925 /* We make some assumptions - we assume if it takes money as it type,
1067 * it wants some amount. We don't make change (ie, if something costs 926 * it wants some amount. We don't make change (ie, if something costs
1068 * 3 gp and player drops a platinum, tough luck) 927 * 3 gp and player drops a platinum, tough luck)
1069 */ 928 */
1070 if (!strcmp(CONV_FROM(converter),"money")) { 929 if (!strcmp (CONV_FROM (converter), "money"))
1071 int cost; 930 {
931 int cost;
1072 932
1073 if(item->type!=MONEY) 933 if (item->type != MONEY)
1074 return 0; 934 return 0;
1075 935
1076 nr=(item->nrof*item->value)/CONV_NEED(converter); 936 nr = (item->nrof * item->value) / CONV_NEED (converter);
1077 if (!nr) return 0; 937 if (!nr)
938 return 0;
1078 cost=nr*CONV_NEED(converter)/item->value; 939 cost = nr * CONV_NEED (converter) / item->value;
1079 /* take into account rounding errors */ 940 /* take into account rounding errors */
1080 if (nr*CONV_NEED(converter)%item->value) cost++; 941 if (nr * CONV_NEED (converter) % item->value)
942 cost++;
1081 decrease_ob_nr(item, cost); 943 decrease_ob_nr (item, cost);
1082 944
1083 price_in = cost*item->value; 945 price_in = cost * item->value;
946 }
947 else
1084 } 948 {
1085 else {
1086 if(item->type==PLAYER||CONV_FROM(converter)!=item->arch->name|| 949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name ||
1087 (CONV_NEED(converter)&&CONV_NEED(converter)>item->nrof)) 950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
1088 return 0; 951 return 0;
1089 952
1090 if(CONV_NEED(converter)) { 953 if (CONV_NEED (converter))
954 {
1091 nr=item->nrof/CONV_NEED(converter); 955 nr = item->nrof / CONV_NEED (converter);
1092 decrease_ob_nr(item,nr*CONV_NEED(converter)); 956 decrease_ob_nr (item, nr * CONV_NEED (converter));
1093 price_in = nr*CONV_NEED(converter)*item->value; 957 price_in = nr * CONV_NEED (converter) * item->value;
1094 } else { 958 }
959 else
960 {
1095 price_in = item->value; 961 price_in = item->value;
1096 remove_ob(item); 962 item->destroy ();
1097 free_object(item); 963 }
1098 }
1099 } 964 }
1100 965
1101 if (converter->inv != NULL) { 966 if (converter->inv != NULL)
967 {
1102 object *ob; 968 object *ob;
1103 int i; 969 int i;
1104 object *ob_to_copy; 970 object *ob_to_copy;
1105 971
1106 /* select random object from inventory to copy */ 972 /* select random object from inventory to copy */
1107 ob_to_copy = converter->inv; 973 ob_to_copy = converter->inv;
1108 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) { 974 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++)
975 {
1109 if (rndm(0, i) == 0) { 976 if (rndm (0, i) == 0)
1110 ob_to_copy = ob; 977 {
978 ob_to_copy = ob;
979 }
980 }
981 item = object_create_clone (ob_to_copy);
982 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
983 unflag_inv (item, FLAG_IS_A_TEMPLATE);
1111 } 984 }
1112 } 985 else
1113 item = object_create_clone(ob_to_copy); 986 {
1114 CLEAR_FLAG(item, FLAG_IS_A_TEMPLATE);
1115 unflag_inv(item, FLAG_IS_A_TEMPLATE);
1116 } else {
1117 if (converter->other_arch == NULL) { 987 if (converter->other_arch == NULL)
1118 LOG(llevError,"move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", converter->name ? converter->name : "(null)", converter->map->path, converter->x, converter->y); 988 {
989 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
990 &converter->name, &converter->map->path, converter->x, converter->y);
1119 return -1; 991 return -1;
1120 } 992 }
1121 993
1122 item = object_create_arch(converter->other_arch); 994 item = object_create_arch (converter->other_arch);
1123 fix_generated_item(item, converter, 0, 0, GT_MINIMAL); 995 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1124 } 996 }
1125 997
1126 if(CONV_NR(converter)) 998 if (CONV_NR (converter))
1127 item->nrof=CONV_NR(converter); 999 item->nrof = CONV_NR (converter);
1128 if(nr) 1000 if (nr)
1129 item->nrof*=nr; 1001 item->nrof *= nr;
1130 if(is_in_shop) 1002 if (is_in_shop (converter))
1131 SET_FLAG(item,FLAG_UNPAID); 1003 SET_FLAG (item, FLAG_UNPAID);
1132 else if(price_in < item->nrof*item->value) { 1004 else if (price_in < item->nrof * item->value)
1005 {
1133 LOG(llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1134 converter->name, converter->map->path, converter->x, converter->y, price_in, 1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1135 item->nrof*item->value, item->name); 1008
1136 /** 1009 /**
1137 * elmex: we are going to let the game continue, as the mapcreator 1010 * elmex: we are going to let the game continue, as the mapcreator
1138 * propably had something in mind when doing this 1011 * propably had something in mind when doing this
1139 */ 1012 */
1140 } 1013 }
1141 insert_ob_in_map_at(item, converter->map, converter, 0, converter->x, converter->y); 1014 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1142 return 1; 1015 return 1;
1143} 1016}
1144 1017
1145/** 1018/**
1146 * Handle apply on containers. 1019 * Handle apply on containers.
1147 * By Eneq(@csd.uu.se). 1020 * By Eneq(@csd.uu.se).
1148 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1021 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1149 * added the alchemical cauldron to the code -b.t. 1022 * added the alchemical cauldron to the code -b.t.
1150 */ 1023 */
1151 1024int
1152int apply_container (object *op, object *sack) 1025apply_container (object *op, object *sack)
1153{ 1026{
1154 char buf[MAX_BUF]; 1027 if (op->type != PLAYER || !op->contr->ns)
1155 object *tmp; 1028 return 0; /* This might change */
1156 1029
1157 if(op->type!=PLAYER)
1158 return 0; /* This might change */
1159
1160 if (sack==NULL || sack->type != CONTAINER) { 1030 if (!sack || sack->type != CONTAINER)
1031 {
1161 LOG (llevError, "apply_container: %s is not container!\n",sack?sack->name:"NULL"); 1032 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1162 return 0; 1033 return 0;
1163 } 1034 }
1164 op->contr->last_used = NULL; 1035
1165 op->contr->last_used_id = 0; 1036 op->contr->last_used = 0;
1166 1037
1167 if (sack->env!=op) { 1038 if (sack->env && sack->env != op)
1168 if (sack->other_arch == NULL || sack->env != NULL) {
1169 new_draw_info(NDI_UNIQUE, 0,op,"You must get it first.");
1170 return 1;
1171 }
1172 /* It's on the ground, the problems begin */
1173 if (op->container != sack) {
1174 /* it's closed OR some player has opened it */
1175 if (QUERY_FLAG(sack, FLAG_APPLIED)) {
1176 for(tmp=get_map_ob(sack->map, sack->x, sack->y);
1177 tmp && tmp->container != sack; tmp=tmp->above);
1178 if (tmp) {
1179 /* some other player have opened it */
1180 new_draw_info_format(NDI_UNIQUE, 0, op,
1181 "%s is already occupied.", query_name(sack));
1182 return 1;
1183 }
1184 }
1185 }
1186 if ( QUERY_FLAG(sack, FLAG_APPLIED)) {
1187 if (op->container == NULL) {
1188 tmp = arch_to_object (sack->other_arch);
1189 /* not good, but insert_ob_in_ob() is too smart */
1190 CLEAR_FLAG (tmp, FLAG_REMOVED);
1191 tmp->x= tmp->y = tmp->ox = tmp->oy = 0;
1192 tmp->map = NULL;
1193 tmp->env = sack;
1194 if (sack->inv)
1195 sack->inv->above = tmp;
1196 tmp->below = sack->inv;
1197 tmp->above = NULL;
1198 sack->inv = tmp;
1199 sack->move_off = MOVE_ALL; /* trying force closing it */
1200 } else {
1201 sack->move_off = 0;
1202 tmp = sack->inv;
1203 if (tmp && tmp->type == CLOSE_CON) {
1204 remove_ob(tmp);
1205 free_object (tmp);
1206 }
1207 }
1208 }
1209 } 1039 {
1210 1040 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1211 if (QUERY_FLAG (sack, FLAG_APPLIED)) {
1212 if (op->container) {
1213 if (op->container != sack) {
1214 tmp = op->container;
1215 apply_container (op, tmp);
1216 sprintf (buf, "You close %s and open ", query_name(tmp));
1217 op->container = sack;
1218 strcat (buf, query_name(sack));
1219 strcat (buf, ".");
1220 } else {
1221 CLEAR_FLAG (sack, FLAG_APPLIED);
1222 op->container = NULL;
1223 sprintf (buf, "You close %s.", query_name(sack));
1224 }
1225 } else {
1226 CLEAR_FLAG (sack, FLAG_APPLIED);
1227 sprintf (buf, "You open %s.", query_name(sack));
1228 SET_FLAG (sack, FLAG_APPLIED);
1229 op->container = sack;
1230 }
1231 } else { /* not applied */
1232 if (sack->slaying) { /* it's locked */
1233 tmp = find_key(op, op, sack);
1234 if (tmp) {
1235 sprintf (buf, "You unlock %s with %s.", query_name(sack), query_name(tmp));
1236 SET_FLAG (sack, FLAG_APPLIED);
1237 if (sack->env == NULL) { /* if it's on ground,open it also */
1238 new_draw_info (NDI_UNIQUE,0,op, buf);
1239 apply_container (op, sack);
1240 return 1; 1041 return 1;
1241 } 1042 }
1242 } else { 1043
1243 sprintf (buf, "You don't have the key to unlock %s.", 1044 // already applied == open on ground, or open in inv, or active in inv
1244 query_name(sack)); 1045 if (sack->flag [FLAG_APPLIED])
1245 }
1246 } else {
1247 sprintf (buf, "You readied %s.", query_name(sack));
1248 SET_FLAG (sack, FLAG_APPLIED);
1249 if (sack->env == NULL) { /* if it's on ground,open it also */
1250 new_draw_info (NDI_UNIQUE, 0, op, buf);
1251 apply_container (op, sack);
1252 return 1;
1253 }
1254 }
1255 } 1046 {
1256 new_draw_info (NDI_UNIQUE, 0, op, buf); 1047 if (op->container == sack)
1257 if (op->contr) op->contr->socket.update_look=1; 1048 {
1258 return 1; 1049 // open on ground or inv, so close
1259} 1050 op->close_container ();
1260
1261/**
1262 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1263 * the player has in their inventory, eg, sacks, luggages, etc.
1264 *
1265 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1266 * This version is for client/server mode.
1267 * op is the player, sack is the container the player is opening or closing.
1268 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1269 *
1270 * Reminder - there are three states for any container - closed (non applied),
1271 * applied (not open, but objects that match get tossed into it), and open
1272 * (applied flag set, and op->container points to the open container)
1273 */
1274
1275int esrv_apply_container (object *op, object *sack)
1276{
1277 object *tmp=op->container;
1278 if(op->type!=PLAYER)
1279 return 0; /* This might change */
1280
1281 if (sack==NULL || sack->type != CONTAINER) {
1282 LOG (llevError,
1283 "esrv_apply_container: %s is not container!\n",sack?sack->name:"NULL");
1284 return 0;
1285 }
1286
1287 /* If we have a currently open container, then it needs to be closed in all cases
1288 * if we are opening this one up. We then fall through if appropriate for
1289 * openening the new container.
1290 */
1291
1292 if (op->container && QUERY_FLAG(sack, FLAG_APPLIED)) {
1293 if (op->container->env != op) { /* if container is on the ground */
1294 op->container->move_off = 0;
1295 }
1296 /* Lauwenmark: Handle for plugin close event */
1297 if (execute_event(tmp, EVENT_CLOSE,op,NULL,NULL,SCRIPT_FIX_ALL)!=0)
1298 return 1; 1051 return 1;
1299
1300 new_draw_info_format(NDI_UNIQUE, 0, op, "You close %s.",
1301 query_name(op->container));
1302 CLEAR_FLAG(op->container, FLAG_APPLIED);
1303 op->container=NULL;
1304 esrv_update_item (UPD_FLAGS, op, tmp);
1305 if (tmp == sack) return 1;
1306 }
1307
1308
1309 /* If the player is trying to open it (which he must be doing if we got here),
1310 * and it is locked, check to see if player has the equipment to open it.
1311 */
1312
1313 if (sack->slaying) { /* it's locked */
1314 tmp=find_key(op, op, sack);
1315 if (tmp) {
1316 new_draw_info_format(NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name(sack), query_name(tmp));
1317 } else {
1318 new_draw_info_format(NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.",
1319 query_name(sack));
1320 return 0;
1321 } 1052 }
1053 else if (!sack->env)
1054 {
1055 // active, but not ours: some other player has opened it
1056 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1057 return 1;
1058 }
1059
1060 // fall through to opening it (active in inv)
1061 }
1062 else if (sack->env)
1322 } 1063 {
1323 1064 // it is in our env, so activate it, do not open yet
1324 /* By the time we get here, we have made sure any other container has been closed and 1065 op->close_container ();
1325 * if this is a locked container, the player they key to open it. 1066 sack->flag [FLAG_APPLIED] = 1;
1326 */
1327
1328 /* There are really two cases - the sack is either on the ground, or the sack is
1329 * part of the players inventory. If on the ground, we assume that the player is
1330 * opening it, since if it was being closed, that would have been taken care of above.
1331 */
1332
1333
1334 if (sack->env != op) {
1335 /* Hypothetical case - the player is trying to open a sack that belong to someone
1336 * else. This normally should not happen, but a misbehaving client/player could
1337 * try to do it, so lets handle it gracefully.
1338 */
1339 if (sack->env) {
1340 new_draw_info_format(NDI_UNIQUE, 0, op, "You can't open %s",
1341 query_name(sack));
1342 return 0;
1343 }
1344 /* set these so when the player walks off, we can unapply the sack */
1345 sack->move_off = MOVE_ALL; /* trying force closing it */
1346
1347 CLEAR_FLAG (sack, FLAG_APPLIED);
1348 new_draw_info_format(NDI_UNIQUE, 0, op, "You open %s.", query_name(sack));
1349 SET_FLAG (sack, FLAG_APPLIED);
1350 op->container = sack;
1351 esrv_update_item (UPD_FLAGS, op, sack);
1352 esrv_send_inventory (op, sack);
1353
1354 } else { /* sack is in players inventory */
1355 if (QUERY_FLAG (sack, FLAG_APPLIED)) { /* readied sack becoming open */
1356 CLEAR_FLAG (sack, FLAG_APPLIED);
1357 new_draw_info_format(NDI_UNIQUE, 0, op, "You open %s.", query_name(sack));
1358 SET_FLAG (sack, FLAG_APPLIED);
1359 op->container = sack;
1360 esrv_update_item (UPD_FLAGS, op, sack); 1067 esrv_update_item (UPD_FLAGS, op, sack);
1361 esrv_send_inventory (op, sack);
1362 }
1363 else {
1364 CLEAR_FLAG (sack, FLAG_APPLIED);
1365 new_draw_info_format(NDI_UNIQUE, 0, op, "You readied %s.", query_name(sack)); 1068 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1366 SET_FLAG (sack, FLAG_APPLIED);
1367 esrv_update_item (UPD_FLAGS, op, sack);
1368 }
1369 }
1370 return 1; 1069 return 1;
1371} 1070 }
1372 1071
1072 // it's locked?
1073 if (sack->slaying)
1074 {
1075 if (object *tmp = find_key (op, op, sack))
1076 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1077 else
1078 {
1079 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1080 return 1;
1081 }
1082 }
1083
1084 op->open_container (sack);
1085
1086 return 1;
1087}
1373 1088
1374/** 1089/**
1375 * Handles dropping things on altar. 1090 * Handles dropping things on altar.
1376 * Returns true if sacrifice was accepted. 1091 * Returns true if sacrifice was accepted.
1377 */ 1092 */
1093static int
1378static int apply_altar (object *altar, object *sacrifice, object *originator) 1094apply_altar (object *altar, object *sacrifice, object *originator)
1379{ 1095{
1380 /* Only players can make sacrifices on spell casting altars. */ 1096 /* Only players can make sacrifices on spell casting altars. */
1381 if (altar->inv && ( ! originator || originator->type != PLAYER)) 1097 if (altar->inv && (!originator || originator->type != PLAYER))
1382 return 0; 1098 return 0;
1383 1099
1384 if (operate_altar (altar, &sacrifice)) { 1100 if (operate_altar (altar, &sacrifice))
1101 {
1385 /* Simple check. Unfortunately, it means you can't cast magic bullet 1102 /* Simple check. Unfortunately, it means you can't cast magic bullet
1386 * with an altar. We call it a Potion - altars are stationary - it 1103 * with an altar. We call it a Potion - altars are stationary - it
1387 * is up to map designers to use them properly. 1104 * is up to map designers to use them properly.
1388 */ 1105 */
1389 if (altar->inv && altar->inv->type==SPELL) { 1106 if (altar->inv && altar->inv->type == SPELL)
1107 {
1390 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", 1108 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name);
1391 altar->inv->name);
1392 cast_spell (originator, altar, 0, altar->inv, NULL); 1109 cast_spell (originator, altar, 0, altar->inv, NULL);
1393 /* If it is connected, push the button. Fixes some problems with 1110 /* If it is connected, push the button. Fixes some problems with
1394 * old maps. 1111 * old maps.
1395 */ 1112 */
1113
1396/* push_button (altar);*/ 1114/* push_button (altar);*/
1397 } else { 1115 }
1116 else
1117 {
1398 altar->value = 1; /* works only once */ 1118 altar->value = 1; /* works only once */
1399 push_button (altar); 1119 push_button (altar);
1400 } 1120 }
1401 return sacrifice == NULL; 1121
1402 } else { 1122 return !sacrifice;
1123 }
1124 else
1403 return 0; 1125 return 0;
1404 }
1405} 1126}
1406
1407 1127
1408/** 1128/**
1409 * Handles 'movement' of shop mats. 1129 * Handles 'movement' of shop mats.
1410 * Returns 1 if 'op' was destroyed, 0 if not. 1130 * Returns 1 if 'op' was destroyed, 0 if not.
1411 * Largely re-written to not use nearly as many gotos, plus 1131 * Largely re-written to not use nearly as many gotos, plus
1412 * some of this code just looked plain out of date. 1132 * some of this code just looked plain out of date.
1413 * MSW 2001-08-29 1133 * MSW 2001-08-29
1414 */ 1134 */
1135int
1415int apply_shop_mat (object *shop_mat, object *op) 1136apply_shop_mat (object *shop_mat, object *op)
1416{ 1137{
1417 int rv = 0; 1138 int rv = 0;
1418 double opinion; 1139 double opinion;
1419 object *tmp, *next; 1140 object *tmp, *next;
1420 1141
1421 SET_FLAG (op,FLAG_NO_APPLY); /* prevent loops */ 1142 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1422 1143
1423 if (op->type != PLAYER) { 1144 if (op->type != PLAYER)
1145 {
1424 /* Remove all the unpaid objects that may be carried here. 1146 /* Remove all the unpaid objects that may be carried here.
1425 * This could be pets or monsters that are somehow in 1147 * This could be pets or monsters that are somehow in
1426 * the shop. 1148 * the shop.
1427 */ 1149 */
1428 for (tmp=op->inv; tmp; tmp=next) { 1150 for (tmp = op->inv; tmp; tmp = next)
1151 {
1429 next = tmp->below; 1152 next = tmp->below;
1153
1430 if (QUERY_FLAG(tmp, FLAG_UNPAID)) { 1154 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1155 {
1431 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1156 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1432 1157
1433 remove_ob(tmp); 1158 tmp->remove ();
1434 if (i==-1) i=0; 1159
1435 tmp->map = op->map; 1160 if (i == -1)
1161 i = 0;
1162
1163 tmp->map = op->map;
1436 tmp->x = op->x + freearr_x[i]; 1164 tmp->x = op->x + freearr_x[i];
1437 tmp->y = op->y + freearr_y[i]; 1165 tmp->y = op->y + freearr_y[i];
1438 insert_ob_in_map(tmp, op->map, op, 0); 1166 insert_ob_in_map (tmp, op->map, op, 0);
1439 } 1167 }
1440 } 1168 }
1441 1169
1442 /* Don't teleport things like spell effects */ 1170 /* Don't teleport things like spell effects */
1443 if (QUERY_FLAG(op, FLAG_NO_PICK)) return 0; 1171 if (QUERY_FLAG (op, FLAG_NO_PICK))
1172 return 0;
1444 1173
1445 /* unpaid objects, or non living objects, can't transfer by 1174 /* unpaid objects, or non living objects, can't transfer by
1446 * shop mats. Instead, put it on a nearby space. 1175 * shop mats. Instead, put it on a nearby space.
1447 */ 1176 */
1448 if (QUERY_FLAG(op, FLAG_UNPAID) || !QUERY_FLAG(op, FLAG_ALIVE)) { 1177 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1178 {
1449 1179
1450 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1180 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1181 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1182
1183 if (i != -1)
1184 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1185
1186 return 0;
1187 }
1188 /* Removed code that checked for multipart objects - it appears that
1189 * the teleport function should be able to handle this just fine.
1190 */
1191 rv = teleport (shop_mat, SHOP_MAT, op);
1192 }
1193 else if (can_pay (op) && get_payment (op))
1194 {
1195 /* this is only used for players */
1196 rv = teleport (shop_mat, SHOP_MAT, op);
1197
1198 if (shop_mat->msg)
1199 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg);
1200 /* This check below is a bit simplistic - generally it should be correct,
1201 * but there is never a guarantee that the bottom space on the map is
1202 * actually the shop floor.
1203 */
1204 else if (!rv && !is_in_shop (op))
1205 {
1206 opinion = shopkeeper_approval (op->map, op);
1207
1208 if (opinion > 0.9)
1209 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave.");
1210 else if (opinion > 0.75)
1211 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you.");
1212 else if (opinion > 0.5)
1213 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1214 else
1215 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1216 }
1217 }
1218 else
1219 {
1220 /* if we get here, a player tried to leave a shop but was not able
1221 * to afford the items he has. We try to move the player so that
1222 * they are not on the mat anymore
1223 */
1451 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1224 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1225
1452 if (i != -1) { 1226 if (i == -1)
1453 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, 1227 {
1454 shop_mat);
1455 }
1456 return 0;
1457 }
1458 /* Removed code that checked for multipart objects - it appears that
1459 * the teleport function should be able to handle this just fine.
1460 */
1461 rv = teleport (shop_mat, SHOP_MAT, op);
1462 }
1463 /* immediate block below is only used for players */
1464 else if (can_pay(op)) {
1465 get_payment (op, op->inv);
1466 rv = teleport (shop_mat, SHOP_MAT, op);
1467 if (shop_mat->msg) {
1468 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg);
1469 }
1470 /* This check below is a bit simplistic - generally it should be correct,
1471 * but there is never a guarantee that the bottom space on the map is
1472 * actually the shop floor.
1473 */
1474 else if ( ! rv && (tmp = get_map_ob (op->map, op->x, op->y)) != NULL
1475 && tmp->type != SHOP_FLOOR) {
1476 opinion = shopkeeper_approval(op->map, op);
1477 if ( opinion > 0.9)
1478 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave.");
1479 else if ( opinion > 0.75)
1480 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you.");
1481 else if ( opinion > 0.5)
1482 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1483 else
1484 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1485 }
1486 }
1487 else {
1488 /* if we get here, a player tried to leave a shop but was not able
1489 * to afford the items he has. We try to move the player so that
1490 * they are not on the mat anymore
1491 */
1492
1493 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1494 if(i == -1) {
1495 LOG (llevError, "Internal shop-mat problem.\n"); 1228 LOG (llevError, "Internal shop-mat problem.\n");
1496 } else { 1229 }
1497 remove_ob (op); 1230 else
1231 {
1232 op->remove ();
1498 op->x += freearr_x[i]; 1233 op->x += freearr_x[i];
1499 op->y += freearr_y[i]; 1234 op->y += freearr_y[i];
1500 rv = insert_ob_in_map (op, op->map, shop_mat,0) == NULL; 1235 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL;
1501 } 1236 }
1502 } 1237 }
1238
1503 CLEAR_FLAG (op, FLAG_NO_APPLY); 1239 CLEAR_FLAG (op, FLAG_NO_APPLY);
1504 return rv; 1240 return rv;
1505} 1241}
1506 1242
1507/** 1243/**
1508 * Handles applying a sign. 1244 * Handles applying a sign.
1509 */ 1245 */
1246static void
1510static void apply_sign (object *op, object *sign, int autoapply) 1247apply_sign (object *op, object *sign, int autoapply)
1511{ 1248{
1512 readable_message_type* msgType; 1249 readable_message_type *msgType;
1513 char newbuf[HUGE_BUF]; 1250 char newbuf[HUGE_BUF];
1251
1514 if (sign->msg == NULL) { 1252 if (sign->msg == NULL)
1253 {
1515 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1254 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");
1255 return;
1256 }
1257
1258 if (sign->stats.food)
1259 {
1260 if (sign->last_eat >= sign->stats.food)
1261 {
1262 if (!sign->move_on)
1263 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore.");
1516 return; 1264 return;
1517 } 1265 }
1518 1266
1519 if (sign->stats.food) {
1520 if (sign->last_eat >= sign->stats.food) {
1521 if (!sign->move_on)
1522 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore.");
1523 return;
1524 }
1525
1526 if (!QUERY_FLAG(op, FLAG_WIZPASS)) 1267 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1527 sign->last_eat++; 1268 sign->last_eat++;
1528 } 1269 }
1529 1270
1530 /* Sign or magic mouth? Do we need to see it, or does it talk to us? 1271 /* Sign or magic mouth? Do we need to see it, or does it talk to us?
1531 * No way to know for sure. The presumption is basically that if 1272 * No way to know for sure. The presumption is basically that if
1532 * move_on is zero, it needs to be manually applied (doesn't talk 1273 * move_on is zero, it needs to be manually applied (doesn't talk
1533 * to us). 1274 * to us).
1534 */ 1275 */
1535 if (QUERY_FLAG (op, FLAG_BLIND) && ! QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) { 1276 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1536 new_draw_info (NDI_UNIQUE, 0, op, 1277 {
1537 "You are unable to read while blind."); 1278 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1538 return; 1279 return;
1539 } 1280 }
1540 msgType=get_readable_message_type(sign); 1281 msgType = get_readable_message_type (sign);
1541 snprintf(newbuf,sizeof(newbuf),"%hhu %s", autoapply?1:0,sign->msg); 1282 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg);
1542 draw_ext_info(NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, sign->msg); 1283 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1543} 1284}
1544
1545 1285
1546/** 1286/**
1547 * 'victim' moves onto 'trap' 1287 * 'victim' moves onto 'trap'
1548 * 'victim' leaves 'trap' 1288 * 'victim' leaves 'trap'
1549 * effect is determined by move_on/move_off of trap and move_type of victime. 1289 * effect is determined by move_on/move_off of trap and move_type of victime.
1550 * 1290 *
1551 * originator: Player, monster or other object that caused 'victim' to move 1291 * originator: Player, monster or other object that caused 'victim' to move
1552 * onto 'trap'. Will receive messages caused by this action. May be NULL. 1292 * onto 'trap'. Will receive messages caused by this action. May be NULL.
1553 * However, some types of traps require an originator to function. 1293 * However, some types of traps require an originator to function.
1554 */ 1294 */
1295void
1555void move_apply (object *trap, object *victim, object *originator) 1296move_apply (object *trap, object *victim, object *originator)
1556{ 1297{
1557 static int recursion_depth = 0; 1298 static int recursion_depth = 0;
1558 1299
1559 /* Only exits affect DMs. */ 1300 /* Only exits affect DMs. */
1560 if (QUERY_FLAG(victim, FLAG_WIZPASS) && trap->type != EXIT && trap->type != SIGN) 1301 if (QUERY_FLAG (victim, FLAG_WIZPASS) && trap->type != EXIT && trap->type != SIGN)
1561 return; 1302 return;
1562 1303
1563 /* move_apply() is the most likely candidate for causing unwanted and 1304 /* move_apply() is the most likely candidate for causing unwanted and
1564 * possibly unlimited recursion. 1305 * possibly unlimited recursion.
1565 */ 1306 */
… …
1567 * maps to fail. 1) it's not an error to recurse: 1308 * maps to fail. 1) it's not an error to recurse:
1568 * rune detonates, summoning monster. monster lands on nearby rune. 1309 * rune detonates, summoning monster. monster lands on nearby rune.
1569 * nearby rune detonates. This sort of recursion is expected and 1310 * nearby rune detonates. This sort of recursion is expected and
1570 * proper. This code was causing needless crashes. 1311 * proper. This code was causing needless crashes.
1571 */ 1312 */
1572 if (recursion_depth >= 500) { 1313 if (recursion_depth >= 500)
1314 {
1573 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1315 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1574 "[trap arch %s, name %s; victim arch %s, name %s]\n", 1316 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name);
1575 trap->arch->name, trap->name, victim->arch->name, victim->name); 1317 return;
1576 return;
1577 } 1318 }
1578 recursion_depth++; 1319 recursion_depth++;
1579 if (trap->head) trap=trap->head; 1320 if (trap->head)
1321 trap = trap->head;
1580 1322
1581 /* Lauwenmark: Handle for plugin trigger event */ 1323 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1582 if (execute_event(trap, EVENT_TRIGGER,originator,victim,NULL,SCRIPT_FIX_ALL)!=0) 1324 goto leave;
1325
1326 switch (trap->type)
1327 {
1328 case PLAYERMOVER:
1329 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
1330 {
1331 if (!trap->stats.maxsp)
1332 trap->stats.maxsp = 2;
1333
1334 /* Is this correct? From the docs, it doesn't look like it
1335 * should be divided by trap->speed
1336 */
1337 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);
1338
1339 /* Just put in some sanity check. I think there is a bug in the
1340 * above with some objects have zero speed, and thus the player
1341 * getting permanently paralyzed.
1342 */
1343 if (victim->speed_left < -50.f)
1344 victim->speed_left = -50.f;
1345 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1346 }
1583 goto leave; 1347 goto leave;
1584 1348
1585 switch (trap->type) {
1586 case PLAYERMOVER:
1587 if (trap->attacktype && (trap->level || victim->type!=PLAYER) &&
1588 !should_director_abort(trap, victim)) {
1589 if (!trap->stats.maxsp) trap->stats.maxsp=2;
1590
1591 /* Is this correct? From the docs, it doesn't look like it
1592 * should be divided by trap->speed
1593 */
1594 victim->speed_left = -FABS(trap->stats.maxsp*victim->speed/trap->speed);
1595
1596 /* Just put in some sanity check. I think there is a bug in the
1597 * above with some objects have zero speed, and thus the player
1598 * getting permanently paralyzed.
1599 */
1600 if (victim->speed_left<-50.0) victim->speed_left=-50.0;
1601 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left);*/
1602 }
1603 goto leave;
1604
1605 case SPINNER: 1349 case SPINNER:
1606 if(victim->direction) { 1350 if (victim->direction)
1351 {
1607 victim->direction=absdir(victim->direction-trap->stats.sp); 1352 victim->direction = absdir (victim->direction - trap->stats.sp);
1608 update_turn_face(victim); 1353 update_turn_face (victim);
1609 } 1354 }
1610 goto leave; 1355 goto leave;
1611 1356
1612 case DIRECTOR: 1357 case DIRECTOR:
1613 if(victim->direction && !should_director_abort(trap, victim)) { 1358 if (victim->direction && !should_director_abort (trap, victim))
1359 {
1614 victim->direction=trap->stats.sp; 1360 victim->direction = trap->stats.sp;
1615 update_turn_face(victim); 1361 update_turn_face (victim);
1616 } 1362 }
1617 goto leave; 1363 goto leave;
1618 1364
1619 case BUTTON: 1365 case BUTTON:
1620 case PEDESTAL: 1366 case PEDESTAL:
1621 update_button(trap); 1367 update_button (trap);
1622 goto leave; 1368 goto leave;
1623 1369
1624 case ALTAR: 1370 case ALTAR:
1625 /* sacrifice victim on trap */ 1371 /* sacrifice victim on trap */
1626 apply_altar (trap, victim, originator); 1372 apply_altar (trap, victim, originator);
1627 goto leave; 1373 goto leave;
1628 1374
1629 case THROWN_OBJ: 1375 case THROWN_OBJ:
1630 if (trap->inv == NULL) 1376 if (trap->inv == NULL)
1631 goto leave; 1377 goto leave;
1632 /* fallthrough */ 1378 /* fallthrough */
1633 1379
1634 case ARROW: 1380 case ARROW:
1635
1636 /* bad bug: monster throw a object, make a step forwards, step on object , 1381 /* bad bug: monster throw a object, make a step forwards, step on object ,
1637 * trigger this here and get hit by own missile - and will be own enemy. 1382 * trigger this here and get hit by own missile - and will be own enemy.
1638 * Victim then is his own enemy and will start to kill herself (this is 1383 * Victim then is his own enemy and will start to kill herself (this is
1639 * removed) but we have not synced victim and his missile. To avoid senseless 1384 * removed) but we have not synced victim and his missile. To avoid senseless
1640 * action, we avoid hits here 1385 * action, we avoid hits here
1641 */ 1386 */
1642 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim) 1387 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1643 hit_with_arrow (trap, victim); 1388 hit_with_arrow (trap, victim);
1644 goto leave; 1389 goto leave;
1645 1390
1646 case SPELL_EFFECT: 1391 case SPELL_EFFECT:
1647 apply_spell_effect(trap, victim); 1392 apply_spell_effect (trap, victim);
1648 goto leave; 1393 goto leave;
1649 1394
1650 case TRAPDOOR: 1395 case TRAPDOOR:
1651 { 1396 {
1652 int max, sound_was_played; 1397 int max, sound_was_played;
1653 object *ab, *ab_next; 1398 object *ab, *ab_next;
1399
1654 if(!trap->value) { 1400 if (!trap->value)
1655 int tot; 1401 {
1402 int tot;
1403
1656 for(ab=trap->above,tot=0;ab!=NULL;ab=ab->above) 1404 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above)
1657 if ((ab->move_type && trap->move_on) || ab->move_type==0) 1405 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1658 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1406 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying;
1659 1407
1660 if(!(trap->value=(tot>trap->weight)?1:0)) 1408 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1661 goto leave; 1409 goto leave;
1662 1410
1663 SET_ANIMATION(trap, trap->value); 1411 SET_ANIMATION (trap, trap->value);
1664 update_object(trap,UP_OBJ_FACE); 1412 update_object (trap, UP_OBJ_FACE);
1665 } 1413 }
1666 1414
1667 for (ab = trap->above, max=100, sound_was_played = 0; --max && ab; ab=ab_next) { 1415 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1416 {
1668 /* need to set this up, since if we do transfer the object, 1417 /* need to set this up, since if we do transfer the object,
1669 * ab->above would be bogus 1418 * ab->above would be bogus
1670 */ 1419 */
1671 ab_next = ab->above; 1420 ab_next = ab->above;
1672 1421
1673 if ((ab->move_type && trap->move_on) || ab->move_type==0) { 1422 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1674 if ( ! sound_was_played) { 1423 {
1424 if (!sound_was_played)
1425 {
1675 play_sound_map(trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1426 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE);
1676 sound_was_played = 1; 1427 sound_was_played = 1;
1677 } 1428 }
1678 new_draw_info(NDI_UNIQUE, 0,ab,"You fall into a trapdoor!"); 1429 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!");
1679 transfer_ob(ab,(int)EXIT_X(trap),(int)EXIT_Y(trap),0,ab); 1430 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab);
1680 } 1431 }
1681 } 1432 }
1682 goto leave; 1433 goto leave;
1683 } 1434 }
1684 1435
1685 1436
1686 case CONVERTER: 1437 case CONVERTER:
1687 if (convert_item (victim, trap) < 0) { 1438 if (convert_item (victim, trap) < 0)
1688 object *op; 1439 {
1689
1690 new_draw_info_format(NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name(trap)); 1440 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1441 get_archetype ("burnout")->insert_at (trap, trap);
1442 }
1691 1443
1692 op = get_archetype("burnout");
1693 if (op != NULL) {
1694 op->x = trap->x;
1695 op->y = trap->y;
1696 insert_ob_in_map(op, trap->map, trap, 0);
1697 }
1698 }
1699 goto leave; 1444 goto leave;
1700 1445
1701 case TRIGGER_BUTTON: 1446 case TRIGGER_BUTTON:
1702 case TRIGGER_PEDESTAL: 1447 case TRIGGER_PEDESTAL:
1703 case TRIGGER_ALTAR: 1448 case TRIGGER_ALTAR:
1704 check_trigger (trap, victim); 1449 check_trigger (trap, victim);
1705 goto leave; 1450 goto leave;
1706 1451
1707 case DEEP_SWAMP: 1452 case DEEP_SWAMP:
1708 walk_on_deep_swamp (trap, victim); 1453 walk_on_deep_swamp (trap, victim);
1709 goto leave; 1454 goto leave;
1710 1455
1711 case CHECK_INV: 1456 case CHECK_INV:
1712 check_inv (victim, trap); 1457 check_inv (victim, trap);
1713 goto leave; 1458 goto leave;
1714 1459
1715 case HOLE: 1460 case HOLE:
1716 /* Hole not open? */ 1461 /* Hole not open? */
1717 if(trap->stats.wc > 0) 1462 if (trap->stats.wc > 0)
1718 goto leave; 1463 goto leave;
1719 1464
1720 /* Is this a multipart monster and not the head? If so, return. 1465 /* Is this a multipart monster and not the head? If so, return.
1721 * Processing will happen if the head runs into the pit 1466 * Processing will happen if the head runs into the pit
1722 */ 1467 */
1723 if (victim->head) 1468 if (victim->head)
1724 goto leave; 1469 goto leave;
1725 1470
1726 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1471 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE);
1727 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1472 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1728 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1473 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1729 goto leave; 1474 goto leave;
1730 1475
1731 case EXIT: 1476 case EXIT:
1732 if (victim->type == PLAYER && EXIT_PATH (trap)) { 1477 if (victim->type == PLAYER && EXIT_PATH (trap))
1478 {
1733 /* Basically, don't show exits leading to random maps the 1479 /* Basically, don't show exits leading to random maps the
1734 * players output. 1480 * players output.
1735 */ 1481 */
1736 if (trap->msg && strncmp(EXIT_PATH(trap),"/!",2) && strncmp(EXIT_PATH(trap), "/random/", 8)) 1482 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1737 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1483 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1738 enter_exit (victim, trap); 1484
1739 } 1485 victim->enter_exit (trap);
1486 }
1740 goto leave; 1487 goto leave;
1741 1488
1742 case ENCOUNTER: 1489 case ENCOUNTER:
1743 /* may be some leftovers on this */ 1490 /* may be some leftovers on this */
1744 goto leave; 1491 goto leave;
1745 1492
1746 case SHOP_MAT: 1493 case SHOP_MAT:
1747 apply_shop_mat (trap, victim); 1494 apply_shop_mat (trap, victim);
1748 goto leave; 1495 goto leave;
1749 1496
1750 /* Drop a certain amount of gold, and have one item identified */ 1497 /* Drop a certain amount of gold, and have one item identified */
1751 case IDENTIFY_ALTAR: 1498 case IDENTIFY_ALTAR:
1752 apply_id_altar (victim, trap, originator); 1499 apply_id_altar (victim, trap, originator);
1753 goto leave; 1500 goto leave;
1754 1501
1755 case SIGN: 1502 case SIGN:
1756 if (victim->type != PLAYER && trap->stats.food > 0) 1503 if (victim->type != PLAYER && trap->stats.food > 0)
1757 goto leave; /* monsters musn't apply magic_mouths with counters */ 1504 goto leave; /* monsters musn't apply magic_mouths with counters */
1758 1505
1759 apply_sign (victim, trap, 1); 1506 apply_sign (victim, trap, 1);
1760 goto leave; 1507 goto leave;
1761 1508
1762 case CONTAINER: 1509 case CONTAINER:
1763 if (victim->type==PLAYER)
1764 (void) esrv_apply_container (victim, trap);
1765 else
1766 (void) apply_container (victim, trap); 1510 apply_container (victim, trap);
1767 goto leave; 1511 goto leave;
1768 1512
1769 case RUNE: 1513 case RUNE:
1770 case TRAP: 1514 case TRAP:
1771 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) { 1515 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1516 {
1772 spring_trap(trap, victim); 1517 spring_trap (trap, victim);
1773 } 1518 }
1774 goto leave; 1519 goto leave;
1775 1520
1776 default: 1521 default:
1777 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1522 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1778 "handled in move_apply()\n", trap->name, trap->arch->name, 1523 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type);
1779 trap->type);
1780 goto leave; 1524 goto leave;
1781 } 1525 }
1782 1526
1783 leave: 1527leave:
1784 recursion_depth--; 1528 recursion_depth--;
1785} 1529}
1786 1530
1787/** 1531/**
1788 * Handles reading a regular (ie not containing a spell) book. 1532 * Handles reading a regular (ie not containing a spell) book.
1789 */ 1533 */
1534static void
1790static void apply_book (object *op, object *tmp) 1535apply_book (object *op, object *tmp)
1791{ 1536{
1792 int lev_diff; 1537 int lev_diff;
1793 object *skill_ob; 1538 object *skill_ob;
1794 1539
1795 if(QUERY_FLAG(op, FLAG_BLIND)&&!QUERY_FLAG(op,FLAG_WIZ)) { 1540 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1541 {
1796 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to read while blind."); 1542 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1797 return; 1543 return;
1798 } 1544 }
1799 if(tmp->msg==NULL) { 1545 if (tmp->msg == NULL)
1800 new_draw_info_format(NDI_UNIQUE, 0, op, 1546 {
1801 "You open the %s and find it empty.", tmp->name); 1547 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);
1802 return; 1548 return;
1803 } 1549 }
1804 1550
1805 /* need a literacy skill to read stuff! */ 1551 /* need a literacy skill to read stuff! */
1806 skill_ob = find_skill_by_name(op, tmp->skill); 1552 skill_ob = find_skill_by_name (op, tmp->skill);
1807 if ( ! skill_ob) { 1553 if (!skill_ob)
1808 new_draw_info(NDI_UNIQUE, 0,op,
1809 "You are unable to decipher the strange symbols.");
1810 return;
1811 } 1554 {
1555 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols.");
1556 return;
1557 }
1812 lev_diff = tmp->level - (skill_ob->level + 5); 1558 lev_diff = tmp->level - (skill_ob->level + 5);
1813 if ( ! QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) { 1559 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1560 {
1814 if (lev_diff < 2) 1561 if (lev_diff < 2)
1815 new_draw_info(NDI_UNIQUE, 0,op,"This book is just barely beyond your comprehension."); 1562 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");
1816 else if (lev_diff < 3) 1563 else if (lev_diff < 3)
1817 new_draw_info(NDI_UNIQUE, 0,op,"This book is slightly beyond your comprehension."); 1564 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension.");
1818 else if (lev_diff < 5) 1565 else if (lev_diff < 5)
1819 new_draw_info(NDI_UNIQUE, 0,op,"This book is beyond your comprehension."); 1566 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension.");
1820 else if (lev_diff < 8) 1567 else if (lev_diff < 8)
1821 new_draw_info(NDI_UNIQUE, 0,op,"This book is quite a bit beyond your comprehension."); 1568 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension.");
1822 else if (lev_diff < 15) 1569 else if (lev_diff < 15)
1823 new_draw_info(NDI_UNIQUE, 0,op,"This book is way beyond your comprehension."); 1570 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension.");
1824 else 1571 else
1825 new_draw_info(NDI_UNIQUE, 0,op,"This book is totally beyond your comprehension."); 1572 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1826 return; 1573 return;
1827 } 1574 }
1828 1575
1829 readable_message_type* msgType = get_readable_message_type(tmp); 1576 readable_message_type *msgType = get_readable_message_type (tmp);
1577
1830 draw_ext_info_format(NDI_UNIQUE | NDI_NAVY, 0, op, 1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1831 msgType->message_type, msgType->message_subtype, 1579 msgType->message_type, msgType->message_subtype,
1832 "You open the %s and start reading.\n%s", 1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1833 "%s\n%s",
1834 long_desc(tmp,op), tmp->msg); 1581 long_desc (tmp, op), &tmp->msg);
1835 1582
1836 /* gain xp from reading */ 1583 /* gain xp from reading */
1837 if(!QUERY_FLAG(tmp,FLAG_NO_SKILL_IDENT)) { /* only if not read before */ 1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1585 { /* only if not read before */
1838 int exp_gain=calc_skill_exp(op,tmp, skill_ob); 1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
1587
1839 if(!QUERY_FLAG(tmp,FLAG_IDENTIFIED)) { 1588 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1589 {
1840 /*exp_gain *= 2; because they just identified it too */ 1590 /*exp_gain *= 2; because they just identified it too */
1841 SET_FLAG(tmp,FLAG_IDENTIFIED); 1591 SET_FLAG (tmp, FLAG_IDENTIFIED);
1592
1842 /* If in a container, update how it looks */ 1593 /* If in a container, update how it looks */
1594 if (tmp->env)
1843 if(tmp->env) esrv_update_item(UPD_FLAGS|UPD_NAME, op,tmp); 1595 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1844 else op->contr->socket.update_look=1; 1596 else
1597 op->contr->ns->floorbox_update ();
1845 } 1598 }
1599
1846 change_exp(op,exp_gain, skill_ob->skill, 0); 1600 change_exp (op, exp_gain, skill_ob->skill, 0);
1847 SET_FLAG(tmp,FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1601 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1848 } 1602 }
1849} 1603}
1850 1604
1851/** 1605/**
1852 * Handles the applying of a skill scroll, calling learn_skill straight. 1606 * Handles the applying of a skill scroll, calling learn_skill straight.
1853 * op is the person learning the skill, tmp is the skill scroll object 1607 * op is the person learning the skill, tmp is the skill scroll object
1854 */ 1608 */
1609static void
1855static void apply_skillscroll (object *op, object *tmp) 1610apply_skillscroll (object *op, object *tmp)
1856{ 1611{
1857 switch ((int) learn_skill (op, tmp)) { 1612 switch ((int) learn_skill (op, tmp))
1858 case 0: 1613 {
1614 case 0:
1859 new_draw_info(NDI_UNIQUE, 0,op,"You already possess the knowledge "); 1615 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge ");
1860 new_draw_info_format(NDI_UNIQUE, 0,op,"held within the %s.\n",query_name(tmp)); 1616 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp));
1861 return; 1617 return;
1862 1618
1863 case 1: 1619 case 1:
1864 new_draw_info_format(NDI_UNIQUE, 0,op,"You succeed in learning %s", 1620 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1865 tmp->skill);
1866 new_draw_info_format(NDI_UNIQUE, 0, op,
1867 "Type 'bind ready_skill %s",tmp->skill);
1868 new_draw_info(NDI_UNIQUE, 0,op,"to store the skill in a key.");
1869 decrease_ob(tmp); 1621 decrease_ob (tmp);
1870 return; 1622 return;
1871 1623
1872 default: 1624 default:
1873 new_draw_info_format(NDI_UNIQUE,0,op, 1625 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp));
1874 "You fail to learn the knowledge of the %s.\n",query_name(tmp));
1875 decrease_ob(tmp); 1626 decrease_ob (tmp);
1876 return; 1627 return;
1877 } 1628 }
1878} 1629}
1879 1630
1880/** 1631/**
1881 * Actually makes op learn spell. 1632 * Actually makes op learn spell.
1882 * Informs player of what happens. 1633 * Informs player of what happens.
1883 */ 1634 */
1635void
1884void do_learn_spell (object *op, object *spell, int special_prayer) 1636do_learn_spell (object *op, object *spell, int special_prayer)
1885{ 1637{
1886 object *tmp; 1638 object *tmp;
1887 1639
1888 if (op->type != PLAYER) { 1640 if (op->type != PLAYER)
1641 {
1889 LOG (llevError, "BUG: do_learn_spell(): not a player\n"); 1642 LOG (llevError, "BUG: do_learn_spell(): not a player\n");
1890 return; 1643 return;
1891 } 1644 }
1892 1645
1893 /* Upgrade special prayers to normal prayers */ 1646 /* Upgrade special prayers to normal prayers */
1894 if ((tmp=check_spell_known (op, spell->name))!=NULL) { 1647 if ((tmp = check_spell_known (op, spell->name)) != NULL)
1648 {
1895 if (special_prayer && !QUERY_FLAG(tmp, FLAG_STARTEQUIP)) { 1649 if (special_prayer && !QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1650 {
1896 LOG (llevError, "BUG: do_learn_spell(): spell already known, but not marked as startequip\n"); 1651 LOG (llevError, "BUG: do_learn_spell(): spell already known, but not marked as startequip\n");
1897 return; 1652 return;
1898 } 1653 }
1899 return; 1654 return;
1900 } 1655 }
1901 1656
1902 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1657 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0);
1903 tmp = get_object(); 1658 tmp = spell->clone ();
1904 copy_object(spell, tmp);
1905 insert_ob_in_ob(tmp, op); 1659 insert_ob_in_ob (tmp, op);
1906 1660
1907 if (special_prayer) { 1661 if (special_prayer)
1908 SET_FLAG(tmp, FLAG_STARTEQUIP); 1662 SET_FLAG (tmp, FLAG_STARTEQUIP);
1909 }
1910 1663
1911 new_draw_info_format (NDI_UNIQUE, 0, op,
1912 "Type 'bind cast %s", spell->name);
1913 new_draw_info (NDI_UNIQUE, 0, op, "to store the spell in a key.");
1914 esrv_add_spells(op->contr, tmp); 1664 esrv_add_spells (op->contr, tmp);
1915} 1665}
1916 1666
1917/** 1667/**
1918 * Erases spell from player's inventory. 1668 * Erases spell from player's inventory.
1919 */ 1669 */
1670void
1920void do_forget_spell (object *op, const char *spell) 1671do_forget_spell (object *op, const char *spell)
1921{ 1672{
1922 object *spob; 1673 object *spob;
1923 1674
1924 if (op->type != PLAYER) { 1675 if (op->type != PLAYER)
1676 {
1925 LOG (llevError, "BUG: do_forget_spell(): not a player\n"); 1677 LOG (llevError, "BUG: do_forget_spell(): not a player\n");
1926 return; 1678 return;
1927 } 1679 }
1928 if ( (spob=check_spell_known (op, spell)) == NULL) { 1680 if ((spob = check_spell_known (op, spell)) == NULL)
1681 {
1929 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1682 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1930 return; 1683 return;
1931 }
1932 1684 }
1933 new_draw_info_format (NDI_UNIQUE|NDI_NAVY, 0, op, 1685
1934 "You lose knowledge of %s.", spell); 1686 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell);
1935 player_unready_range_ob(op->contr, spob); 1687 player_unready_range_ob (op->contr, spob);
1936 esrv_remove_spell(op->contr, spob); 1688 esrv_remove_spell (op->contr, spob);
1937 remove_ob(spob); 1689 spob->destroy ();
1938 free_object(spob);
1939} 1690}
1940 1691
1941/** 1692/**
1942 * Handles player applying a spellbook. 1693 * Handles player applying a spellbook.
1943 * Checks whether player has knowledge of required skill, doesn't already know the spell, 1694 * Checks whether player has knowledge of required skill, doesn't already know the spell,
1944 * stuff like that. Random learning failure too. 1695 * stuff like that. Random learning failure too.
1945 */ 1696 */
1697static void
1946static void apply_spellbook (object *op, object *tmp) 1698apply_spellbook (object *op, object *tmp)
1947{ 1699{
1948 object *skop, *spell, *spell_skill; 1700 object *skop, *spell, *spell_skill;
1949 1701
1950 if(QUERY_FLAG(op, FLAG_BLIND)&&!QUERY_FLAG(op,FLAG_WIZ)) { 1702 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1703 {
1951 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to read while blind."); 1704 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1952 return; 1705 return;
1953 } 1706 }
1954 1707
1955 /* artifact_spellbooks have 'slaying' field point to a spell name, 1708 /* artifact_spellbooks have 'slaying' field point to a spell name,
1956 * instead of having their spell stored in stats.sp. These are 1709 * instead of having their spell stored in stats.sp. These are
1957 * legacy spellbooks 1710 * legacy spellbooks
1958 */ 1711 */
1959 1712
1960 if(tmp->slaying != NULL) { 1713 if (tmp->slaying != NULL)
1714 {
1961 spell=arch_to_object(find_archetype_by_object_name(tmp->slaying)); 1715 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1962 if (!spell) { 1716 if (!spell)
1963 new_draw_info_format(NDI_UNIQUE, 0, op, 1717 {
1964 "The book's formula for %s is incomplete", tmp->slaying); 1718 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);
1965 return; 1719 return;
1966 } 1720 }
1967 else 1721 else
1968 insert_ob_in_ob(spell, tmp); 1722 insert_ob_in_ob (spell, tmp);
1969 free_string(tmp->slaying);
1970 tmp->slaying=NULL; 1723 tmp->slaying = NULL;
1971 } 1724 }
1972 1725
1973 skop = find_skill_by_name(op, tmp->skill); 1726 skop = find_skill_by_name (op, tmp->skill);
1974 1727
1975 /* need a literacy skill to learn spells. Also, having a literacy level 1728 /* need a literacy skill to learn spells. Also, having a literacy level
1976 * lower than the spell will make learning the spell more difficult */ 1729 * lower than the spell will make learning the spell more difficult */
1977 if ( !skop) { 1730 if (!skop)
1731 {
1978 new_draw_info(NDI_UNIQUE, 0,op,"You can't read! Your attempt fails."); 1732 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails.");
1979 return; 1733 return;
1980 } 1734 }
1981 1735
1982 spell = tmp->inv; 1736 spell = tmp->inv;
1737
1983 if (!spell) { 1738 if (!spell)
1739 {
1984 LOG(llevError,"apply_spellbook: Book %s has no spell in it!\n", tmp->name); 1740 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1985 new_draw_info(NDI_UNIQUE, 0,op,"The spellbook symbols make no sense."); 1741 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense.");
1986 return; 1742 return;
1987 }
1988 if (spell->level > (skop->level+10)) {
1989 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to decipher the strange symbols.");
1990 return;
1991 } 1743 }
1992 1744
1993 new_draw_info_format(NDI_UNIQUE, 0, op, 1745 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1994 "The spellbook contains the %s level spell %s.", 1746 {
1995 get_levelnumber(spell->level), spell->name); 1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1748 return;
1749 }
1996 1750
1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1752
1997 if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED)) { 1753 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1754 {
1998 identify(tmp); 1755 identify (tmp);
1756
1999 if (tmp->env) 1757 if (tmp->env)
2000 esrv_update_item(UPD_FLAGS|UPD_NAME,op,tmp); 1758 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
2001 else 1759 else
2002 op->contr->socket.update_look=1; 1760 op->contr->ns->floorbox_update ();
2003 } 1761 }
2004 1762
2005 /* I removed the check for special_prayer_mark here - it didn't make 1763 /* I removed the check for special_prayer_mark here - it didn't make
2006 * a lot of sense - special prayers are not found in spellbooks, and 1764 * a lot of sense - special prayers are not found in spellbooks, and
2007 * if the player doesn't know the spell, doesn't make a lot of sense that 1765 * if the player doesn't know the spell, doesn't make a lot of sense that
2008 * they would have a special prayer mark. 1766 * they would have a special prayer mark.
2009 */ 1767 */
2010 if (check_spell_known (op, spell->name)) { 1768 if (check_spell_known (op, spell->name))
1769 {
2011 new_draw_info(NDI_UNIQUE, 0,op,"You already know that spell.\n"); 1770 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n");
2012 return; 1771 return;
2013 } 1772 }
2014 1773
2015 if (spell->skill) { 1774 if (spell->skill)
1775 {
2016 spell_skill = find_skill_by_name(op, spell->skill); 1776 spell_skill = find_skill_by_name (op, spell->skill);
1777
2017 if (!spell_skill) { 1778 if (!spell_skill)
2018 new_draw_info_format(NDI_UNIQUE, 0, op, 1779 {
2019 "You lack the skill %s to use this spell", 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
2020 spell->skill);
2021 return; 1781 return;
2022 } 1782 }
1783
2023 if (spell_skill->level < spell->level) { 1784 if (spell_skill->level < spell->level)
2024 new_draw_info_format(NDI_UNIQUE, 0, op, 1785 {
2025 "You need to be level %d in %s to learn this spell.", 1786 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill);
2026 spell->level, spell->skill);
2027 return; 1787 return;
2028 } 1788 }
2029 } 1789 }
2030 1790
2031 /* Logic as follows 1791 /* Logic as follows
2032 * 1792 *
2033 * 1- MU spells use Int to learn, Cleric spells use Wisdom 1793 * 1- MU spells use Int to learn, Cleric spells use Wisdom
2034 * 1794 *
2035 * 2- The learner's skill level in literacy adjusts the chance to learn 1795 * 2- The learner's skill level in literacy adjusts the chance to learn
2036 * a spell. 1796 * a spell.
2037 * 1797 *
2038 * 3 -Automatically fail to learn if you read while confused 1798 * 3 -Automatically fail to learn if you read while confused
2039 * 1799 *
2040 * Overall, chances are the same but a player will find having a high 1800 * Overall, chances are the same but a player will find having a high
2041 * literacy rate very useful! -b.t. 1801 * literacy rate very useful! -b.t.
2042 */ 1802 */
2043 if(QUERY_FLAG(op,FLAG_CONFUSED)) { 1803 if (QUERY_FLAG (op, FLAG_CONFUSED))
1804 {
2044 new_draw_info(NDI_UNIQUE,0,op,"In your confused state you flub the wording of the text!"); 1805 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!");
2045 scroll_failure(op, 0 - random_roll(0, spell->level, op, PREFER_LOW), MAX(spell->stats.sp, spell->stats.grace)); 1806 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
1807 }
2046 } else if(QUERY_FLAG(tmp,FLAG_STARTEQUIP) || 1808 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
2047 (random_roll(0, 100, op, PREFER_LOW)-(5*skop->level)) < 1809 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
2048 learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) { 1810 {
2049 1811
2050 new_draw_info(NDI_UNIQUE, 0,op,"You succeed in learning the spell!"); 1812 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
2051 do_learn_spell (op, spell, 0); 1813 do_learn_spell (op, spell, 0);
2052 1814
2053 /* xp gain to literacy for spell learning */ 1815 /* xp gain to literacy for spell learning */
2054 if ( ! QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1816 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
2055 change_exp(op,calc_skill_exp(op,tmp,skop), skop->skill, 0); 1817 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
2056 } else { 1818 }
1819 else
1820 {
2057 play_sound_player_only(op->contr, SOUND_FUMBLE_SPELL,0,0); 1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2058 new_draw_info(NDI_UNIQUE, 0,op,"You fail to learn the spell.\n"); 1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2059 } 1823 }
1824
2060 decrease_ob(tmp); 1825 decrease_ob (tmp);
2061} 1826}
2062 1827
2063/** 1828/**
2064 * Handles applying a spell scroll. 1829 * Handles applying a spell scroll.
2065 */ 1830 */
1831void
2066void apply_scroll (object *op, object *tmp, int dir) 1832apply_scroll (object *op, object *tmp, int dir)
2067{ 1833{
2068 object *skop; 1834 object *skop;
2069 1835
2070 if(QUERY_FLAG(op, FLAG_BLIND)&&!QUERY_FLAG(op,FLAG_WIZ)) { 1836 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1837 {
2071 new_draw_info(NDI_UNIQUE, 0,op, "You are unable to read while blind."); 1838 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
2072 return; 1839 return;
2073 } 1840 }
2074 1841
2075 if (!tmp->inv || tmp->inv->type != SPELL) { 1842 if (!tmp->inv || tmp->inv->type != SPELL)
2076 new_draw_info (NDI_UNIQUE, 0, op, 1843 {
2077 "The scroll just doesn't make sense!"); 1844 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!");
2078 return; 1845 return;
2079 } 1846 }
2080 1847
2081 if(op->type==PLAYER) { 1848 if (op->type == PLAYER)
1849 {
2082 /* players need a literacy skill to read stuff! */ 1850 /* players need a literacy skill to read stuff! */
2083 int exp_gain=0; 1851 int exp_gain = 0;
2084 1852
2085 /* hard code literacy - tmp->skill points to where the exp 1853 /* hard code literacy - tmp->skill points to where the exp
2086 * should go for anything killed by the spell. 1854 * should go for anything killed by the spell.
2087 */ 1855 */
2088 skop = find_skill_by_name(op, skill_names[SK_LITERACY]); 1856 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
2089 1857
2090 if ( ! skop) { 1858 if (!skop)
2091 new_draw_info(NDI_UNIQUE, 0,op, 1859 {
2092 "You are unable to decipher the strange symbols."); 1860 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols.");
2093 return; 1861 return;
2094 } 1862 }
2095 1863
2096 if((exp_gain = calc_skill_exp(op,tmp, skop))) 1864 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
2097 change_exp(op,exp_gain, skop->skill, 0); 1865 change_exp (op, exp_gain, skop->skill, 0);
2098 } 1866 }
2099 1867
2100 if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED)) 1868 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2101 identify(tmp); 1869 identify (tmp);
2102 1870
2103 new_draw_info_format(NDI_BLACK, 0, op, 1871 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);
2104 "The scroll of %s turns to dust.", tmp->inv->name);
2105 1872
2106
2107 cast_spell(op,tmp,dir,tmp->inv, NULL); 1873 cast_spell (op, tmp, dir, tmp->inv, NULL);
2108 decrease_ob(tmp); 1874 decrease_ob (tmp);
2109} 1875}
2110 1876
2111/** 1877/**
2112 * Applies a treasure object - by default, chest. op 1878 * Applies a treasure object - by default, chest. op
2113 * is the person doing the applying, tmp is the treasure 1879 * is the person doing the applying, tmp is the treasure
2114 * chest. 1880 * chest.
2115 */ 1881 */
1882static void
2116static void apply_treasure (object *op, object *tmp) 1883apply_treasure (object *op, object *tmp)
2117{ 1884{
2118 object *treas;
2119 tag_t tmp_tag = tmp->count, op_tag = op->count;
2120
2121
2122 /* Nice side effect of new treasure creation method is that the treasure 1885 /* Nice side effect of new treasure creation method is that the treasure
2123 * for the chest is done when the chest is created, and put into the chest 1886 * for the chest is done when the chest is created, and put into the chest
2124 * inventory. So that when the chest burns up, the items still exist. Also 1887 * inventory. So that when the chest burns up, the items still exist. Also
2125 * prevents people fromt moving chests to more difficult maps to get better 1888 * prevents people fromt moving chests to more difficult maps to get better
2126 * treasure 1889 * treasure
2127 */ 1890 */
2128
2129 treas = tmp->inv; 1891 object *treas = tmp->inv;
2130 if(treas==NULL) { 1892
1893 if (!treas)
1894 {
2131 new_draw_info(NDI_UNIQUE, 0,op,"The chest was empty."); 1895 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");
2132 decrease_ob(tmp);
2133 return;
2134 }
2135 while (tmp->inv) {
2136 treas = tmp->inv;
2137
2138 remove_ob(treas);
2139 new_draw_info_format(NDI_UNIQUE, 0, op, "You find %s in the chest.",
2140 query_name(treas));
2141
2142 treas->x=op->x;
2143 treas->y=op->y;
2144 treas = insert_ob_in_map (treas, op->map, op,INS_BELOW_ORIGINATOR);
2145
2146 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level
2147 && QUERY_FLAG (op, FLAG_ALIVE))
2148 spring_trap (treas, op);
2149 /* If either player or container was destroyed, no need to do
2150 * further processing. I think this should be enclused with
2151 * spring trap above, as I don't think there is otherwise
2152 * any way for the treasure chest or player to get killed
2153 */
2154 if (was_destroyed (op, op_tag) || was_destroyed (tmp, tmp_tag))
2155 break;
2156 }
2157
2158 if ( ! was_destroyed (tmp, tmp_tag) && tmp->inv == NULL)
2159 decrease_ob (tmp); 1896 decrease_ob (tmp);
1897 return;
1898 }
1899
1900 while (tmp->inv)
1901 {
1902 treas = tmp->inv;
1903
1904 treas->remove ();
1905 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
1906
1907 treas->x = op->x;
1908 treas->y = op->y;
1909 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
1910
1911 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
1912 spring_trap (treas, op);
1913
1914 /* If either player or container was destroyed, no need to do
1915 * further processing. I think this should be enclused with
1916 * spring trap above, as I don't think there is otherwise
1917 * any way for the treasure chest or player to get killed
1918 */
1919 if (op->destroyed () || tmp->destroyed ())
1920 break;
1921 }
1922
1923 if (!tmp->destroyed () && tmp->inv == NULL)
1924 decrease_ob (tmp);
2160 1925
2161} 1926}
2162 1927
2163/** 1928/**
2164 * op eats food. 1929 * op eats food.
2165 * If player, takes care of messages and dragon special food. 1930 * If player, takes care of messages and dragon special food.
2166 */ 1931 */
1932static void
2167static void apply_food (object *op, object *tmp) 1933apply_food (object *op, object *tmp)
2168{ 1934{
2169 int capacity_remaining; 1935 int capacity_remaining;
2170 1936
2171 if(op->type!=PLAYER) 1937 if (op->type != PLAYER)
2172 op->stats.hp=op->stats.maxhp; 1938 op->stats.hp = op->stats.maxhp;
2173 else { 1939 else
1940 {
2174 /* check if this is a dragon (player), eating some flesh */ 1941 /* check if this is a dragon (player), eating some flesh */
2175 if (tmp->type==FLESH && is_dragon_pl(op) && dragon_eat_flesh(op, tmp)) 1942 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
2176 ; 1943 ;
2177 else { 1944 else
1945 {
2178 /* usual case - no dragon meal: */ 1946 /* usual case - no dragon meal: */
2179 if(op->stats.food+tmp->stats.food>999) { 1947 if (op->stats.food + tmp->stats.food > 999)
1948 {
2180 if(tmp->type==FOOD || tmp->type==FLESH) 1949 if (tmp->type == FOOD || tmp->type == FLESH)
2181 new_draw_info(NDI_UNIQUE, 0,op,"You feel full, but what a waste of food!"); 1950 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!");
2182 else 1951 else
2183 new_draw_info(NDI_UNIQUE, 0,op,"Most of the drink goes down your face not your throat!"); 1952 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!");
2184 } 1953 }
2185 1954
2186 if(!QUERY_FLAG(tmp, FLAG_CURSED)) { 1955 if (!QUERY_FLAG (tmp, FLAG_CURSED))
1956 {
2187 char buf[MAX_BUF]; 1957 char buf[MAX_BUF];
2188 1958
2189 if (!is_dragon_pl(op)) { 1959 if (!is_dragon_pl (op))
1960 {
2190 /* eating message for normal players*/ 1961 /* eating message for normal players */
2191 if(tmp->type==DRINK) 1962 if (tmp->type == DRINK)
2192 sprintf(buf,"Ahhh...that %s tasted good.",tmp->name); 1963 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name);
2193 else 1964 else
2194 sprintf(buf,"The %s tasted %s",tmp->name, 1965 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2195 tmp->type==FLESH?"terrible!":"good."); 1966 }
2196 } 1967 else
2197 else { 1968 {
2198 /* eating message for dragon players*/ 1969 /* eating message for dragon players */
2199 sprintf(buf,"The %s tasted terrible!",tmp->name); 1970 sprintf (buf, "The %s tasted terrible!", &tmp->name);
2200 } 1971 }
2201 1972
2202 new_draw_info(NDI_UNIQUE, 0,op,buf); 1973 new_draw_info (NDI_UNIQUE, 0, op, buf);
2203 capacity_remaining = 999 - op->stats.food; 1974 capacity_remaining = 999 - op->stats.food;
2204 op->stats.food+=tmp->stats.food; 1975 op->stats.food += tmp->stats.food;
2205 if(capacity_remaining < tmp->stats.food) 1976 if (capacity_remaining < tmp->stats.food)
2206 op->stats.hp += capacity_remaining / 50; 1977 op->stats.hp += capacity_remaining / 50;
2207 else 1978 else
2208 op->stats.hp+=tmp->stats.food/50; 1979 op->stats.hp += tmp->stats.food / 50;
2209 if(op->stats.hp>op->stats.maxhp) 1980 if (op->stats.hp > op->stats.maxhp)
2210 op->stats.hp=op->stats.maxhp; 1981 op->stats.hp = op->stats.maxhp;
2211 if (op->stats.food > 999) 1982 if (op->stats.food > 999)
2212 op->stats.food = 999; 1983 op->stats.food = 999;
2213 } 1984 }
2214 1985
2215 /* special food hack -b.t. */ 1986 /* special food hack -b.t. */
2216 if(tmp->title || QUERY_FLAG(tmp,FLAG_CURSED)) 1987 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2217 eat_special_food(op,tmp); 1988 eat_special_food (op, tmp);
2218 } 1989 }
2219 } 1990 }
2220 handle_apply_yield(tmp); 1991 handle_apply_yield (tmp);
2221 decrease_ob(tmp); 1992 decrease_ob (tmp);
2222} 1993}
2223 1994
2224/** 1995/**
2225 * A dragon is eating some flesh. If the flesh contains resistances, 1996 * A dragon is eating some flesh. If the flesh contains resistances,
2226 * there is a chance for the dragon's skin to get improved. 1997 * there is a chance for the dragon's skin to get improved.
… …
2229 * object *op the object (dragon player) eating the flesh 2000 * object *op the object (dragon player) eating the flesh
2230 * object *meal the flesh item, getting chewed in dragon's mouth 2001 * object *meal the flesh item, getting chewed in dragon's mouth
2231 * return: 2002 * return:
2232 * int 1 if eating successful, 0 if it doesn't work 2003 * int 1 if eating successful, 0 if it doesn't work
2233 */ 2004 */
2005int
2234int dragon_eat_flesh(object *op, object *meal) { 2006dragon_eat_flesh (object *op, object *meal)
2007{
2235 object *skin = NULL; /* pointer to dragon skin force*/ 2008 object *skin = NULL; /* pointer to dragon skin force */
2236 object *abil = NULL; /* pointer to dragon ability force*/ 2009 object *abil = NULL; /* pointer to dragon ability force */
2237 object *tmp = NULL; /* tmp. object */ 2010 object *tmp = NULL; /* tmp. object */
2238 2011
2239 char buf[MAX_BUF]; /* tmp. string buffer */ 2012 char buf[MAX_BUF]; /* tmp. string buffer */
2240 double chance; /* improvement-chance of one resistance type */ 2013 double chance; /* improvement-chance of one resistance type */
2241 double totalchance=1; /* total chance of gaining one resistance */ 2014 double totalchance = 1; /* total chance of gaining one resistance */
2242 double bonus=0; /* level bonus (improvement is easier at lowlevel) */ 2015 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2243 double mbonus=0; /* monster bonus */ 2016 double mbonus = 0; /* monster bonus */
2244 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2017 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
2245 int winners=0; /* number of winners */ 2018 int winners = 0; /* number of winners */
2246 int i; /* index */ 2019 int i; /* index */
2247 2020
2248 /* let's make sure and doublecheck the parameters */ 2021 /* let's make sure and doublecheck the parameters */
2249 if (meal->type!=FLESH || !is_dragon_pl(op)) 2022 if (meal->type != FLESH || !is_dragon_pl (op))
2250 return 0; 2023 return 0;
2251 2024
2252 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2025 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2253 from the player's inventory */ 2026 from the player's inventory */
2027 shstr_cmp dragon_ability_force ("dragon_ability_force");
2028 shstr_cmp dragon_skin_force ("dragon_skin_force");
2029
2254 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 2030 for (tmp = op->inv; tmp; tmp = tmp->below)
2255 if (tmp->type == FORCE) { 2031 if (tmp->type == FORCE)
2256 if (strcmp(tmp->arch->name, "dragon_skin_force")==0) 2032 if (tmp->arch->name == dragon_skin_force)
2257 skin = tmp; 2033 skin = tmp;
2258 else if (strcmp(tmp->arch->name, "dragon_ability_force")==0) 2034 else if (tmp->arch->name == dragon_ability_force)
2259 abil = tmp; 2035 abil = tmp;
2260 } 2036
2261 }
2262
2263 /* if either skin or ability are missing, this is an old player 2037 /* if either skin or ability are missing, this is an old player
2264 which is not to be considered a dragon -> bail out */ 2038 which is not to be considered a dragon -> bail out */
2265 if (skin == NULL || abil == NULL) return 0; 2039 if (skin == NULL || abil == NULL)
2266 2040 return 0;
2041
2267 /* now start by filling stomache and health, according to food-value */ 2042 /* now start by filling stomache and health, according to food-value */
2268 if((999 - op->stats.food) < meal->stats.food) 2043 if ((999 - op->stats.food) < meal->stats.food)
2269 op->stats.hp += (999 - op->stats.food) / 50; 2044 op->stats.hp += (999 - op->stats.food) / 50;
2270 else 2045 else
2271 op->stats.hp += meal->stats.food/50; 2046 op->stats.hp += meal->stats.food / 50;
2272 if(op->stats.hp>op->stats.maxhp) 2047 if (op->stats.hp > op->stats.maxhp)
2273 op->stats.hp=op->stats.maxhp; 2048 op->stats.hp = op->stats.maxhp;
2274 2049
2275 op->stats.food = MIN(999, op->stats.food + meal->stats.food); 2050 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2276 2051
2277 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level);*/ 2052 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */
2278 2053
2279 /* on to the interesting part: chances for adding resistance */ 2054 /* on to the interesting part: chances for adding resistance */
2280 for (i=0; i<NROFATTACKS; i++) { 2055 for (i = 0; i < NROFATTACKS; i++)
2056 {
2281 if (meal->resist[i] > 0 && atnr_is_dragon_enabled(i)) { 2057 if (meal->resist[i] > 0 && atnr_is_dragon_enabled (i))
2058 {
2282 /* got positive resistance, now calculate improvement chance (0-100) */ 2059 /* got positive resistance, now calculate improvement chance (0-100) */
2283 2060
2284 /* this bonus makes resistance increase easier at lower levels */ 2061 /* this bonus makes resistance increase easier at lower levels */
2285 bonus = (settings.max_level - op->level) * 30. / ((double)settings.max_level); 2062 bonus = (settings.max_level - op->level) * 30. / ((double) settings.max_level);
2286 if (i == abil->stats.exp) 2063 if (i == abil->stats.exp)
2287 bonus += 5; /* additional bonus for resistance of ability-focus */ 2064 bonus += 5; /* additional bonus for resistance of ability-focus */
2288 2065
2289 /* monster bonus increases with level, because high-level 2066 /* monster bonus increases with level, because high-level
2290 flesh is too rare */ 2067 flesh is too rare */
2291 mbonus = op->level * 20. / ((double)settings.max_level); 2068 mbonus = op->level * 20. / ((double) settings.max_level);
2292 2069
2293 chance = (((double)MIN(op->level+bonus, meal->level+bonus+mbonus))*100. / 2070 chance = (((double) MIN (op->level + bonus, meal->level + bonus + mbonus)) * 100. /
2294 ((double)settings.max_level)) - skin->resist[i]; 2071 ((double) settings.max_level)) - skin->resist[i];
2295 2072
2296 if (chance >= 0.) 2073 if (chance >= 0.)
2297 chance += 1.; 2074 chance += 1.;
2298 else 2075 else
2299 chance = (chance < -12) ? 0. : 1./pow(2., -chance); 2076 chance = (chance < -12) ? 0. : 1. / pow (2., -chance);
2300 2077
2301 /* chance is proportional to amount of resistance (max. 50) */ 2078 /* chance is proportional to amount of resistance (max. 50) */
2302 chance *= ((double)(MIN(meal->resist[i], 50)))/50.; 2079 chance *= ((double) (MIN (meal->resist[i], 50))) / 50.;
2303 2080
2304 /* doubled chance for resistance of ability-focus */ 2081 /* doubled chance for resistance of ability-focus */
2305 if (i == abil->stats.exp) 2082 if (i == abil->stats.exp)
2306 chance = MIN(100., chance*2.); 2083 chance = MIN (100., chance * 2.);
2307 2084
2308 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2085 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2309 if (RANDOM()%10000 < (int)(chance*100)) { 2086 if (rndm (10000) < (unsigned int) (chance * 100))
2087 {
2310 atnr_winner[winners] = i; 2088 atnr_winner[winners] = i;
2311 winners++; 2089 winners++;
2312 } 2090 }
2313 2091
2314 if (chance >= 0.01 ) totalchance *= 1 - chance/100; 2092 if (chance >= 0.01)
2315 2093 totalchance *= 1 - chance / 100;
2094
2316 /*LOG(llevDebug, " %s: bonus %.1f, chance %.1f\n", attacks[i], bonus, chance);*/ 2095 /*LOG(llevDebug, " %s: bonus %.1f, chance %.1f\n", attacks[i], bonus, chance); */
2317 } 2096 }
2318 } 2097 }
2319 2098
2320 /* inverse totalchance as until now we have the failure-chance */ 2099 /* inverse totalchance as until now we have the failure-chance */
2321 totalchance = 100 - totalchance*100; 2100 totalchance = 100 - totalchance * 100;
2322 /* print message according to totalchance */ 2101 /* print message according to totalchance */
2323 if (totalchance > 50.) 2102 if (totalchance > 50.)
2324 sprintf(buf, "Hmm! The %s tasted delicious!", meal->name); 2103 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name);
2325 else if (totalchance > 10.) 2104 else if (totalchance > 10.)
2326 sprintf(buf, "The %s tasted very good.", meal->name); 2105 sprintf (buf, "The %s tasted very good.", &meal->name);
2327 else if (totalchance > 1.) 2106 else if (totalchance > 1.)
2328 sprintf(buf, "The %s tasted good.", meal->name); 2107 sprintf (buf, "The %s tasted good.", &meal->name);
2329 else if (totalchance > 0.1) 2108 else if (totalchance > 0.1)
2330 sprintf(buf, "The %s tasted bland.", meal->name); 2109 sprintf (buf, "The %s tasted bland.", &meal->name);
2331 else if (totalchance >= 0.01) 2110 else if (totalchance >= 0.01)
2332 sprintf(buf, "The %s had a boring taste.", meal->name); 2111 sprintf (buf, "The %s had a boring taste.", &meal->name);
2333 else if (meal->last_eat > 0 && atnr_is_dragon_enabled(meal->last_eat)) 2112 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2334 sprintf(buf, "The %s tasted strange.", meal->name); 2113 sprintf (buf, "The %s tasted strange.", &meal->name);
2335 else 2114 else
2336 sprintf(buf, "The %s had no taste.", meal->name); 2115 sprintf (buf, "The %s had no taste.", &meal->name);
2337 new_draw_info(NDI_UNIQUE, 0, op, buf); 2116 new_draw_info (NDI_UNIQUE, 0, op, buf);
2338 2117
2339 /* now choose a winner if we have any */ 2118 /* now choose a winner if we have any */
2340 i = -1; 2119 i = -1;
2341 if (winners>0) 2120 if (winners > 0)
2342 i = atnr_winner[RANDOM()%winners]; 2121 i = atnr_winner[RANDOM () % winners];
2343 2122
2344 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) { 2123 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2124 {
2345 /* resistance increased! */ 2125 /* resistance increased! */
2346 skin->resist[i]++; 2126 skin->resist[i]++;
2347 fix_player(op); 2127 op->update_stats ();
2348 2128
2349 sprintf(buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2129 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]);
2350 new_draw_info(NDI_UNIQUE|NDI_RED, 0, op, buf); 2130 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2351 } 2131 }
2352 2132
2353 /* if this flesh contains a new ability focus, we mark it 2133 /* if this flesh contains a new ability focus, we mark it
2354 into the ability_force and it will take effect on next level */ 2134 into the ability_force and it will take effect on next level */
2355 if (meal->last_eat > 0 && atnr_is_dragon_enabled(meal->last_eat) 2135 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2356 && meal->last_eat != abil->last_eat) { 2136 {
2357 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2137 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2358 2138
2359 if (meal->last_eat != abil->stats.exp) { 2139 if (meal->last_eat != abil->stats.exp)
2140 {
2360 sprintf(buf, "Your metabolism prepares to focus on %s!", 2141 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2361 change_resist_msg[meal->last_eat]);
2362 new_draw_info(NDI_UNIQUE, 0, op, buf); 2142 new_draw_info (NDI_UNIQUE, 0, op, buf);
2363 sprintf(buf, "The change will happen at level %d", abil->level + 1); 2143 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2364 new_draw_info(NDI_UNIQUE, 0, op, buf); 2144 new_draw_info (NDI_UNIQUE, 0, op, buf);
2365 } 2145 }
2366 else { 2146 else
2147 {
2367 sprintf(buf, "Your metabolism will continue to focus on %s.", 2148 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]);
2368 change_resist_msg[meal->last_eat]);
2369 new_draw_info(NDI_UNIQUE, 0, op, buf); 2149 new_draw_info (NDI_UNIQUE, 0, op, buf);
2370 abil->last_eat = 0; 2150 abil->last_eat = 0;
2371 } 2151 }
2372 } 2152 }
2373 return 1; 2153 return 1;
2374}
2375
2376static void apply_savebed (object *pl)
2377{
2378#ifndef COZY_SERVER
2379 if(!pl->contr->name_changed||!pl->stats.exp) {
2380 new_draw_info(NDI_UNIQUE, 0,pl,"You don't deserve to save your character yet.");
2381 return;
2382 }
2383#endif
2384 /* Need to call terminate_all_pets() before we remove the player ob */
2385 terminate_all_pets(pl);
2386 remove_ob(pl);
2387 pl->direction=0;
2388 new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl,
2389 "%s leaves the game.",pl->name);
2390
2391 /* update respawn position */
2392 strcpy(pl->contr->savebed_map, pl->map->path);
2393 pl->contr->bed_x = pl->x;
2394 pl->contr->bed_y = pl->y;
2395
2396 strcpy(pl->contr->killer,"left");
2397 check_score(pl); /* Always check score */
2398 (void)save_player(pl,0);
2399 pl->map->players--;
2400#if MAP_MAXTIMEOUT
2401 MAP_SWAP_TIME(pl->map) = MAP_TIMEOUT(pl->map);
2402#endif
2403 play_again(pl);
2404 pl->speed = 0;
2405 update_ob_speed(pl);
2406} 2154}
2407 2155
2408/** 2156/**
2409 * Handles applying an improve armor scroll. 2157 * Handles applying an improve armor scroll.
2410 * Does some sanity checks, then calls improve_armour. 2158 * Does some sanity checks, then calls improve_armour.
2411 */ 2159 */
2160static void
2412static void apply_armour_improver (object *op, object *tmp) 2161apply_armour_improver (object *op, object *tmp)
2413{ 2162{
2414 object *armor; 2163 object *armor;
2415 2164
2416 if (!QUERY_FLAG(op, FLAG_WIZCAST) && (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) { 2165 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
2166 {
2417 new_draw_info(NDI_UNIQUE, 0,op,"Something blocks the magic of the scroll."); 2167 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
2418 return;
2419 }
2420 armor=find_marked_object(op);
2421 if ( ! armor) {
2422 new_draw_info(NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2423 return; 2168 return;
2424 } 2169 }
2170
2171 armor = find_marked_object (op);
2172
2173 if (!armor)
2174 {
2175 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2176 return;
2177 }
2178
2425 if (armor->type != ARMOUR 2179 if (armor->type != ARMOUR
2426 && armor->type != CLOAK 2180 && armor->type != CLOAK
2427 && armor->type != BOOTS && armor->type != GLOVES 2181 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2428 && armor->type != BRACERS && armor->type != SHIELD
2429 && armor->type != HELMET)
2430 { 2182 {
2431 new_draw_info(NDI_UNIQUE, 0,op,"Your marked item is not armour!\n"); 2183 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
2432 return; 2184 return;
2433 } 2185 }
2434 2186
2435 new_draw_info(NDI_UNIQUE, 0,op,"Applying armour enchantment."); 2187 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2436 improve_armour(op,tmp,armor); 2188 improve_armour (op, tmp, armor);
2437} 2189}
2438 2190
2439 2191extern void
2440extern void apply_poison (object *op, object *tmp) 2192apply_poison (object *op, object *tmp)
2441{ 2193{
2442 if (op->type == PLAYER) { 2194 if (op->type == PLAYER)
2195 {
2443 play_sound_player_only(op->contr, SOUND_DRINK_POISON,0,0); 2196 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0);
2444 new_draw_info(NDI_UNIQUE, 0,op,"Yech! That tasted poisonous!"); 2197 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");
2445 strcpy(op->contr->killer,"poisonous booze"); 2198 strcpy (op->contr->killer, "poisonous booze");
2446 } 2199 }
2447 if (tmp->stats.hp > 0) { 2200 if (tmp->stats.hp > 0)
2201 {
2448 LOG(llevDebug,"Trying to poison player/monster for %d hp\n", 2202 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2449 tmp->stats.hp);
2450 hit_player(op, tmp->stats.hp, tmp, AT_POISON, 1); 2203 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2451 } 2204 }
2452 op->stats.food-=op->stats.food/4; 2205 op->stats.food -= op->stats.food / 4;
2453 handle_apply_yield(tmp); 2206 handle_apply_yield (tmp);
2454 decrease_ob(tmp); 2207 decrease_ob (tmp);
2455} 2208}
2456 2209
2457/** 2210/**
2458 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2211 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2459 * A valid 2 way exit means: 2212 * A valid 2 way exit means:
2460 * -You can come back (there is another exit at the other side) 2213 * -You can come back (there is another exit at the other side)
2461 * -You are 2214 * -You are
2462 * ° the owner of the exit 2215 * ° the owner of the exit
2463 * ° or in the same party as the owner 2216 * ° or in the same party as the owner
2464 * 2217 *
2465 * Note: a owner in a 2 way exit is saved as the owner's name 2218 * Note: a owner in a 2 way exit is saved as the owner's name
2466 * in the field exit->name cause the field exit->owner doesn't 2219 * in the field exit->name cause the field exit->owner doesn't
2467 * survive in the swapping (in fact the whole exit doesn't survive). 2220 * survive in the swapping (in fact the whole exit doesn't survive).
2468 */ 2221 */
2222int
2469int is_legal_2ways_exit (object* op, object *exit) 2223is_legal_2ways_exit (object *op, object *exit)
2470 { 2224{
2471 object * tmp; 2225 if (exit->stats.exp != 1)
2472 object * exit_owner; 2226 return 1; /*This is not a 2 way, so it is legal */
2473 player * pp; 2227
2474 mapstruct * exitmap; 2228#if 0 //TODO
2475 if (exit->stats.exp!=1) return 1; /*This is not a 2 way, so it is legal*/ 2229 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2476 if (!has_been_loaded(EXIT_PATH(exit)) && exit->race) return 0; /* This is a reset town portal */ 2230 return 0; /* This is a reset town portal */
2477 /* To know if an exit has a correspondant, we look at 2231#endif
2478 * all the exits in destination and try to find one with same path as 2232
2479 * the current exit's position */ 2233 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2480 if (!strncmp(EXIT_PATH (exit), settings.localdir, strlen(settings.localdir))) 2234
2481 exitmap = ready_map_name(EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2482 else exitmap = ready_map_name(EXIT_PATH (exit), 0);
2483 if (exitmap) 2235 if (exitmap)
2484 { 2236 {
2485 tmp=get_map_ob (exitmap,EXIT_X(exit),EXIT_Y(exit)); 2237 exitmap->load_sync ();
2486 if (!tmp) return 0; 2238
2487 for ( (tmp=get_map_ob(exitmap,EXIT_X(exit),EXIT_Y(exit)));tmp;tmp=tmp->above) 2239 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2240
2241 if (!tmp)
2242 return 0;
2243
2244 for (; tmp; tmp = tmp->above)
2488 { 2245 {
2489 if (tmp->type!=EXIT) continue; /*Not an exit*/ 2246 if (tmp->type != EXIT)
2490 if (!EXIT_PATH (tmp)) continue; /*Not a valid exit*/ 2247 continue; /*Not an exit */
2491 if ( (EXIT_X(tmp)!=exit->x) || (EXIT_Y(tmp)!=exit->y)) continue; /*Not in the same place*/
2492 if (strcmp(exit->map->path,EXIT_PATH(tmp))!=0) continue; /*Not in the same map*/
2493 2248
2249 if (!EXIT_PATH (tmp))
2250 continue; /*Not a valid exit */
2251
2252 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2253 continue; /*Not in the same place */
2254
2255 if (exit->map->path != EXIT_PATH (tmp))
2256 continue; /*Not in the same map */
2257
2494 /* From here we have found the exit is valid. However we do 2258 /* From here we have found the exit is valid. However we do
2495 * here the check of the exit owner. It is important for the 2259 * here the check of the exit owner. It is important for the
2496 * town portals to prevent strangers from visiting your appartments 2260 * town portals to prevent strangers from visiting your appartments
2497 */ 2261 */
2262 if (!exit->race)
2498 if (!exit->race) return 1; /*No owner, free for all!*/ 2263 return 1; /*No owner, free for all! */
2499 exit_owner=NULL; 2264
2500 for (pp=first_player;pp;pp=pp->next) 2265 object *exit_owner = 0;
2266
2267 for_all_players (pp)
2501 { 2268 {
2502 if (!pp->ob) continue; 2269 if (!pp->ob)
2270 continue;
2271
2503 if (pp->ob->name!=exit->race) continue; 2272 if (pp->ob->name != exit->race)
2273 continue;
2274
2504 exit_owner= pp->ob; /*We found a player which correspond to the player name*/ 2275 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2505 break; 2276 break;
2506 } 2277 }
2507 if (!exit_owner) return 0; /* No more owner*/ 2278
2508 if (exit_owner->contr==op->contr) return 1; /*It is your exit*/ 2279 if (!exit_owner)
2280 return 0; /* No more owner */
2281
2282 if (exit_owner->contr == op->contr)
2283 return 1; /*It is your exit */
2284
2509 if ( exit_owner && /*There is a owner*/ 2285 if (exit_owner && /*There is a owner */
2510 (op->contr) && /*A player tries to pass */ 2286 (op->contr) && /*A player tries to pass */
2511 ( (exit_owner->contr->party==NULL) || /*No pass if controller has no party*/ 2287 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2512 (exit_owner->contr->party!=op->contr->party)) ) /* Or not the same as op*/ 2288 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2513 return 0; 2289 return 0;
2290
2514 return 1; 2291 return 1;
2515 } 2292 }
2516 } 2293 }
2294
2517 return 0; 2295 return 0;
2518 } 2296}
2519
2520 2297
2521/** 2298/**
2522 * Main apply handler. 2299 * Main apply handler.
2523 * 2300 *
2524 * Checks for unpaid items before applying. 2301 * Checks for unpaid items before applying.
… …
2532 * being applied. 2309 * being applied.
2533 * 2310 *
2534 * aflag is special (always apply/unapply) flags. Nothing is done with 2311 * aflag is special (always apply/unapply) flags. Nothing is done with
2535 * them in this function - they are passed to apply_special 2312 * them in this function - they are passed to apply_special
2536 */ 2313 */
2537 2314int
2538int manual_apply (object *op, object *tmp, int aflag) 2315manual_apply (object *op, object *tmp, int aflag)
2539{ 2316{
2540 if (tmp->head) tmp=tmp->head; 2317 if (tmp->head)
2318 tmp = tmp->head;
2541 2319
2542 if (QUERY_FLAG (tmp, FLAG_UNPAID) && ! QUERY_FLAG (tmp, FLAG_APPLIED)) { 2320 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2321 {
2543 if (op->type == PLAYER) { 2322 if (op->type == PLAYER)
2323 {
2544 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2324 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2545 return 1; 2325 return 1;
2546 } else { 2326 }
2327 else
2547 return 0; /* monsters just skip unpaid items */ 2328 return 0; /* monsters just skip unpaid items */
2548 } 2329 }
2330
2331 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2332 return RESULT_INT (0);
2333
2334 switch (tmp->type)
2549 } 2335 {
2550 2336 case CF_HANDLE:
2551 2337 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2552 /* Lauwenmark: Handle for plugin apply event */ 2338 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2553 //TODO: remove 2339 tmp->value = tmp->value ? 0 : 1;
2554 if (execute_event(tmp, EVENT_APPLY,op,NULL,NULL,SCRIPT_FIX_ALL)!=0) 2340 SET_ANIMATION (tmp, tmp->value);
2341 update_object (tmp, UP_OBJ_FACE);
2342 push_button (tmp);
2555 return 1; 2343 return 1;
2556 2344
2557 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2345 case TRIGGER:
2346 if (check_trigger (tmp, op))
2347 {
2348 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2349 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2350 }
2351 else
2352 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2353
2558 return 1; 2354 return 1;
2559 2355
2560 switch (tmp->type) { 2356 case EXIT:
2561
2562 case TRANSPORT:
2563 return apply_transport(op, tmp, aflag);
2564
2565 case CF_HANDLE:
2566 new_draw_info(NDI_UNIQUE, 0,op,"You turn the handle.");
2567 play_sound_map(op->map, op->x, op->y, SOUND_TURN_HANDLE);
2568 tmp->value=tmp->value?0:1;
2569 SET_ANIMATION(tmp, tmp->value);
2570 update_object(tmp,UP_OBJ_FACE);
2571 push_button(tmp);
2572 return 1;
2573
2574 case TRIGGER:
2575 if (check_trigger (tmp, op)) {
2576 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2577 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2578 } else {
2579 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2580 }
2581 return 1;
2582
2583 case EXIT:
2584 if (op->type != PLAYER) 2357 if (op->type != PLAYER)
2585 return 0; 2358 return 0;
2359
2586 if( ! EXIT_PATH (tmp) || !is_legal_2ways_exit(op,tmp)) { 2360 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2587 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", 2361 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2588 query_name(tmp)); 2362 else
2589 } else { 2363 {
2590 /* Don't display messages for random maps. */ 2364 /* Don't display messages for random maps. */
2591 if (tmp->msg && strncmp(EXIT_PATH(tmp),"/!",2) && 2365 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2592 strncmp(EXIT_PATH(tmp), "/random/", 8))
2593 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2366 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2594 enter_exit(op,tmp); 2367
2595 } 2368 op->enter_exit (tmp);
2369 }
2370
2596 return 1; 2371 return 1;
2597 2372
2598 case SIGN: 2373 case SIGN:
2599 apply_sign (op, tmp, 0); 2374 apply_sign (op, tmp, 0);
2600 return 1; 2375 return 1;
2601 2376
2602 case BOOK: 2377 case BOOK:
2603 if (op->type == PLAYER) { 2378 if (op->type == PLAYER)
2379 {
2604 apply_book (op, tmp); 2380 apply_book (op, tmp);
2605 return 1; 2381 return 1;
2606 } else { 2382 }
2607 return 0; 2383 else
2608 } 2384 return 0;
2609 2385
2610 case SKILLSCROLL: 2386 case SKILLSCROLL:
2611 if (op->type == PLAYER) { 2387 if (op->type == PLAYER)
2388 {
2612 apply_skillscroll (op, tmp); 2389 apply_skillscroll (op, tmp);
2613 return 1; 2390 return 1;
2614 } 2391 }
2392 else
2615 return 0; 2393 return 0;
2616 2394
2617 case SPELLBOOK: 2395 case SPELLBOOK:
2618 if (op->type == PLAYER) { 2396 if (op->type == PLAYER)
2397 {
2619 apply_spellbook (op, tmp); 2398 apply_spellbook (op, tmp);
2620 return 1; 2399 return 1;
2621 } 2400 }
2401 else
2622 return 0; 2402 return 0;
2623 2403
2624 case SCROLL: 2404 case SCROLL:
2625 apply_scroll (op, tmp, 0); 2405 apply_scroll (op, tmp, 0);
2626 return 1; 2406 return 1;
2627 2407
2628 case POTION: 2408 case POTION:
2629 (void) apply_potion(op, tmp); 2409 apply_potion (op, tmp);
2630 return 1; 2410 return 1;
2631 2411
2632 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2412 /* Eneq(@csd.uu.se): Handle apply on containers. */
2413 //TODO: remove, as it is unsed?
2633 case CLOSE_CON: 2414 case CLOSE_CON:
2634 if (op->type==PLAYER)
2635 (void) esrv_apply_container (op, tmp->env);
2636 else
2637 (void) apply_container (op, tmp->env); 2415 apply_container (op, tmp->env);
2638 return 1; 2416 return 1;
2639 2417
2640 case CONTAINER: 2418 case CONTAINER:
2641 if (op->type==PLAYER)
2642 (void) esrv_apply_container (op, tmp);
2643 else
2644 (void) apply_container (op, tmp); 2419 apply_container (op, tmp);
2645 return 1; 2420 return 1;
2646 2421
2647 case TREASURE: 2422 case TREASURE:
2648 if (op->type == PLAYER) { 2423 if (op->type == PLAYER)
2424 {
2649 apply_treasure (op, tmp); 2425 apply_treasure (op, tmp);
2650 return 1; 2426 return 1;
2651 } else { 2427 }
2652 return 0; 2428 else
2653 } 2429 return 0;
2654 2430
2655 case WEAPON: 2431 case WEAPON:
2656 case ARMOUR: 2432 case ARMOUR:
2657 case BOOTS: 2433 case BOOTS:
2658 case GLOVES: 2434 case GLOVES:
2659 case AMULET: 2435 case AMULET:
2660 case GIRDLE: 2436 case GIRDLE:
2661 case BRACERS: 2437 case BRACERS:
2662 case SHIELD: 2438 case SHIELD:
2663 case HELMET: 2439 case HELMET:
2664 case RING: 2440 case RING:
2665 case CLOAK: 2441 case CLOAK:
2666 case WAND: 2442 case WAND:
2667 case ROD: 2443 case ROD:
2668 case HORN: 2444 case HORN:
2669 case SKILL: 2445 case SKILL:
2670 case BOW: 2446 case BOW:
2671 case LAMP: 2447 case LAMP:
2672 case BUILDER: 2448 case BUILDER:
2673 case SKILL_TOOL: 2449 case SKILL_TOOL:
2674 if (tmp->env != op) 2450 if (tmp->env != op)
2675 return 2; /* not in inventory */ 2451 return 2; /* not in inventory */
2452
2676 (void) apply_special (op, tmp, aflag); 2453 apply_special (op, tmp, aflag);
2677 return 1; 2454 return 1;
2678 2455
2679 case DRINK: 2456 case DRINK:
2680 case FOOD: 2457 case FOOD:
2681 case FLESH: 2458 case FLESH:
2682 apply_food (op, tmp); 2459 apply_food (op, tmp);
2683 return 1; 2460 return 1;
2684 2461
2685 case POISON: 2462 case POISON:
2686 apply_poison (op, tmp); 2463 apply_poison (op, tmp);
2687 return 1; 2464 return 1;
2688 2465
2689 case SAVEBED: 2466 case SAVEBED:
2467 return 1;
2468
2469 case ARMOUR_IMPROVER:
2690 if (op->type == PLAYER) { 2470 if (op->type == PLAYER)
2691 apply_savebed (op); 2471 {
2692 return 1; 2472 apply_armour_improver (op, tmp);
2693 } else { 2473 return 1;
2694 return 0; 2474 }
2695 } 2475 else
2476 return 0;
2696 2477
2697 case ARMOUR_IMPROVER: 2478 case WEAPON_IMPROVER:
2479 check_improve_weapon (op, tmp);
2480 return 1;
2481
2482 case CLOCK:
2698 if (op->type == PLAYER) { 2483 if (op->type == PLAYER)
2699 apply_armour_improver (op, tmp); 2484 {
2700 return 1; 2485 char buf[MAX_BUF];
2701 } else { 2486 timeofday_t tod;
2702 return 0;
2703 }
2704 2487
2705 case WEAPON_IMPROVER: 2488 get_tod (&tod);
2706 (void) check_improve_weapon(op, tmp); 2489 sprintf (buf, "It is %d minute%s past %d o'clock %s",
2707 return 1; 2490 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2491 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"));
2492 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2493 new_draw_info (NDI_UNIQUE, 0, op, buf);
2494 return 1;
2495 }
2496 else
2497 return 0;
2708 2498
2709 case CLOCK: 2499 case MENU:
2710 if (op->type == PLAYER) { 2500 if (op->type == PLAYER)
2711 char buf[MAX_BUF]; 2501 {
2712 timeofday_t tod; 2502 shop_listing (tmp, op);
2503 return 1;
2504 }
2505 else
2506 return 0;
2713 2507
2714 get_tod(&tod);
2715 sprintf(buf, "It is %d minute%s past %d o'clock %s",
2716 tod.minute+1, ((tod.minute+1 < 2) ? "" : "s"),
2717 ((tod.hour % 14 == 0) ? 14 : ((tod.hour)%14)),
2718 ((tod.hour >= 14) ? "pm" : "am"));
2719 play_sound_player_only(op->contr, SOUND_CLOCK,0,0);
2720 new_draw_info(NDI_UNIQUE, 0,op, buf);
2721 return 1;
2722 } else {
2723 return 0;
2724 }
2725
2726 case MENU:
2727 if (op->type == PLAYER) {
2728 shop_listing (op);
2729 return 1;
2730 } else {
2731 return 0;
2732 }
2733
2734 case POWER_CRYSTAL: 2508 case POWER_CRYSTAL:
2735 apply_power_crystal(op,tmp); /* see egoitem.c */ 2509 apply_power_crystal (op, tmp); /* see egoitem.c */
2736 return 1; 2510 return 1;
2737 2511
2738 case LIGHTER: /* for lighting torches/lanterns/etc */ 2512 case LIGHTER: /* for lighting torches/lanterns/etc */
2739 if (op->type == PLAYER) { 2513 if (op->type == PLAYER)
2740 apply_lighter(op,tmp); 2514 {
2741 return 1; 2515 apply_lighter (op, tmp);
2742 } else { 2516 return 1;
2743 return 0; 2517 }
2744 } 2518 else
2519 return 0;
2745 2520
2746 case ITEM_TRANSFORMER: 2521 case ITEM_TRANSFORMER:
2747 apply_item_transformer( op, tmp ); 2522 apply_item_transformer (op, tmp);
2748 return 1; 2523 return 1;
2749 2524
2750 default: 2525 default:
2751 return 0; 2526 return 0;
2752 } 2527 }
2753} 2528}
2754 2529
2755 2530
2756/* quiet suppresses the "don't know how to apply" and "you must get it first" 2531/* quiet suppresses the "don't know how to apply" and "you must get it first"
2757 * messages as needed by player_apply_below(). But there can still be 2532 * messages as needed by player_apply_below(). But there can still be
2758 * "but you are floating high above the ground" messages. 2533 * "but you are floating high above the ground" messages.
2759 * 2534 *
2760 * Same return value as apply() function. 2535 * Same return value as apply() function.
2761 */ 2536 */
2537int
2762int player_apply (object *pl, object *op, int aflag, int quiet) 2538player_apply (object *pl, object *op, int aflag, int quiet)
2763{ 2539{
2764 int tmp; 2540 int tmp;
2765 2541
2766 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) { 2542 if (op->env == NULL && (pl->move_type & MOVE_FLYING))
2543 {
2767 /* player is flying and applying object not in inventory */ 2544 /* player is flying and applying object not in inventory */
2768 if ( ! QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) { 2545 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2546 {
2769 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " 2547 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!");
2770 "above the ground!");
2771 return 0; 2548 return 0;
2772 } 2549 }
2773 }
2774
2775 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2776 * applied.
2777 */
2778 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && ! QUERY_FLAG (pl, FLAG_WAS_WIZ))
2779 { 2550 }
2780 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2781 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff "
2782 "of smoke!");
2783 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2784 remove_ob (op);
2785 free_object (op);
2786 return 1;
2787 }
2788 2551
2789 pl->contr->last_used = op; 2552 pl->contr->last_used = op;
2790 pl->contr->last_used_id = op->count;
2791 2553
2792 tmp = manual_apply (pl, op, aflag); 2554 tmp = manual_apply (pl, op, aflag);
2793 if ( ! quiet) { 2555 if (!quiet)
2556 {
2794 if (tmp == 0) 2557 if (tmp == 0)
2795 new_draw_info_format (NDI_UNIQUE, 0, pl, 2558 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));
2796 "I don't know how to apply the %s.",
2797 query_name (op));
2798 else if (tmp == 2) 2559 else if (tmp == 2)
2799 new_draw_info_format (NDI_UNIQUE, 0, pl, 2560 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");
2800 "You must get it first!\n");
2801 } 2561 }
2802 return tmp; 2562 return tmp;
2803} 2563}
2804 2564
2805/** 2565/**
2806 * player_apply_below attempts to apply the object 'below' the player. 2566 * player_apply_below attempts to apply the object 'below' the player.
2807 * If the player has an open container, we use that for below, otherwise 2567 * If the player has an open container, we use that for below, otherwise
2808 * we use the ground. 2568 * we use the ground.
2809 */ 2569 */
2810 2570void
2811void player_apply_below (object *pl) 2571player_apply_below (object *pl)
2812{ 2572{
2813 object *tmp, *next;
2814 int floors; 2573 int floors = 0;
2815 2574
2816 if (pl->contr->transport && pl->contr->transport->type == TRANSPORT) {
2817 apply_transport(pl, pl->contr->transport, 0);
2818 return;
2819 }
2820
2821 /* If using a container, set the starting item to be the top 2575 /* If using a container, set the starting item to be the top
2822 * item in the container. Otherwise, use the map. 2576 * item in the container. Otherwise, use the map.
2823 */
2824 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2825
2826 /* This is perhaps more complicated. However, I want to make sure that 2577 * This is perhaps more complicated. However, I want to make sure that
2827 * we don't use a corrupt pointer for the next object, so we get the 2578 * we don't use a corrupt pointer for the next object, so we get the
2828 * next object in the stack before applying. This is can only be a 2579 * next object in the stack before applying. This is can only be a
2829 * problem if player_apply() has a bug in that it uses the object but does 2580 * problem if player_apply() has a bug in that it uses the object but does
2830 * not return a proper value. 2581 * not return a proper value.
2831 */ 2582 */
2832 for (floors = 0; tmp!=NULL; tmp=next) { 2583 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2584 {
2833 next = tmp->below; 2585 next = tmp->below;
2586
2834 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2587 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2835 floors++; 2588 floors++;
2836 else if (floors > 0) 2589 else if (floors > 0)
2837 return; /* process only floor objects after first floor object */ 2590 return; /* process only floor objects after first floor object */
2838 2591
2839 /* If it is visible, player can apply it. If it is applied by 2592 /* If it is visible, player can apply it. If it is applied by
2840 * person moving on it, also activate. Added code to make it 2593 * person moving on it, also activate. Added code to make it
2841 * so that at least one of players movement types be that which 2594 * so that at least one of players movement types be that which
2842 * the item needs. 2595 * the item needs.
2843 */ 2596 */
2844 if ( ! tmp->invisible || (tmp->move_on & pl->move_type)) { 2597 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2598 {
2845 if (player_apply (pl, tmp, 0, 1) == 1) 2599 if (player_apply (pl, tmp, 0, 1) == 1)
2846 return; 2600 return;
2847 } 2601 }
2848 if (floors >= 2) 2602 if (floors >= 2)
2849 return; /* process at most two floor objects */ 2603 return; /* process at most two floor objects */
2850 } 2604 }
2851} 2605}
2852 2606
2853/** 2607/**
2854 * Unapplies specified item. 2608 * Unapplies specified item.
2855 * No check done on cursed/damned. 2609 * No check done on cursed/damned.
2856 * Break this out of apply_special - this is just done 2610 * Break this out of apply_special - this is just done
2857 * to keep the size of apply_special to a more managable size. 2611 * to keep the size of apply_special to a more managable size.
2858 */ 2612 */
2613static int
2859static int unapply_special (object *who, object *op, int aflags) 2614unapply_special (object *who, object *op, int aflags)
2860{ 2615{
2861 object *tmp2; 2616 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2617 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2618 return RESULT_INT (0);
2862 2619
2863 CLEAR_FLAG(op, FLAG_APPLIED); 2620 CLEAR_FLAG (op, FLAG_APPLIED);
2864 switch(op->type) {
2865 case WEAPON:
2866 new_draw_info_format(NDI_UNIQUE, 0, who, "You unwield %s.",query_name(op));
2867 2621
2868 (void) change_abil (who,op); 2622 if (player *pl = who->contr)
2869 if(QUERY_FLAG(who,FLAG_READY_WEAPON)) 2623 {
2870 CLEAR_FLAG(who,FLAG_READY_WEAPON); 2624 if (op == pl->ranged_ob) pl->ranged_ob = 0;
2871 /* GROS: update the current_weapon_script field (used with script_attack for weapons) */ 2625 if (op == pl->combat_ob) pl->combat_ob = 0;
2872 who->current_weapon_script = NULL;
2873 who->current_weapon = NULL;
2874 clear_skill(who);
2875 break;
2876 2626
2877 case SKILL: /* allows objects to impart skills */ 2627 if (op == who->current_weapon)
2878 case SKILL_TOOL: 2628 who->change_weapon (pl->combat_ob ? pl->combat_ob : pl->ranged_ob);
2879 if (op != who->chosen_skill) {
2880 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2881 } 2629 }
2882 if (who->type==PLAYER) { 2630 else if (op == who->current_weapon)
2883 if (who->contr->shoottype == range_skill) 2631 who->change_weapon (0);
2884 who->contr->shoottype = range_none;
2885 if ( ! op->invisible) {
2886 new_draw_info_format (NDI_UNIQUE, 0, who,
2887 "You stop using the %s.", query_name(op));
2888 } else {
2889 new_draw_info_format (NDI_UNIQUE, 0, who,
2890 "You can no longer use the skill: %s.",
2891 op->skill);
2892 }
2893 }
2894 (void) change_abil (who, op);
2895 who->chosen_skill = NULL;
2896 CLEAR_FLAG (who, FLAG_READY_SKILL);
2897 break;
2898 2632
2899 case ARMOUR: 2633 switch (op->type)
2900 case HELMET: 2634 {
2901 case SHIELD: 2635 case SKILL_TOOL:
2902 case RING: 2636 // unapplying a skill tool should also unapply the skill it governs
2903 case BOOTS: 2637 // but this is hard, as it shouldn't do so when the skill can
2904 case GLOVES: 2638 // be used for other reasons
2905 case AMULET: 2639 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2906 case GIRDLE: 2640 if (tmp->skill == op->skill
2907 case BRACERS: 2641 && tmp->type == SKILL
2908 case CLOAK: 2642 && tmp->flag [FLAG_APPLIED]
2909 new_draw_info_format(NDI_UNIQUE, 0, who, "You unwear %s.",query_name(op)); 2643 && !tmp->flag [FLAG_CAN_USE_SKILL])
2910 (void) change_abil (who,op); 2644 unapply_special (who, tmp, 0);
2911 break;
2912 case LAMP:
2913 new_draw_info_format(NDI_UNIQUE, 0, who, "You turn off your %s.",
2914 op->name);
2915 tmp2 = arch_to_object(op->other_arch);
2916 tmp2->x = op->x;
2917 tmp2->y = op->y;
2918 tmp2->map = op->map;
2919 tmp2->below = op->below;
2920 tmp2->above = op->above;
2921 tmp2->stats.food = op->stats.food;
2922 CLEAR_FLAG(tmp2, FLAG_APPLIED);
2923 if (QUERY_FLAG(op, FLAG_INV_LOCKED))
2924 SET_FLAG(tmp2, FLAG_INV_LOCKED);
2925 if (who->type == PLAYER)
2926 esrv_del_item(who->contr, (tag_t)op->count);
2927 remove_ob(op);
2928 free_object(op);
2929 insert_ob_in_ob(tmp2, who);
2930 fix_player(who);
2931 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) {
2932 if (who->type == PLAYER) {
2933 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!");
2934 SET_FLAG(tmp2, FLAG_KNOWN_CURSED);
2935 }
2936 }
2937 if(who->type==PLAYER)
2938 esrv_send_item(who, tmp2);
2939 return 1; /* otherwise, an attempt to drop causes problems */
2940 break;
2941 case BOW:
2942 case WAND:
2943 case ROD:
2944 case HORN:
2945 clear_skill(who);
2946 new_draw_info_format(NDI_UNIQUE, 0, who, "You unready %s.",query_name(op));
2947 if(who->type==PLAYER) {
2948 who->contr->shoottype = range_none;
2949 } else {
2950 if (op->type == BOW)
2951 CLEAR_FLAG (who, FLAG_READY_BOW);
2952 else
2953 CLEAR_FLAG(who, FLAG_READY_RANGE);
2954 }
2955 break;
2956 2645
2957 case BUILDER: 2646 change_abil (who, op);
2958 new_draw_info_format(NDI_UNIQUE, 0, who, "You unready %s.",query_name(op));
2959 who->contr->shoottype = range_none;
2960 who->contr->ranges[ range_builder ] = NULL;
2961 break; 2647 break;
2962 2648
2963 default: 2649 case WEAPON:
2650 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2651
2652 change_abil (who, op);
2653 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2654 break;
2655
2656 case SKILL:
2657 if (who->contr)
2658 {
2659 if (!op->invisible)
2660 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2661 else
2662 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2663 }
2664
2665 change_abil (who, op);
2666 CLEAR_FLAG (who, FLAG_READY_SKILL);
2667 break;
2668
2669 case ARMOUR:
2670 case HELMET:
2671 case SHIELD:
2672 case RING:
2673 case BOOTS:
2674 case GLOVES:
2675 case AMULET:
2676 case GIRDLE:
2677 case BRACERS:
2678 case CLOAK:
2964 new_draw_info_format(NDI_UNIQUE, 0, who, "You unapply %s.",query_name(op)); 2679 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2680 change_abil (who, op);
2965 break; 2681 break;
2966 }
2967 2682
2968 fix_player(who); 2683 case LAMP:
2684 {
2685 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2969 2686
2970 if ( ! (aflags & AP_NO_MERGE)) { 2687 object *tmp2 = arch_to_object (op->other_arch);
2971 object *tmp; 2688 tmp2->x = op->x;
2689 tmp2->y = op->y;
2690 tmp2->map = op->map;
2691 tmp2->below = op->below;
2692 tmp2->above = op->above;
2693 tmp2->stats.food = op->stats.food;
2694 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2972 2695
2973 tag_t del_tag = op->count; 2696 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2974 tmp = merge_ob (op, NULL); 2697 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2975 if (who->type == PLAYER) { 2698
2976 if (tmp) { /* it was merged */ 2699 if (who->contr)
2977 esrv_del_item (who->contr, del_tag); 2700 esrv_del_item (who->contr, op->count);
2701
2702 op->destroy ();
2703 insert_ob_in_ob (tmp2, who);
2704 who->update_stats ();
2705
2706 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2707 {
2708 if (who->contr)
2978 op = tmp; 2709 {
2710 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2711 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2712 }
2979 } 2713 }
2714
2715 if (who->contr)
2716 esrv_send_item (who, tmp2);
2717 }
2718
2719 return 1; /* otherwise, an attempt to drop causes problems */
2720
2721 case BOW:
2722 case WAND:
2723 case ROD:
2724 case HORN:
2725 if (who->contr)
2726 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2727 else
2728 {
2729 who->change_skill (0);
2730
2731 if (op->type == BOW)
2732 CLEAR_FLAG (who, FLAG_READY_BOW);
2733 else
2734 CLEAR_FLAG (who, FLAG_READY_RANGE);
2735 }
2736
2737 break;
2738
2739 case BUILDER:
2740 if (who->contr)
2741 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2742 break;
2743
2744 default:
2745 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2746 break;
2747 }
2748
2749 who->update_stats ();
2750
2751 if (!(aflags & AP_NO_MERGE))
2752 {
2753 object *tmp = merge_ob (op, 0);
2754
2755 if (who->contr)
2756 {
2757 if (tmp)
2758 { /* it was merged */
2759 esrv_del_item (who->contr, op->count);
2760 op = tmp;
2761 }
2762
2980 esrv_send_item (who, op); 2763 esrv_send_item (who, op);
2981 } 2764 }
2982 } 2765 }
2766
2983 return 0; 2767 return 0;
2984} 2768}
2985 2769
2986/** 2770/**
2987 * Returns the object that is using location 'loc'. 2771 * Returns the object that is using location 'loc'.
2988 * Note that 'start' is the first object to start examing - we 2772 * Note that 'start' is the first object to start examing - we
2989 * then go through the below of this. In this way, you can do 2773 * then go through the below of this. In this way, you can do
2990 * something like: 2774 * something like:
2991 * tmp = get_item_from_body_location(who->inv, 1); 2775 * tmp = get_next_item_from_body_location(who->inv, 1);
2992 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2776 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
2993 * to find the second object that may use this location, etc. 2777 * to find the second object that may use this location, etc.
2994 * Returns NULL if no match is found. 2778 * Returns NULL if no match is found.
2995 * loc is the index into the array we are looking for a match. 2779 * loc is the index into the array we are looking for a match.
2996 * don't return invisible objects unless they are skill objects 2780 * don't return invisible objects unless they are skill objects
2997 * invisible other objects that use 2781 * invisible other objects that use
2998 * up body locations can be used as restrictions. 2782 * up body locations can be used as restrictions.
2999 */ 2783 */
3000object *get_item_from_body_location(object *start, int loc) 2784static object *
2785get_next_item_from_body_location (int loc, object *start)
3001{ 2786{
3002 object *tmp;
3003
3004 if (!start) return NULL;
3005
3006 for (tmp=start; tmp; tmp=tmp->below) 2787 for (object *tmp = start; tmp; tmp = tmp->below)
3007 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->body_info[loc] && 2788 if (tmp->flag [FLAG_APPLIED]
3008 (!tmp->invisible || tmp->type==SKILL)) return tmp; 2789 && tmp->slot[loc].info
2790 && (!tmp->invisible || tmp->type == SKILL))
2791 return tmp;
3009 2792
3010 return NULL; 2793 return 0;
3011} 2794}
3012
3013
3014 2795
3015/** 2796/**
3016 * 'op' wants to apply an object, but can't because of other equipment. 2797 * 'op' wants to apply an object, but can't because of other equipment.
3017 * This should only be called when it is known 2798 * This should only be called when it is known
3018 * that there are objects to unapply. This makes pretty heavy 2799 * that there are objects to unapply. This makes pretty heavy
… …
3021 * Returns 0 on success, returns 1 if there is some problem. 2802 * Returns 0 on success, returns 1 if there is some problem.
3022 * if aflags is AP_PRINT, we instead print out waht to unapply 2803 * if aflags is AP_PRINT, we instead print out waht to unapply
3023 * instead of doing it. This is a lot less code than having 2804 * instead of doing it. This is a lot less code than having
3024 * another function that does just that. 2805 * another function that does just that.
3025 */ 2806 */
2807int
3026int unapply_for_ob(object *who, object *op, int aflags) 2808unapply_for_ob (object *who, object *op, int aflags)
3027{ 2809{
3028 int i; 2810 if (op->is_range ())
3029 object *tmp=NULL, *last;
3030
3031 /* If we are applying a shield or weapon, unapply any equipped shield
3032 * or weapons first - only allowed to use one weapon/shield at a time.
3033 */
3034 if (op->type == WEAPON || op->type == SHIELD) {
3035 for (tmp=who->inv; tmp; tmp=tmp->below) { 2811 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3036 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->type == op->type) { 2812 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3037 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || 2813 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3038 (!QUERY_FLAG(tmp, FLAG_CURSED) && !QUERY_FLAG(tmp, FLAG_DAMNED))) { 2814 {
3039 if (aflags & AP_PRINT) 2815 if (aflags & AP_PRINT)
3040 new_draw_info(NDI_UNIQUE, 0, who, query_name(tmp)); 2816 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3041 else 2817 else
3042 unapply_special(who, tmp, aflags); 2818 unapply_special (who, tmp, aflags);
3043 } 2819 }
3044 else { 2820 else
2821 {
3045 /* In this case, we want to try and remove a cursed item. 2822 /* In this case, we want to try and remove a cursed item.
3046 * While we know it won't work, we want unapply_special to 2823 * While we know it won't work, we want unapply_special to
3047 * at least generate the message. 2824 * at least generate the message.
3048 */ 2825 */
3049 new_draw_info_format(NDI_UNIQUE, 0, who, 2826 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
3050 "No matter how hard you try, you just can't\nremove %s.", 2827 return 1;
3051 query_name(tmp)); 2828 }
3052 return 1;
3053 }
3054 2829
3055 }
3056 }
3057 }
3058
3059 for (i=0; i<NUM_BODY_LOCATIONS; i++) { 2830 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2831 {
3060 /* this used up a slot that we need to free */ 2832 /* this used up a slot that we need to free */
3061 if (op->body_info[i]) { 2833 if (op->slot[i].info)
3062 last = who->inv; 2834 {
2835 object *last = who->inv;
3063 2836
3064 /* We do a while loop - may need to remove several items in order 2837 /* We do a while loop - may need to remove several items in order
3065 * to free up enough slots. 2838 * to free up enough slots.
3066 */ 2839 */
3067 while ((who->body_used[i] + op->body_info[i]) < 0) { 2840 while ((who->slot[i].used + op->slot[i].info) < 0)
3068 tmp = get_item_from_body_location(last, i); 2841 {
3069 if (!tmp) { 2842 object *tmp = get_next_item_from_body_location (i, last);
2843
2844 if (!tmp)
2845 {
3070#if 0 2846#if 0
3071 /* Not a bug - we'll get this if the player has cursed items 2847 /* Not a bug - we'll get this if the player has cursed items
3072 * equipped. 2848 * equipped.
3073 */ 2849 */
3074 LOG(llevError,"Can't find object using location %d (%s) on %s\n", 2850 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3075 i, body_locations[i].save_name, who->name);
3076#endif 2851#endif
3077 return 1; 2852 return 1;
3078 } 2853 }
2854
3079 /* If we are just printing, we don't care about cursed status */ 2855 /* If we are just printing, we don't care about cursed status */
3080 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || 2856 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3081 (!(QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)))) { 2857 {
3082 if (aflags & AP_PRINT) 2858 if (aflags & AP_PRINT)
3083 new_draw_info(NDI_UNIQUE, 0, who, query_name(tmp)); 2859 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3084 else 2860 else
3085 unapply_special(who, tmp, aflags); 2861 unapply_special (who, tmp, aflags);
3086 } 2862 }
3087 else { 2863 else
2864 {
3088 /* Cursed item that we can't unequip - tell the player. 2865 /* Cursed item that we can't unequip - tell the player.
3089 * Note this could be annoying if this is just one of a few, 2866 * Note this could be annoying if this is just one of a few,
3090 * so it may not be critical (eg, putting on a ring and you have 2867 * so it may not be critical (eg, putting on a ring and you have
3091 * one cursed ring.) 2868 * one cursed ring.)
3092 */ 2869 */
3093 new_draw_info_format(NDI_UNIQUE, 0, who, "The %s just won't come off", query_name(tmp)); 2870 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
3094 } 2871 }
3095 last = tmp->below; 2872
3096 } 2873 last = tmp->below;
2874 }
3097 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2875 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3098 * return in the !tmp would have kicked in. 2876 * return in the !tmp would have kicked in.
3099 */ 2877 */
3100 } /* if op is using this body location */ 2878 } /* if op is using this body location */
3101 } /* for body lcoations */ 2879 } /* for body lcoations */
2880
3102 return 0; 2881 return 0;
3103} 2882}
3104 2883
3105/** 2884/**
3106 * Checks to see if 'who' can apply object 'op'. 2885 * Checks to see if 'who' can apply object 'op'.
3107 * Returns 0 if apply can be done without anything special. 2886 * Returns 0 if apply can be done without anything special.
3108 * Otherwise returns a bitmask - potentially several of these may be 2887 * Otherwise returns a bitmask - potentially several of these may be
3109 * set, but largely depends on circumstance - in the future, processing 2888 * set, but largely depends on circumstance - in the future, processing
3110 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2889 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3111 * is set, do we really are what the other flags may be?) 2890 * is set, do we really care what the other flags may be?)
3112 * 2891 *
3113 * See include/define.h for detailed description of the meaning of 2892 * See include/define.h for detailed description of the meaning of
3114 * these return values. 2893 * these return values.
3115 */ 2894 */
2895int
3116int can_apply_object(object *who, object *op) 2896can_apply_object (object *who, object *op)
3117{ 2897{
2898 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
2899 return RESULT_INT (0);
2900
3118 int i, retval=0; 2901 int retval = 0;
3119 object *tmp=NULL, *ws=NULL; 2902 object *tmp = 0, *ws = 0;
3120 2903
3121 /* Players have 2 'arm's, so they could in theory equip 2 shields or
3122 * 2 weapons, but we don't want to let them do that. So if they are
3123 * trying to equip a weapon or shield, see if they already have one
3124 * in place and store that way.
3125 */
3126 if (op->type == WEAPON || op->type == SHIELD) {
3127 for (tmp=who->inv; tmp && !ws; tmp=tmp->below) {
3128 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->type == op->type) {
3129 retval = CAN_APPLY_UNAPPLY;
3130 ws = tmp;
3131 }
3132 }
3133 }
3134
3135
3136 for (i=0; i<NUM_BODY_LOCATIONS; i++) { 2904 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3137 if (op->body_info[i]) { 2905 {
2906 if (op->slot[i].info)
2907 {
3138 /* Item uses more slots than we have */ 2908 /* Item uses more slots than we have */
3139 if (FABS(op->body_info[i]) > who->body_info[i]) { 2909 if (who->slot[i].info + op->slot [i].info < 0)
2910 {
3140 /* Could return now for efficiently - rest of info below isn' 2911 /* Could return now for efficiency - rest of info below isn't
3141 * really needed. 2912 * really needed.
3142 */ 2913 */
3143 retval |= CAN_APPLY_NEVER; 2914 retval |= CAN_APPLY_NEVER;
3144 } else if ((who->body_used[i] + op->body_info[i]) < 0) { 2915 }
2916 else if (who->slot[i].used + op->slot[i].info < 0)
2917 {
3145 /* in this case, equipping this would use more free spots than 2918 /* in this case, equipping this would use more free spots than
3146 * we have. 2919 * we have.
3147 */ 2920 */
3148 object *tmp1;
3149 2921
3150
3151 /* if we have an applied weapon/shield, and unapply it would free 2922 /* if we have an applied weapon/shield, and unapply it would free
3152 * enough slots to equip the new item, then just set this can 2923 * enough slots to equip the new item, then just set "can
3153 * continue. We don't care about the logic below - if you have 2924 * apply unapply". We don't care about the logic below - if you have a
3154 * shield equipped and try to equip another shield, there is only 2925 * shield equipped and try to equip another shield, there is only
3155 * one choice. However, the check for the number of body locations 2926 * one choice. However, the check for the number of body locations
3156 * does take into the account cases where what is being applied 2927 * does take into the account cases where what is being applied
3157 * may be two handed for example. 2928 * may be two handed for example.
3158 */ 2929 */
3159 if (ws) { 2930 if (ws)
3160 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >=0) { 2931 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3161 retval |= CAN_APPLY_UNAPPLY; 2932 {
3162 continue; 2933 retval |= CAN_APPLY_UNAPPLY;
3163 } 2934 continue;
3164 } 2935 }
3165 2936
3166 tmp1 = get_item_from_body_location(who->inv, i); 2937 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3167 if (!tmp1) { 2938 if (!tmp1)
2939 {
3168#if 0 2940#if 0
3169 /* This is sort of an error, but happens a lot when old players 2941 /* This is sort of an error, but happens a lot when old players
3170 * join in with more stuff equipped than they are now allowed. 2942 * join in with more stuff equipped than they are now allowed.
3171 */ 2943 */
3172 LOG(llevError,"Can't find object using location %d on %s\n", 2944 LOG (llevError, "Can't find object using location %d on %s\n", i, who->name);
3173 i, who->name);
3174#endif 2945#endif
3175 retval |= CAN_APPLY_NEVER; 2946 retval |= CAN_APPLY_NEVER;
3176 } else { 2947 }
2948 else
2949 {
3177 /* need to unapply something. However, if this something 2950 /* need to unapply something. However, if this something
3178 * is different than we had found before, it means they need 2951 * is different than we had found before, it means they need
3179 * to apply multiple objects 2952 * to apply multiple objects
3180 */ 2953 */
3181 retval |= CAN_APPLY_UNAPPLY; 2954 retval |= CAN_APPLY_UNAPPLY;
3182 if (!tmp) tmp = tmp1; 2955
3183 else if (tmp != tmp1) { 2956 if (!tmp)
3184 retval |= CAN_APPLY_UNAPPLY_MULT; 2957 tmp = tmp1;
3185 } 2958 else if (tmp != tmp1)
2959 retval |= CAN_APPLY_UNAPPLY_MULT;
2960
3186 /* This object isn't using up all the slots, so there must 2961 /* This object isn't using up all the slots, so there must
3187 * be another. If so, and it the new item doesn't need all 2962 * be another. If so, and it the new item doesn't need all
3188 * the slots, the player then has a choice. 2963 * the slots, the player then has a choice.
3189 */ 2964 */
3190 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && 2965 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3191 (FABS(op->body_info[i]) < who->body_info[i])) 2966 && abs (op->slot[i].info) < who->slot[i].info)
3192 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2967 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3193 2968
3194 /* Does unequippint 'tmp1' free up enough slots for this to be 2969 /* Does unequippint 'tmp1' free up enough slots for this to be
3195 * equipped? If not, there must be something else to unapply. 2970 * equipped? If not, there must be something else to unapply.
3196 */ 2971 */
3197 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 2972 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3198 retval |= CAN_APPLY_UNAPPLY_MULT; 2973 retval |= CAN_APPLY_UNAPPLY_MULT;
3199 2974 }
3200 } 2975 } /* if not enough free slots */
3201 } /* if not enough free slots */ 2976 } /* if this object uses location i */
3202 } /* if this object uses location i */
3203 } /* for i -> num_body_locations loop */ 2977 } /* for i -> num_body_locations loop */
3204 2978
3205 /* Note that we don't check for FLAG_USE_ARMOUR - that should 2979 /* Note that we don't check for FLAG_USE_ARMOUR - that should
3206 * really be controlled by use of body locations. We do have 2980 * really be controlled by use of body locations. We do have
3207 * the weapon/shield checks, and the range checks for monsters, 2981 * the weapon/shield checks, and the range checks for monsters,
3208 * because you can't control those just by body location - bows, shields, 2982 * because you can't control those just by body location - bows, shields,
3209 * and weapons all use the same slot. Similar for horn/rod/wand - they 2983 * and weapons all use the same slot. Similar for horn/rod/wand - they
3210 * all use the same location. 2984 * all use the same location.
3211 */ 2985 */
3212 if (op->type == WEAPON && !QUERY_FLAG(who,FLAG_USE_WEAPON)) 2986 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3213 retval |= CAN_APPLY_RESTRICTION;
3214 if (op->type == SHIELD && !QUERY_FLAG(who,FLAG_USE_SHIELD))
3215 retval |= CAN_APPLY_RESTRICTION;
3216
3217
3218 if (who->type != PLAYER) {
3219 if ((op->type == WAND || op->type == HORN || op->type==ROD)
3220 && !QUERY_FLAG(who, FLAG_USE_RANGE))
3221 retval |= CAN_APPLY_RESTRICTION;
3222 if (op->type == BOW && !QUERY_FLAG(who, FLAG_USE_BOW))
3223 retval |= CAN_APPLY_RESTRICTION; 2987 retval |= CAN_APPLY_RESTRICTION;
2988
3224 if (op->type == RING && !QUERY_FLAG(who, FLAG_USE_RING)) 2989 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3225 retval |= CAN_APPLY_RESTRICTION; 2990 retval |= CAN_APPLY_RESTRICTION;
3226 if (op->type == BOW && !QUERY_FLAG(who, FLAG_USE_BOW)) 2991
2992 if (who->type != PLAYER)
2993 {
2994 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3227 retval |= CAN_APPLY_RESTRICTION; 2995 retval |= CAN_APPLY_RESTRICTION;
2996
2997 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
2998 retval |= CAN_APPLY_RESTRICTION;
2999
3000 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3001 retval |= CAN_APPLY_RESTRICTION;
3002
3003 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3004 retval |= CAN_APPLY_RESTRICTION;
3228 } 3005 }
3006
3229 return retval; 3007 return retval;
3230} 3008}
3231
3232
3233 3009
3234/** 3010/**
3235 * who is the object using the object. It can be a monster. 3011 * who is the object using the object. It can be a monster.
3236 * op is the object they are using. op is an equipment type item, 3012 * op is the object they are using. op is an equipment type item,
3237 * eg, one which you put on and keep on for a while, and not something 3013 * eg, one which you put on and keep on for a while, and not something
… …
3246 * AP_UNAPPLY=always unapply). 3022 * AP_UNAPPLY=always unapply).
3247 * 3023 *
3248 * Optional flags: 3024 * Optional flags:
3249 * AP_NO_MERGE: don't merge an unapplied object with other objects 3025 * AP_NO_MERGE: don't merge an unapplied object with other objects
3250 * AP_IGNORE_CURSE: unapply cursed items 3026 * AP_IGNORE_CURSE: unapply cursed items
3027 * AP_NO_READY: do not ready skills when applying skill tools
3251 * 3028 *
3252 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3029 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3253 * 3030 *
3254 * apply_special() doesn't check for unpaid items. 3031 * apply_special() doesn't check for unpaid items.
3255 */ 3032 */
3033int
3256int apply_special (object *who, object *op, int aflags) 3034apply_special (object *who, object *op, int aflags)
3257{ 3035{
3258 int basic_flag = aflags & AP_BASIC_FLAGS; 3036 int basic_flag = aflags & AP_BASIC_FLAGS;
3259 object *tmp, *tmp2, *skop=NULL; 3037 object *tmp, *tmp2, *skop = NULL;
3260 int i;
3261 3038
3262 if(who==NULL) { 3039 if (who == NULL)
3040 {
3263 LOG(llevError,"apply_special() from object without environment.\n"); 3041 LOG (llevError, "apply_special() from object without environment.\n");
3264 return 1; 3042 return 1;
3265 } 3043 }
3266 3044
3267 if(op->env!=who) 3045 if (op->env != who)
3268 return 1; /* op is not in inventory */ 3046 return 1; /* op is not in inventory */
3269 3047
3270 /* trying to unequip op */ 3048 /* trying to unequip op */
3271 if (QUERY_FLAG(op,FLAG_APPLIED)) { 3049 if (QUERY_FLAG (op, FLAG_APPLIED))
3050 {
3272 /* always apply, so no reason to unapply */ 3051 /* always apply, so no reason to unapply */
3273 if (basic_flag == AP_APPLY) return 0; 3052 if (basic_flag == AP_APPLY)
3053 return 0;
3274 3054
3275 if ( ! (aflags & AP_IGNORE_CURSE) 3055 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3276 && (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED))) { 3056 {
3277 new_draw_info_format(NDI_UNIQUE, 0, who, 3057 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));
3278 "No matter how hard you try, you just can't\nremove %s.",
3279 query_name(op));
3280 return 1; 3058 return 1;
3281 } 3059 }
3060
3282 return unapply_special(who, op, aflags); 3061 return unapply_special (who, op, aflags);
3283 } 3062 }
3284 3063
3285 if (basic_flag == AP_UNAPPLY) return 0; 3064 if (basic_flag == AP_UNAPPLY)
3065 return 0;
3286 3066
3287 i = can_apply_object(who, op); 3067 // if the item is combat/ranged, wield the relevant slot first
3068 // to resolve conflicts.
3069 if (player *pl = who->contr)
3070 switch (op->slottype ())
3071 {
3072 case slot_combat: who->change_weapon (pl->combat_ob); break;
3073 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3074 }
3288 3075
3289 /* Can't just apply this object. Lets see what not and what to do */ 3076 /* Can't just apply this object. Lets see what not and what to do */
3290 if (i) { 3077 if (int i = can_apply_object (who, op))
3078 {
3291 if (i & CAN_APPLY_NEVER) { 3079 if (i & CAN_APPLY_NEVER)
3080 {
3292 new_draw_info_format(NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name(op)); 3081 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3293 return 1; 3082 return 1;
3083 }
3294 } else if (i & CAN_APPLY_RESTRICTION) { 3084 else if (i & CAN_APPLY_RESTRICTION)
3085 {
3295 new_draw_info_format(NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name(op)); 3086 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3296 return 1; 3087 return 1;
3297 } 3088 }
3089
3298 if (who->type != PLAYER) { 3090 if (who->type != PLAYER)
3091 {
3299 /* Some error, so don't try to equip something more */ 3092 /* Some error, so don't try to equip something more */
3300 if (unapply_for_ob(who, op, aflags)) return 1; 3093 if (unapply_for_ob (who, op, aflags))
3301 } else { 3094 return 1;
3302 if (who->contr->unapply == unapply_never || 3095 }
3303 (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) { 3096 else
3304 new_draw_info(NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3097 {
3098 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3099 {
3100 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3305 unapply_for_ob(who, op, AP_PRINT); 3101 unapply_for_ob (who, op, AP_PRINT);
3306 return 1; 3102 return 1;
3307 } 3103 }
3308 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) { 3104 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3309 i = unapply_for_ob(who, op, aflags); 3105 if (unapply_for_ob (who, op, aflags))
3310 if (i) return 1; 3106 return 1;
3107 }
3311 } 3108 }
3312 } 3109
3313 }
3314 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) { 3110 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3111 {
3315 skop=find_skill_by_name(who, op->skill); 3112 skop = find_skill_by_name (who, op->skill);
3316 if (!skop) { 3113
3114 if (!skop)
3115 {
3317 new_draw_info_format(NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", op->skill); 3116 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3318 return 1; 3117 return 1;
3319 } else { 3118 }
3119 else
3320 /* While experience will be credited properly, we want to change the 3120 /* While experience will be credited properly, we want to change the
3321 * skill so that the dam and wc get updated 3121 * skill so that the dam and wc get updated
3322 */ 3122 */
3323 change_skill(who, skop, 0); 3123 who->change_skill (skop);
3324 }
3325 } 3124 }
3326 3125
3327 if (who->type == PLAYER && op->item_power && 3126 if (who->type == PLAYER
3127 && op->item_power
3328 (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) { 3128 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3329 new_draw_info(NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!");
3330 return 1;
3331 } 3129 {
3332 3130 new_draw_info (NDI_UNIQUE, 0, who,
3131 "Equipping that combined with other items would consume your soul! "
3132 "[use the skills command to check your available item power]");
3133 return 1;
3134 }
3333 3135
3334 /* Ok. We are now at the state where we can apply the new object. 3136 /* Ok. We are now at the state where we can apply the new object.
3335 * Note that we don't have the checks for can_use_... 3137 * Note that we don't have the checks for can_use_...
3336 * below - that is already taken care of by can_apply_object. 3138 * below - that is already taken care of by can_apply_object.
3337 */ 3139 */
3338
3339
3340 if(op->nrof > 1) 3140 if (op->nrof > 1)
3341 tmp = get_split_ob(op,op->nrof - 1); 3141 tmp = get_split_ob (op, op->nrof - 1);
3342 else 3142 else
3343 tmp = NULL; 3143 tmp = 0;
3344 3144
3145 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3146 return RESULT_INT (0);
3147
3345 switch(op->type) { 3148 switch (op->type)
3149 {
3346 case WEAPON: 3150 case WEAPON:
3347 if (!check_weapon_power(who, op->last_eat)) { 3151 if (!check_weapon_power (who, op->last_eat))
3348 new_draw_info(NDI_UNIQUE, 0,who, 3152 {
3349 "That weapon is too powerful for you to use."); 3153 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.\n"
3350 new_draw_info(NDI_UNIQUE, 0, who, "It would consume your soul!."); 3154 "It would consume your soul!.");
3351 if(tmp!=NULL) 3155
3352 (void) insert_ob_in_ob(tmp,who); 3156 if (tmp)
3353 return 1; 3157 insert_ob_in_ob (tmp, who);
3354 } 3158
3159 return 1;
3160 }
3161
3162 //TODO: this obviously fails for players using a shorter prefix
3163 // i.e. "R" can use Ragnarok's sword.
3355 if( op->level && (strncmp(op->name,who->name,strlen(who->name)))) { 3164 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3165 {
3356 /* if the weapon does not have the name as the character, can't use it. */ 3166 /* if the weapon does not have the name as the character, can't use it. */
3357 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3167 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3358 new_draw_info(NDI_UNIQUE, 0,who,"The weapon does not recognize you as its owner."); 3168 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3359 if(tmp!=NULL) 3169
3360 (void) insert_ob_in_ob(tmp,who); 3170 if (tmp)
3361 return 1; 3171 insert_ob_in_ob (tmp, who);
3362 } 3172
3173 return 1;
3174 }
3175
3176 if (!skop)
3177 {
3178 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3179 return 1;
3180 }
3181
3363 SET_FLAG(op, FLAG_APPLIED); 3182 SET_FLAG (op, FLAG_APPLIED);
3183 who->change_skill (skop);
3364 3184
3365 if (skop) change_skill(who, skop, 1); 3185 if (who->contr)
3366 if(!QUERY_FLAG(who,FLAG_READY_WEAPON)) 3186 who->change_weapon (who->contr->combat_ob = op);
3367 SET_FLAG(who, FLAG_READY_WEAPON);
3368 3187
3369 new_draw_info_format(NDI_UNIQUE, 0, who, "You wield %s.",query_name(op)); 3188 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3370 3189
3371 (void) change_abil (who,op);
3372 /* GROS: update the current_weapon_script field (used with EVENT_ATTACK for weapons) */
3373 /*if ((evt = find_event(op, EVENT_ATTACK)) != NULL) {
3374 LOG(llevDebug, "Scripting Weapon wielded\n");
3375 if (who->current_weapon_script) free_string(who->current_weapon_script);
3376 who->current_weapon_script=add_string(query_name(op));
3377 }
3378 who->current_weapon = op;*/
3379 break;
3380
3381 case ARMOUR:
3382 case HELMET:
3383 case SHIELD:
3384 case BOOTS:
3385 case GLOVES:
3386 case GIRDLE:
3387 case BRACERS:
3388 case CLOAK:
3389 case RING:
3390 case AMULET:
3391 SET_FLAG(op, FLAG_APPLIED);
3392 new_draw_info_format(NDI_UNIQUE, 0, who, "You wear %s.",query_name(op));
3393 (void) change_abil (who,op);
3394 break;
3395 case LAMP:
3396 if (op->stats.food < 1) {
3397 new_draw_info_format(NDI_UNIQUE, 0, who, "Your %s is out of"
3398 " fuel!", op->name);
3399 return 1;
3400 }
3401 new_draw_info_format(NDI_UNIQUE, 0, who, "You turn on your %s.",
3402 op->name);
3403 tmp2 = arch_to_object(op->other_arch);
3404 tmp2->stats.food = op->stats.food;
3405 SET_FLAG(tmp2, FLAG_APPLIED);
3406 if (QUERY_FLAG(op, FLAG_INV_LOCKED))
3407 SET_FLAG(tmp2, FLAG_INV_LOCKED);
3408 insert_ob_in_ob(tmp2, who);
3409
3410 /* Remove the old lantern */
3411 if (who->type == PLAYER)
3412 esrv_del_item(who->contr, (tag_t)op->count);
3413 remove_ob(op);
3414 free_object(op);
3415
3416 /* insert the portion that was split off */
3417 if(tmp!=NULL) {
3418 (void) insert_ob_in_ob(tmp,who);
3419 if(who->type==PLAYER)
3420 esrv_send_item(who, tmp);
3421 }
3422 fix_player(who);
3423 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) {
3424 if (who->type == PLAYER) {
3425 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!");
3426 SET_FLAG(tmp2, FLAG_KNOWN_CURSED);
3427 }
3428 }
3429 if(who->type==PLAYER)
3430 esrv_send_item(who, tmp2);
3431 return 0;
3432 break;
3433
3434 /* this part is needed for skill-tools */
3435 case SKILL:
3436 case SKILL_TOOL:
3437 if (who->chosen_skill) {
3438 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3439 return 1;
3440 }
3441 if (who->type == PLAYER) {
3442 who->contr->shoottype = range_skill;
3443 who->contr->ranges[range_skill] = op;
3444 if ( ! op->invisible) {
3445 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.",
3446 query_name (op));
3447 new_draw_info_format (NDI_UNIQUE, 0, who,
3448 "You can now use the skill: %s.",
3449 op->skill);
3450 } else {
3451 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.",
3452 op->skill? op->skill:op->name);
3453 }
3454 }
3455 SET_FLAG (op, FLAG_APPLIED);
3456 (void) change_abil (who, op);
3457 who->chosen_skill = op;
3458 SET_FLAG (who, FLAG_READY_SKILL);
3459 break;
3460
3461 case BOW:
3462 if (!check_weapon_power(who, op->last_eat)) {
3463 new_draw_info(NDI_UNIQUE, 0, who,
3464 "That item is too powerful for you to use.");
3465 new_draw_info(NDI_UNIQUE, 0, who, "It would consume your soul!.");
3466 if(tmp != NULL)
3467 (void)insert_ob_in_ob(tmp,who);
3468 return 1;
3469 }
3470 if( op->level && (strncmp(op->name,who->name,strlen(who->name)))) {
3471 new_draw_info(NDI_UNIQUE, 0, who,
3472 "The weapon does not recognize you as its owner.");
3473 if(tmp != NULL)
3474 (void)insert_ob_in_ob(tmp,who);
3475 return 1;
3476 }
3477 /*FALLTHROUGH*/
3478 case WAND:
3479 case ROD:
3480 case HORN:
3481 /* check for skill, alter player status */
3482 SET_FLAG(op, FLAG_APPLIED);
3483 if (skop) change_skill(who, skop, 0);
3484 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name(op));
3485
3486 if(who->type==PLAYER) {
3487 if (op->type == BOW) {
3488 (void)change_abil(who, op);
3489 new_draw_info_format (NDI_UNIQUE, 0, who,
3490 "You will now fire %s with %s.",
3491 op->race ? op->race : "nothing", query_name(op));
3492 who->contr->shoottype = range_bow;
3493 } else {
3494 who->contr->shoottype = range_misc;
3495 }
3496 } else {
3497 if (op->type == BOW)
3498 SET_FLAG (who, FLAG_READY_BOW);
3499 else
3500 SET_FLAG (who, FLAG_READY_RANGE); 3190 SET_FLAG (who, FLAG_READY_WEAPON);
3501 } 3191 change_abil (who, op);
3502 break;
3503
3504 case BUILDER:
3505 if ( who->contr->ranges[ range_builder ] )
3506 unapply_special( who, who->contr->ranges[ range_builder ], 0 );
3507 who->contr->shoottype = range_builder;
3508 who->contr->ranges[ range_builder ] = op;
3509 new_draw_info_format( NDI_UNIQUE, 0, who, "You ready your %s.", query_name( op ) );
3510 break; 3192 break;
3511 3193
3512 default: 3194 case ARMOUR:
3195 case HELMET:
3196 case SHIELD:
3197 case BOOTS:
3198 case GLOVES:
3199 case GIRDLE:
3200 case BRACERS:
3201 case CLOAK:
3202 case RING:
3203 case AMULET:
3204 SET_FLAG (op, FLAG_APPLIED);
3205 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3206 change_abil (who, op);
3207 break;
3208
3209 case LAMP:
3210 if (op->stats.food < 1)
3211 {
3212 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3213 return 1;
3214 }
3215
3216 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3217 tmp2 = arch_to_object (op->other_arch);
3218 tmp2->stats.food = op->stats.food;
3219 SET_FLAG (tmp2, FLAG_APPLIED);
3220
3221 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3222 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3223
3224 insert_ob_in_ob (tmp2, who);
3225
3226 /* Remove the old lantern */
3227 if (who->type == PLAYER)
3228 esrv_del_item (who->contr, op->count);
3229
3230 op->destroy ();
3231
3232 /* insert the portion that was split off */
3233 if (tmp)
3234 {
3235 insert_ob_in_ob (tmp, who);
3236 if (who->type == PLAYER)
3237 esrv_send_item (who, tmp);
3238 }
3239
3240 who->update_stats ();
3241
3242 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3243 if (who->type == PLAYER)
3244 {
3245 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3246 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3247 }
3248
3249 if (who->type == PLAYER)
3250 esrv_send_item (who, tmp2);
3251
3252 return 0;
3253
3254 case SKILL_TOOL:
3255 // applying a skill tool also readies the skill
3256 SET_FLAG (op, FLAG_APPLIED);
3257
3258 if (!(aflags & AP_NO_READY))
3259 {
3260 skop = find_skill_by_name (who, op->skill);
3261 if (!skop->flag [FLAG_APPLIED])
3262 apply_special (who, skop, AP_APPLY);
3263 }
3264 break;
3265
3266 case SKILL:
3267 if (player *pl = who->contr)
3268 {
3269 if (IS_COMBAT_SKILL (op->subtype))
3270 {
3271 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3272 {
3273 for (object *item = who->inv; item; item = item->below)
3274 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3275 {
3276 if (item->skill == op->skill)
3277 {
3278 who->change_weapon (pl->combat_ob = item);
3279 goto found_weapon;
3280 }
3281 }
3282
3283 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill);
3284 return 1;
3285
3286 found_weapon:;
3287 }
3288 else
3289 who->change_weapon (pl->combat_ob = op);
3290 }
3291 else if (IS_RANGED_SKILL (op->subtype))
3292 {
3293 if (skill_flags [op->subtype] & SF_NEED_BOW)
3294 {
3295 for (object *item = who->inv; item; item = item->below)
3296 if (item->type == BOW && item->flag [FLAG_APPLIED])
3297 {
3298 //TODO: bows should/must all have skill missile weapon right now
3299 who->change_weapon (pl->ranged_ob = item);
3300 goto found_bow;
3301 }
3302
3303 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3304 return 1;
3305
3306 found_bow:;
3307 }
3308 else
3309 who->change_weapon (pl->ranged_ob = op);
3310 }
3311
3312 if (!op->invisible)
3313 {
3314 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3315 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3316 }
3317 else
3318 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3319 }
3320 else
3321 {
3322 SET_FLAG (op, FLAG_APPLIED);
3323 change_abil (who, op);
3324 who->chosen_skill = op;
3325 SET_FLAG (who, FLAG_READY_SKILL);
3326 }
3327
3328 break;
3329
3330 case BOW:
3331 if (!check_weapon_power (who, op->last_eat))
3332 {
3333 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3334 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3335
3336 if (tmp)
3337 insert_ob_in_ob (tmp, who);
3338
3339 return 1;
3340 }
3341
3342 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3343 {
3344 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3345 if (tmp)
3346 insert_ob_in_ob (tmp, who);
3347
3348 return 1;
3349 }
3350
3351 /*FALLTHROUGH*/
3352 case WAND:
3353 case ROD:
3354 case HORN:
3355 /* check for skill, alter player status */
3356
3357 if (!skop)
3358 {
3359 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3360 return 1;
3361 }
3362
3363 SET_FLAG (op, FLAG_APPLIED);
3364 who->change_skill (skop);
3365
3366 if (who->contr)
3367 {
3368 who->contr->ranged_ob = op;
3369
3370 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3371
3372 if (op->type == BOW)
3373 {
3374 who->current_weapon = op;
3375 change_abil (who, op);
3376 new_draw_info_format (NDI_UNIQUE, 0, who,
3377 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3378 }
3379 }
3380 else
3381 {
3382 if (op->type == BOW)
3383 SET_FLAG (who, FLAG_READY_BOW);
3384 else
3385 SET_FLAG (who, FLAG_READY_RANGE);
3386 }
3387
3388 break;
3389
3390 case BUILDER:
3391 if (who->type == PLAYER)
3392 {
3393 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3394 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3395 unapply_special (who, who->contr->ranged_ob, 0);
3396
3397 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3398
3399 who->contr->ranged_ob = op;
3400 }
3401 break;
3402
3403 default:
3513 new_draw_info_format(NDI_UNIQUE, 0, who, "You apply %s.",query_name(op)); 3404 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3514 } /* end of switch op->type */ 3405 } /* end of switch op->type */
3515 3406
3516 SET_FLAG(op, FLAG_APPLIED); 3407 SET_FLAG (op, FLAG_APPLIED);
3517 3408
3518 if(tmp!=NULL) 3409 if (tmp)
3519 tmp = insert_ob_in_ob(tmp,who); 3410 tmp = insert_ob_in_ob (tmp, who);
3520 3411
3521 fix_player(who); 3412 who->update_stats ();
3522 3413
3523 /* We exclude spell casting objects. The fire code will set the 3414 /* We exclude spell casting objects. The fire code will set the
3524 * been applied flag when they are used - until that point, 3415 * been applied flag when they are used - until that point,
3525 * you don't know anything about them. 3416 * you don't know anything about them.
3526 */ 3417 */
3527 if (who->type == PLAYER && op->type!=WAND && op->type!=HORN && 3418 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3528 op->type!=ROD)
3529 SET_FLAG(op,FLAG_BEEN_APPLIED); 3419 SET_FLAG (op, FLAG_BEEN_APPLIED);
3530 3420
3531 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) { 3421 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3422 {
3532 if (who->type == PLAYER) { 3423 if (who->type == PLAYER)
3424 {
3533 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!"); 3425 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3534 SET_FLAG(op,FLAG_KNOWN_CURSED); 3426 SET_FLAG (op, FLAG_KNOWN_CURSED);
3535 } 3427 }
3536 } 3428 }
3429
3537 if(who->type==PLAYER) { 3430 if (who->type == PLAYER)
3431 {
3538 /* if multiple objects were applied, update both slots */ 3432 /* if multiple objects were applied, update both slots */
3539 if (tmp) 3433 if (tmp)
3540 esrv_send_item(who, tmp); 3434 esrv_send_item (who, tmp);
3435
3541 esrv_send_item(who, op); 3436 esrv_send_item (who, op);
3542 } 3437 }
3438
3543 return 0; 3439 return 0;
3544} 3440}
3545 3441
3546 3442int
3547int monster_apply_special (object *who, object *op, int aflags) 3443monster_apply_special (object *who, object *op, int aflags)
3548{ 3444{
3549 if (QUERY_FLAG (op, FLAG_UNPAID) && ! QUERY_FLAG (op, FLAG_APPLIED)) 3445 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3550 return 1; 3446 return 1;
3551 return apply_special (who, op, aflags); 3447 return apply_special (who, op, aflags);
3552} 3448}
3553 3449
3554/** 3450/**
3555 * Map was just loaded, handle op's initialisation. 3451 * Map was just loaded, handle op's initialisation.
3556 * 3452 *
3557 * Generates shop floor's item, and treasures. 3453 * Generates shop floor's item, and treasures.
3558 */ 3454 */
3455int
3559int auto_apply (object *op) { 3456auto_apply (object *op)
3457{
3560 object *tmp = NULL, *tmp2; 3458 object *tmp = NULL, *tmp2;
3561 int i; 3459 int i;
3562 3460
3563 switch(op->type) { 3461 switch (op->type)
3462 {
3564 case SHOP_FLOOR: 3463 case SHOP_FLOOR:
3565 if (!HAS_RANDOM_ITEMS(op)) return 0; 3464 if (!op->has_random_items ())
3566 do { 3465 return 0;
3567 i=10; /* let's give it 10 tries */ 3466
3467 do
3468 {
3469 i = 10; /* let's give it 10 tries */
3568 while((tmp=generate_treasure(op->randomitems, 3470 while ((tmp = generate_treasure (op->randomitems,
3569 op->stats.exp?(int)op->stats.exp:MAX(op->map->difficulty, 5)))==NULL&&--i); 3471 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i);
3570 if(tmp==NULL) 3472 if (tmp == NULL)
3571 return 0; 3473 return 0;
3572 if(QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)) { 3474 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3573 free_object(tmp); 3475 {
3574 tmp = NULL; 3476 tmp->destroy ();
3575 } 3477 tmp = NULL;
3576 } while(!tmp); 3478 }
3479 }
3480 while (!tmp);
3481
3577 tmp->x=op->x; 3482 tmp->x = op->x;
3578 tmp->y=op->y; 3483 tmp->y = op->y;
3579 SET_FLAG(tmp,FLAG_UNPAID); 3484 SET_FLAG (tmp, FLAG_UNPAID);
3580 insert_ob_in_map(tmp,op->map,NULL,0); 3485 insert_ob_in_map (tmp, op->map, NULL, 0);
3581 CLEAR_FLAG(op,FLAG_AUTO_APPLY); 3486 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3582 identify(tmp); 3487 identify (tmp);
3583 break; 3488 break;
3584 3489
3585 case TREASURE: 3490 case TREASURE:
3586 if (QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)) 3491 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3587 return 0; 3492 return 0;
3493
3588 while ((op->stats.hp--)>0) 3494 while (op->stats.hp-- > 0)
3589 create_treasure(op->randomitems, op, op->map?GT_ENVIRONMENT:0, 3495 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3590 op->stats.exp ? (int)op->stats.exp : 3496 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3591 op->map == NULL ? 14: op->map->difficulty,0);
3592 3497
3593 /* If we generated an object and put it in this object inventory, 3498 /* If we generated an object and put it in this object inventory,
3594 * move it to the parent object as the current object is about 3499 * move it to the parent object as the current object is about
3595 * to disappear. An example of this item is the random_* stuff 3500 * to disappear. An example of this item is the random_* stuff
3596 * that is put inside other objects. 3501 * that is put inside other objects.
3597 */ 3502 */
3598 for (tmp=op->inv; tmp; tmp=tmp2) { 3503 for (tmp = op->inv; tmp; tmp = tmp2)
3599 tmp2 = tmp->below; 3504 {
3600 remove_ob(tmp); 3505 tmp2 = tmp->below;
3601 if (op->env) insert_ob_in_ob(tmp, op->env); 3506 tmp->remove ();
3602 else free_object(tmp); 3507
3508 if (op->env)
3509 insert_ob_in_ob (tmp, op->env);
3510 else
3511 tmp->destroy ();
3512 }
3513
3514 op->destroy ();
3515 break;
3603 } 3516 }
3604 remove_ob(op);
3605 free_object(op);
3606 break;
3607 }
3608 return tmp ? 1 : 0; 3517 return tmp ? 1 : 0;
3609} 3518}
3610 3519
3611/** 3520/**
3612 * fix_auto_apply goes through the entire map (only the first time 3521 * fix_auto_apply goes through the entire map every time a map
3613 * when an original map is loaded) and performs special actions for 3522 * is loaded or swapped in and performs special actions for
3614 * certain objects (most initialization of chests and creation of 3523 * certain objects (most initialization of chests and creation of
3615 * treasures and stuff). Calls auto_apply if appropriate. 3524 * treasures and stuff). Calls auto_apply if appropriate.
3616 */ 3525 */
3526void
3527maptile::fix_auto_apply ()
3528{
3529 if (!spaces)
3530 return;
3617 3531
3618void fix_auto_apply(mapstruct *m) { 3532 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3619 object *tmp,*above=NULL; 3533 for (object *tmp = ms->bot; tmp; )
3620 int x,y; 3534 {
3535 object *above = tmp->above;
3621 3536
3622 if(m==NULL) return; 3537 if (tmp->inv)
3623 3538 {
3624 for(x=0;x<MAP_WIDTH(m);x++)
3625 for(y=0;y<MAP_HEIGHT(m);y++)
3626 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) {
3627 above=tmp->above;
3628
3629 if (tmp->inv) {
3630 object *invtmp, *invnext; 3539 object *invtmp, *invnext;
3631 3540
3632 for (invtmp=tmp->inv; invtmp != NULL; invtmp = invnext) { 3541 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3633 invnext = invtmp->below; 3542 {
3543 invnext = invtmp->below;
3634 3544
3635 if(QUERY_FLAG(invtmp,FLAG_AUTO_APPLY)) 3545 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3636 auto_apply(invtmp); 3546 auto_apply (invtmp);
3637 else if(invtmp->type==TREASURE && HAS_RANDOM_ITEMS(invtmp)) { 3547 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3548 {
3638 while ((invtmp->stats.hp--)>0) 3549 while ((invtmp->stats.hp--) > 0)
3639 create_treasure(invtmp->randomitems, invtmp, 0, 3550 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3640 m->difficulty,0); 3551
3641 invtmp->randomitems = NULL; 3552 invtmp->randomitems = NULL;
3642 } 3553 }
3643 else if (invtmp && invtmp->arch && 3554 else if (invtmp && invtmp->arch
3644 invtmp->type!=TREASURE && 3555 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3645 invtmp->type != SPELL && 3556 {
3646 invtmp->type != CLASS && 3557 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3647 HAS_RANDOM_ITEMS(invtmp)) {
3648 create_treasure(invtmp->randomitems, invtmp, 0,
3649 m->difficulty,0);
3650 /* Need to clear this so that we never try to create 3558 /* Need to clear this so that we never try to create
3651 * treasure again for this object 3559 * treasure again for this object
3652 */ 3560 */
3653 invtmp->randomitems = NULL; 3561 invtmp->randomitems = NULL;
3654 } 3562 }
3655 } 3563 }
3656 /* This is really temporary - the code at the bottom will 3564 /* This is really temporary - the code at the bottom will
3657 * also set randomitems to null. The problem is there are bunches 3565 * also set randomitems to null. The problem is there are bunches
3658 * of maps/players already out there with items that have spells 3566 * of maps/players already out there with items that have spells
3659 * which haven't had the randomitems set to null yet. 3567 * which haven't had the randomitems set to null yet.
3660 * MSW 2004-05-13 3568 * MSW 2004-05-13
3661 * 3569 *
3662 * And if it's a spellbook, it's better to set randomitems to NULL too, 3570 * And if it's a spellbook, it's better to set randomitems to NULL too,
3663 * else you get two spells in the book ^_- 3571 * else you get two spells in the book ^_-
3664 * Ryo 2004-08-16 3572 * Ryo 2004-08-16
3665 */ 3573 */
3666 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL || 3574 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3667 tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || 3575 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3668 tmp->type == ALTAR || tmp->type == SPELLBOOK)
3669 tmp->randomitems = NULL; 3576 tmp->randomitems = NULL;
3670 3577
3671 } 3578 }
3672 3579
3673 if(QUERY_FLAG(tmp,FLAG_AUTO_APPLY)) 3580 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3674 auto_apply(tmp); 3581 auto_apply (tmp);
3675 else if((tmp->type==TREASURE || (tmp->type==CONTAINER))&& HAS_RANDOM_ITEMS(tmp)) { 3582 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3583 {
3676 while ((tmp->stats.hp--)>0) 3584 while ((tmp->stats.hp--) > 0)
3677 create_treasure(tmp->randomitems, tmp, 0, 3585 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3678 m->difficulty,0);
3679 tmp->randomitems = NULL; 3586 tmp->randomitems = NULL;
3680 } 3587 }
3681 else if(tmp->type==TIMED_GATE) { 3588 else if (tmp->type == TIMED_GATE)
3589 {
3682 object *head = tmp->head != NULL ? tmp->head : tmp; 3590 object *head = tmp->head != NULL ? tmp->head : tmp;
3591
3683 if (QUERY_FLAG(head, FLAG_IS_LINKED)) { 3592 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3684 tmp->speed = 0; 3593 tmp->set_speed (0);
3685 update_ob_speed(tmp); 3594 }
3686 }
3687 }
3688 /* This function can be called everytime a map is loaded, even when 3595 /* This function can be called everytime a map is loaded, even when
3689 * swapping back in. As such, we don't want to create the treasure 3596 * swapping back in. As such, we don't want to create the treasure
3690 * over and ove again, so after we generate the treasure, blank out 3597 * over and ove again, so after we generate the treasure, blank out
3691 * randomitems so if it is swapped in again, it won't make anything. 3598 * randomitems so if it is swapped in again, it won't make anything.
3692 * This is a problem for the above objects, because they have counters 3599 * This is a problem for the above objects, because they have counters
3693 * which say how many times to make the treasure. 3600 * which say how many times to make the treasure.
3694 */ 3601 */
3695 else if(tmp && tmp->arch && tmp->type!=PLAYER && tmp->type!=TREASURE && 3602 else if (tmp && tmp->arch && tmp->type != PLAYER
3696 tmp->type != SPELL && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && 3603 && tmp->type != TREASURE && tmp->type != SPELL
3697 HAS_RANDOM_ITEMS(tmp)) { 3604 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3605 {
3698 create_treasure(tmp->randomitems, tmp, GT_APPLY, 3606 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3699 m->difficulty,0);
3700 tmp->randomitems = NULL; 3607 tmp->randomitems = NULL;
3701 } 3608 }
3609
3610 // close all containers
3611 else if (tmp->type == CONTAINER)
3612 tmp->flag [FLAG_APPLIED] = 0;
3613
3614 tmp = above;
3702 } 3615 }
3703 3616
3704 for(x=0;x<MAP_WIDTH(m);x++) 3617 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3705 for(y=0;y<MAP_HEIGHT(m);y++) 3618 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3706 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=tmp->above)
3707 if (tmp->above &&
3708 (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3619 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3709 check_trigger (tmp, tmp->above); 3620 check_trigger (tmp, tmp->above);
3710} 3621}
3711 3622
3712/** 3623/**
3713 * Handles player eating food that temporarily changes status (resistances, stats). 3624 * Handles player eating food that temporarily changes status (resistances, stats).
3714 * This used to call cast_change_attr(), but 3625 * This used to call cast_change_attr(), but
3715 * that doesn't work with the new spell code. Since we know what 3626 * that doesn't work with the new spell code. Since we know what
3716 * the food changes, just grab a force and use that instead. 3627 * the food changes, just grab a force and use that instead.
3717 */ 3628 */
3718 3629void
3719void eat_special_food(object *who, object *food) { 3630eat_special_food (object *who, object *food)
3631{
3720 object *force; 3632 object *force;
3721 int i, did_one=0; 3633 int i, did_one = 0;
3722 sint8 k;
3723 3634
3724 force = get_archetype(FORCE_NAME); 3635 force = get_archetype (FORCE_NAME);
3725 3636
3726 for (i=0; i < NUM_STATS; i++) { 3637 for (i = 0; i < NUM_STATS; i++)
3727 k = get_attr_value(&food->stats, i); 3638 if (sint8 k = food->stats.stat (i))
3728 if (k) { 3639 {
3729 set_attr_value(&force->stats, i, k); 3640 force->stats.stat (i) = k;
3730 did_one = 1; 3641 did_one = 1;
3731 }
3732 } 3642 }
3733 3643
3734 /* check if we can protect the eater */ 3644 /* check if we can protect the eater */
3735 for (i=0; i<NROFATTACKS; i++) { 3645 for (i = 0; i < NROFATTACKS; i++)
3646 {
3736 if (food->resist[i]>0) { 3647 if (food->resist[i] > 0)
3648 {
3737 force->resist[i] = food->resist[i] / 2; 3649 force->resist[i] = food->resist[i] / 2;
3738 did_one = 1; 3650 did_one = 1;
3739 } 3651 }
3740 } 3652 }
3653
3741 if (did_one) { 3654 if (did_one)
3742 force->speed = 0.1; 3655 {
3743 update_ob_speed(force); 3656 force->set_speed (0.1);
3744 /* bigger morsel of food = longer effect time */ 3657 /* bigger morsel of food = longer effect time */
3745 force->stats.food = food->stats.food / 5; 3658 force->duration = food->stats.food / 5;
3746 SET_FLAG(force, FLAG_IS_USED_UP);
3747 SET_FLAG(force, FLAG_APPLIED); 3659 SET_FLAG (force, FLAG_APPLIED);
3748 change_abil(who, force); 3660 change_abil (who, force);
3749 insert_ob_in_ob(force, who); 3661 insert_ob_in_ob (force, who);
3750 } else {
3751 free_object(force);
3752 } 3662 }
3663 else
3664 force->destroy ();
3753 3665
3754 /* check for hp, sp change */ 3666 /* check for hp, sp change */
3755 if(food->stats.hp!=0) { 3667 if (food->stats.hp != 0)
3668 {
3756 if(QUERY_FLAG(food, FLAG_CURSED)) { 3669 if (QUERY_FLAG (food, FLAG_CURSED))
3757 strcpy(who->contr->killer,food->name); 3670 {
3671 assign (who->contr->killer, food->name);
3758 hit_player(who, food->stats.hp, food, AT_POISON, 1); 3672 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3759 new_draw_info(NDI_UNIQUE, 0,who,"Eck!...that was poisonous!"); 3673 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3760 } else { 3674 }
3675 else
3676 {
3761 if(food->stats.hp>0) 3677 if (food->stats.hp > 0)
3762 new_draw_info(NDI_UNIQUE, 0,who,"You begin to feel better."); 3678 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better.");
3763 else 3679 else
3764 new_draw_info(NDI_UNIQUE, 0,who,"Eck!...that was poisonous!"); 3680 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3765 who->stats.hp += food->stats.hp; 3681 who->stats.hp += food->stats.hp;
3766 } 3682 }
3767 } 3683 }
3768 if(food->stats.sp!=0) { 3684 if (food->stats.sp != 0)
3685 {
3769 if(QUERY_FLAG(food, FLAG_CURSED)) { 3686 if (QUERY_FLAG (food, FLAG_CURSED))
3687 {
3770 new_draw_info(NDI_UNIQUE, 0,who,"You are drained of mana!"); 3688 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!");
3771 who->stats.sp -= food->stats.sp; 3689 who->stats.sp -= food->stats.sp;
3772 if(who->stats.sp<0) who->stats.sp=0; 3690 if (who->stats.sp < 0)
3773 } else { 3691 who->stats.sp = 0;
3692 }
3693 else
3694 {
3774 new_draw_info(NDI_UNIQUE, 0,who,"You feel a rush of magical energy!"); 3695 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3775 who->stats.sp += food->stats.sp; 3696 who->stats.sp += food->stats.sp;
3776 /* place limit on max sp from food? */ 3697 /* place limit on max sp from food? */
3698 }
3777 } 3699 }
3778 } 3700 who->update_stats ();
3779 fix_player(who);
3780} 3701}
3781
3782 3702
3783/** 3703/**
3784 * Designed primarily to light torches/lanterns/etc. 3704 * Designed primarily to light torches/lanterns/etc.
3785 * Also burns up burnable material too. First object in the inventory is 3705 * Also burns up burnable material too. First object in the inventory is
3786 * the selected object to "burn". -b.t. 3706 * the selected object to "burn". -b.t.
3787 */ 3707 */
3788 3708void
3789void apply_lighter(object *who, object *lighter) { 3709apply_lighter (object *who, object *lighter)
3710{
3790 object *item; 3711 object *item;
3791 int is_player_env=0; 3712 int is_player_env = 0;
3792 uint32 nrof;
3793 tag_t count;
3794 char item_name[MAX_BUF];
3795 3713
3796 item=find_marked_object(who); 3714 item = find_marked_object (who);
3797 if(item) { 3715 if (item)
3716 {
3798 if(lighter->last_eat && lighter->stats.food) { /* lighter gets used up */ 3717 if (lighter->last_eat && lighter->stats.food)
3718 { /* lighter gets used up */
3799 /* Split multiple lighters if they're being used up. Otherwise * 3719 /* Split multiple lighters if they're being used up. Otherwise *
3800 * one charge from each would be used up. --DAMN */ 3720 * one charge from each would be used up. --DAMN */
3801 if(lighter->nrof > 1) { 3721 if (lighter->nrof > 1)
3802 object *oneLighter = get_object(); 3722 {
3803 copy_object(lighter, oneLighter); 3723 object *oneLighter = lighter->clone ();
3724
3804 lighter->nrof -= 1; 3725 lighter->nrof -= 1;
3805 oneLighter->nrof = 1; 3726 oneLighter->nrof = 1;
3806 oneLighter->stats.food--; 3727 oneLighter->stats.food--;
3807 esrv_send_item(who, lighter); 3728 esrv_send_item (who, lighter);
3808 oneLighter=insert_ob_in_ob(oneLighter, who); 3729 oneLighter = insert_ob_in_ob (oneLighter, who);
3809 esrv_send_item(who, oneLighter); 3730 esrv_send_item (who, oneLighter);
3810 } else { 3731 }
3732 else
3811 lighter->stats.food--; 3733 lighter->stats.food--;
3812 } 3734 }
3813 3735 else if (lighter->last_eat)
3814 } else if(lighter->last_eat) { /* no charges left in lighter */ 3736 { /* no charges left in lighter */
3815 new_draw_info_format(NDI_UNIQUE, 0,who, 3737 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
3816 "You attempt to light the %s with a used up %s.",
3817 item->name, lighter->name);
3818 return; 3738 return;
3819 } 3739 }
3740
3820 /* Perhaps we should split what we are trying to light on fire? 3741 /* Perhaps we should split what we are trying to light on fire?
3821 * I can't see many times when you would want to light multiple 3742 * I can't see many times when you would want to light multiple
3822 * objects at once. 3743 * objects at once.
3823 */ 3744 */
3824 nrof=item->nrof;
3825 count=item->count;
3826 /* If the item is destroyed, we don't have a valid pointer to the
3827 * name object, so make a copy so the message we print out makes
3828 * some sense.
3829 */
3830 strcpy(item_name, item->name);
3831 if (who == is_player_inv(item)) is_player_env=1;
3832 3745
3746 if (who == item->in_player ())
3747 is_player_env = 1;
3748
3833 save_throw_object(item,AT_FIRE,who); 3749 save_throw_object (item, AT_FIRE, who);
3834 /* Change to check count and not freed, since the object pointer 3750
3835 * may have gotten recycled 3751 if (item->destroyed ())
3836 */ 3752 {
3837 if ((nrof != item->nrof ) || (count != item->count)) { 3753 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
3838 new_draw_info_format(NDI_UNIQUE, 0,who,
3839 "You light the %s with the %s.",item_name,lighter->name);
3840 /* Need to update the player so that the players glow radius 3754 /* Need to update the player so that the players glow radius
3841 * gets changed. 3755 * gets changed.
3842 */ 3756 */
3843 if (is_player_env) fix_player(who); 3757 if (is_player_env)
3844 } else { 3758 who->update_stats ();
3845 new_draw_info_format(NDI_UNIQUE, 0,who, 3759 }
3846 "You attempt to light the %s with the %s and fail.",item->name,lighter->name); 3760 else
3847 } 3761 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3848 3762 }
3849 } else /* nothing to light */ 3763 else /* nothing to light */
3850 new_draw_info(NDI_UNIQUE, 0,who,"You need to mark a lightable object."); 3764 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object.");
3851 3765
3852} 3766}
3853 3767
3854/** 3768/**
3855 * op made some mistake with a scroll, this takes care of punishment. 3769 * op made some mistake with a scroll, this takes care of punishment.
3856 * scroll_failure()- hacked directly from spell_failure 3770 * scroll_failure()- hacked directly from spell_failure
3857 */ 3771 */
3772void
3858void scroll_failure(object *op, int failure, int power) 3773scroll_failure (object *op, int failure, int power)
3859{ 3774{
3860 if(abs(failure/4)>power) power=abs(failure/4); /* set minimum effect */ 3775 if (abs (failure / 4) > power)
3776 power = abs (failure / 4); /* set minimum effect */
3861 3777
3862 if(failure<= -1&&failure > -15) {/* wonder */ 3778 if (failure <= -1 && failure > -15)
3779 { /* wonder */
3863 object *tmp; 3780 object *tmp;
3864 3781
3865 new_draw_info(NDI_UNIQUE, 0,op,"Your spell warps!."); 3782 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!.");
3866 tmp=get_archetype(SPELL_WONDER); 3783 tmp = get_archetype (SPELL_WONDER);
3867 cast_wonder(op, op, 0, tmp); 3784 cast_wonder (op, op, 0, tmp);
3868 free_object(tmp); 3785 tmp->destroy ();
3786 }
3869 } else if (failure <= -15&&failure > -35) {/* drain mana */ 3787 else if (failure <= -15 && failure > -35)
3788 { /* drain mana */
3870 new_draw_info(NDI_UNIQUE, 0,op,"Your mana is drained!."); 3789 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!.");
3871 op->stats.sp -= random_roll(0, power-1, op, PREFER_LOW); 3790 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3872 if(op->stats.sp<0) op->stats.sp = 0; 3791 if (op->stats.sp < 0)
3792 op->stats.sp = 0;
3793 }
3873 } else if (settings.spell_failure_effects == TRUE) { 3794 else if (settings.spell_failure_effects == TRUE)
3874 if (failure <= -35&&failure > -60) { /* confusion */ 3795 {
3796 if (failure <= -35 && failure > -60)
3797 { /* confusion */
3875 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils on you!"); 3798 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3876 confuse_player(op,op,power); 3799 confuse_player (op, op, power);
3877 } else if (failure <= -60&&failure> -70) {/* paralysis */ 3800 }
3801 else if (failure <= -60 && failure > -70)
3802 { /* paralysis */
3878 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils and paralyzes " 3803 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!");
3879 "you!");
3880 paralyze_player(op,op,power); 3804 paralyze_player (op, op, power);
3805 }
3881 } else if (failure <= -70&&failure> -80) {/* blind */ 3806 else if (failure <= -70 && failure > -80)
3807 { /* blind */
3882 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils on you!"); 3808 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3883 blind_player(op,op,power); 3809 blind_player (op, op, power);
3884 } else if (failure <= -80) {/* blast the immediate area */ 3810 }
3885 object *tmp; 3811 else if (failure <= -80)
3886 tmp=get_archetype(LOOSE_MANA); 3812 { /* blast the immediate area */
3813 object *tmp = get_archetype (LOOSE_MANA);
3887 cast_magic_storm(op,tmp, power); 3814 cast_magic_storm (op, tmp, power);
3888 new_draw_info(NDI_UNIQUE, 0,op,"You unlease uncontrolled mana!"); 3815 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
3889 free_object(tmp); 3816 tmp->destroy ();
3890 } 3817 }
3891 } 3818 }
3892} 3819}
3893 3820
3821void
3894void apply_changes_to_player(object *pl, object *change) { 3822apply_changes_to_player (object *pl, object *change)
3823{
3895 int excess_stat=0; /* if the stat goes over the maximum 3824 int excess_stat = 0; /* if the stat goes over the maximum
3896 for the race, put the excess stat some 3825 for the race, put the excess stat some
3897 where else. */ 3826 where else. */
3898 3827
3899 switch (change->type) { 3828 switch (change->type)
3900 case CLASS: { 3829 {
3830 case CLASS:
3831 {
3901 living *stats = &(pl->contr->orig_stats); 3832 living *stats = &(pl->contr->orig_stats);
3902 living *ns = &(change->stats); 3833 living *ns = &(change->stats);
3903 object *walk; 3834 object *walk;
3904 int flag_change_face=1; 3835 int flag_change_face = 1;
3905 3836
3906 /* the following code assigns stats up to the stat max 3837 /* the following code assigns stats up to the stat max
3907 * for the race, and if the stat max is exceeded, 3838 * for the race, and if the stat max is exceeded,
3908 * tries to randomly reassign the excess stat 3839 * tries to randomly reassign the excess stat
3909 */ 3840 */
3910 int i,j; 3841 int i, j;
3842
3911 for(i=0;i<NUM_STATS;i++) { 3843 for (i = 0; i < NUM_STATS; i++)
3912 sint8 stat=get_attr_value(stats,i); 3844 {
3913 int race_bonus = get_attr_value(&(pl->arch->clone.stats),i); 3845 int race_bonus = pl->arch->clone.stats.stat (i);
3914 stat += get_attr_value(ns,i); 3846 sint8 stat = stats->stat (i) + ns->stat (i);
3915 if(stat > 20 + race_bonus) {
3916 excess_stat++;
3917 stat = 20+race_bonus;
3918 }
3919 set_attr_value(stats,i,stat);
3920 }
3921 3847
3922 for(j=0;excess_stat >0 && j<100;j++) {/* try 100 times to assign excess stats */ 3848 if (stat > 20 + race_bonus)
3923 int i = rndm(0, 6); 3849 {
3924 int stat=get_attr_value(stats,i); 3850 excess_stat++;
3925 int race_bonus = get_attr_value(&(pl->arch->clone.stats),i); 3851 stat = 20 + race_bonus;
3926 if(i==CHA) continue; /* exclude cha from this */ 3852 }
3927 if( stat < 20 + race_bonus) { 3853
3854 stats->stat (i) = stat;
3855 }
3856
3857 for (j = 0; excess_stat > 0 && j < 100; j++)
3858 { /* try 100 times to assign excess stats */
3859 int i = rndm (0, 6);
3860
3861 if (i == CHA)
3862 continue; /* exclude cha from this */
3863
3864 int stat = stats->stat (i);
3865 int race_bonus = pl->arch->clone.stats.stat (i);
3866 if (stat < 20 + race_bonus)
3867 {
3928 change_attr_value(stats,i,1); 3868 change_attr_value (stats, i, 1);
3929 excess_stat--; 3869 excess_stat--;
3930 } 3870 }
3931 } 3871 }
3932 3872
3933 /* insert the randomitems from the change's treasurelist into 3873 /* insert the randomitems from the change's treasurelist into
3934 * the player ref: player.c 3874 * the player ref: player.c
3935 */ 3875 */
3936 if(change->randomitems!=NULL) 3876 if (change->randomitems != NULL)
3937 give_initial_items(pl,change->randomitems); 3877 give_initial_items (pl, change->randomitems);
3938 3878
3939
3940 /* set up the face, for some races. */ 3879 /* set up the face, for some races. */
3941 3880
3942 /* first, look for the force object banning 3881 /* first, look for the force object banning
3943 * changing the face. Certain races never change face with class. 3882 * changing the face. Certain races never change face with class.
3944 */ 3883 */
3945 for(walk=pl->inv;walk!=NULL;walk=walk->below) 3884 for (walk = pl->inv; walk != NULL; walk = walk->below)
3946 if (!strcmp(walk->name,"NOCLASSFACECHANGE")) flag_change_face=0; 3885 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3886 flag_change_face = 0;
3947 3887
3948 if(flag_change_face) { 3888 if (flag_change_face)
3889 {
3949 pl->animation_id = GET_ANIM_ID(change); 3890 pl->animation_id = GET_ANIM_ID (change);
3950 pl->face = change->face; 3891 pl->face = change->face;
3951 3892
3952 if(QUERY_FLAG(change,FLAG_ANIMATE)) 3893 if (QUERY_FLAG (change, FLAG_ANIMATE))
3953 SET_FLAG(pl,FLAG_ANIMATE); 3894 SET_FLAG (pl, FLAG_ANIMATE);
3954 else 3895 else
3955 CLEAR_FLAG(pl,FLAG_ANIMATE); 3896 CLEAR_FLAG (pl, FLAG_ANIMATE);
3956 } 3897 }
3957 3898
3958 /* check the special case of can't use weapons */ 3899 /* check the special case of can't use weapons */
3959 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON);*/ 3900 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3960 if(!strcmp(change->name,"monk")) CLEAR_FLAG(pl,FLAG_USE_WEAPON); 3901 if (!strcmp (change->name, "monk"))
3902 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3961 3903
3962 break; 3904 break;
3963 } 3905 }
3964 } 3906 }
3965} 3907}
3966 3908
3967/** 3909/**
3968 * This handles items of type 'transformer'. 3910 * This handles items of type 'transformer'.
… …
3972 * Change information is contained in the 'slaying' field of the marked item. 3914 * Change information is contained in the 'slaying' field of the marked item.
3973 * The format is as follow: transformer:[number ]yield[;transformer:...]. 3915 * The format is as follow: transformer:[number ]yield[;transformer:...].
3974 * This way an item can be transformed in many things, and/or many objects. 3916 * This way an item can be transformed in many things, and/or many objects.
3975 * The 'slaying' field for transformer is used as verb for the action. 3917 * The 'slaying' field for transformer is used as verb for the action.
3976 */ 3918 */
3919void
3977void apply_item_transformer( object* pl, object* transformer ) 3920apply_item_transformer (object *pl, object *transformer)
3978 { 3921{
3979 object* marked; 3922 object *marked;
3980 object* new_item; 3923 object *new_item;
3981 char* find; 3924 char *find;
3982 char* separator; 3925 char *separator;
3983 int yield; 3926 int yield;
3984 char got[ MAX_BUF ]; 3927 char got[MAX_BUF];
3985 int len; 3928 int len;
3986 3929
3987 if ( !pl || !transformer ) 3930 if (!pl || !transformer)
3988 return; 3931 return;
3989 marked = find_marked_object( pl ); 3932 marked = find_marked_object (pl);
3990 if ( !marked ) 3933 if (!marked)
3991 { 3934 {
3992 new_draw_info_format( NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name( transformer ) ); 3935 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
3993 return; 3936 return;
3994 } 3937 }
3995 if ( !marked->slaying ) 3938 if (!marked->slaying)
3996 { 3939 {
3997 new_draw_info_format( NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name( transformer ), query_name( marked ) ); 3940 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3998 return; 3941 return;
3999 } 3942 }
4000 /* check whether they are compatible or not */ 3943 /* check whether they are compatible or not */
4001 find = strstr( marked->slaying, transformer->arch->name ); 3944 find = strstr (marked->slaying, transformer->arch->name);
4002 if ( !find || ( *( find + strlen( transformer->arch->name ) ) != ':' ) ) 3945 if (!find || (*(find + strlen (transformer->arch->name)) != ':'))
4003 { 3946 {
4004 new_draw_info_format( NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name( transformer ), query_name( marked ) ); 3947 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
4005 return; 3948 return;
4006 } 3949 }
4007 find += strlen( transformer->arch->name ) + 1; 3950 find += strlen (transformer->arch->name) + 1;
4008 /* Item can be used, now find how many and what it yields */ 3951 /* Item can be used, now find how many and what it yields */
4009 if ( isdigit( *( find ) ) ) 3952 if (isdigit (*(find)))
4010 { 3953 {
4011 yield = atoi( find ); 3954 yield = atoi (find);
4012 if ( yield < 1 ) 3955 if (yield < 1)
4013 { 3956 {
4014 LOG( llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name( marked, 0 ), yield ); 3957 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
4015 yield = 1; 3958 yield = 1;
4016 } 3959 }
4017 } 3960 }
4018 else 3961 else
4019 yield = 1; 3962 yield = 1;
4020 3963
4021 while ( isdigit( *find ) ) 3964 while (isdigit (*find))
4022 find++; 3965 find++;
4023 while ( *find == ' ' ) 3966 while (*find == ' ')
4024 find++; 3967 find++;
4025 memset( got, 0, MAX_BUF ); 3968 memset (got, 0, MAX_BUF);
4026 if ( (separator = strchr( find, ';' ))!=NULL) 3969 if ((separator = strchr (find, ';')) != NULL)
4027 { 3970 {
4028 len = separator - find; 3971 len = separator - find;
4029 } 3972 }
4030 else 3973 else
4031 { 3974 {
4032 len = strlen(find); 3975 len = strlen (find);
4033 } 3976 }
4034 if ( len > MAX_BUF-1) 3977 if (len > MAX_BUF - 1)
4035 len = MAX_BUF-1; 3978 len = MAX_BUF - 1;
4036 strcpy( got, find ); 3979 strcpy (got, find);
4037 got[len] = '\0'; 3980 got[len] = '\0';
4038 3981
4039 /* Now create new item, remove used ones when required. */ 3982 /* Now create new item, remove used ones when required. */
4040 new_item = get_archetype( got ); 3983 new_item = get_archetype (got);
4041 if ( !new_item ) 3984 if (!new_item)
4042 { 3985 {
4043 new_draw_info_format( NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name( marked, 0 ) ); 3986 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0));
4044 return; 3987 return;
4045 } 3988 }
3989
4046 new_item->nrof = yield; 3990 new_item->nrof = yield;
4047 new_draw_info_format( NDI_UNIQUE, 0, pl, "You %s the %s.", transformer->slaying, query_base_name( marked, 0 ) ); 3991 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
4048 insert_ob_in_ob( new_item, pl ); 3992 insert_ob_in_ob (new_item, pl);
4049 esrv_send_inventory( pl, pl ); 3993 esrv_send_inventory (pl, pl);
4050 /* Eat up one item */ 3994 /* Eat up one item */
4051 decrease_ob_nr( marked, 1 ); 3995 decrease_ob_nr (marked, 1);
4052 /* Eat one transformer if needed */ 3996 /* Eat one transformer if needed */
4053 if ( transformer->stats.food ) 3997 if (transformer->stats.food)
4054 if ( --transformer->stats.food == 0 ) 3998 if (--transformer->stats.food == 0)
4055 decrease_ob_nr( transformer, 1 ); 3999 decrease_ob_nr (transformer, 1);
4056 } 4000}

Diff Legend

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