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

Diff Legend

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