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.31 by root, Sun Dec 3 20:26:35 2006 UTC vs.
Revision 1.183 by root, Thu Jan 8 04:35:04 2009 UTC

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

Diff Legend

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