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

Diff Legend

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