ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

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

Diff Legend

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