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.1 by elmex, Sun Aug 13 17:16:03 2006 UTC vs.
Revision 1.169 by root, Sun Sep 7 21:31:23 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines