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

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

Diff Legend

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