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

Diff Legend

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