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.97 by root, Tue May 15 19:07:15 2007 UTC vs.
Revision 1.242 by root, Mon Apr 5 22:00:15 2010 UTC

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

Diff Legend

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