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.16 by root, Wed Aug 30 09:31:30 2006 UTC vs.
Revision 1.172 by root, Mon Sep 29 10:32:50 2008 UTC

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

Diff Legend

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