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.59 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.182 by root, Thu Jan 1 11:41:17 2009 UTC

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

Diff Legend

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