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.67 by root, Thu Feb 8 03:09:32 2007 UTC vs.
Revision 1.201 by root, Mon Oct 12 14:00:58 2009 UTC

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

Diff Legend

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