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

Diff Legend

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