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.80 by root, Thu May 3 04:50:27 2007 UTC vs.
Revision 1.187 by elmex, Tue Jan 13 13:29:57 2009 UTC

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

Diff Legend

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