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

Diff Legend

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