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.3 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.107 by root, Mon May 28 21:28:35 2007 UTC

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

Diff Legend

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