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

Diff Legend

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