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

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.9 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.64 by root, Tue May 5 04:51:56 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003,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 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#ifndef __CEXTRACT__
27# include <sproto.h> 26#include <sproto.h>
28#endif
29#include <living.h> 27#include <living.h>
30#include <skills.h> 28#include <skills.h>
31#include <spells.h> 29#include <spells.h>
32#include <book.h> 30#include <book.h>
33 31
… …
41 return -1; 39 return -1;
42 40
43 /* Only prohibit stealing if the player does not have a free 41 /* Only prohibit stealing if the player does not have a free
44 * hand available and in fact does have hands. 42 * hand available and in fact does have hands.
45 */ 43 */
46 if (op->type == PLAYER && op->body_used[BODY_ARMS] <= 0 && op->body_info[BODY_ARMS]) 44 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
47 { 45 {
48 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!"); 46 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with! "
47 "H<Try to unapply weapons or things you hold in your hands, use the C<body> command.>");
49 return -1; 48 return -1;
50 } 49 }
51 50
52 /* ADJUSTMENTS */ 51 /* ADJUSTMENTS */
53 52
… …
66 * it quite a bit harder to steal. 65 * it quite a bit harder to steal.
67 */ 66 */
68 for (equip = op->inv; equip; equip = equip->below) 67 for (equip = op->inv; equip; equip = equip->below)
69 { 68 {
70 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED)) 69 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED))
71 {
72 roll -= equip->weight / 10000; 70 roll -= equip->weight / 10000;
73 } 71
74 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED)) 72 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED))
75 roll -= equip->weight / 5000; 73 roll -= equip->weight / 5000;
74
76 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED)) 75 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED))
77 {
78 roll -= equip->weight / 2000; 76 roll -= equip->weight / 2000;
79 } 77
80 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED)) 78 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED))
81 roll -= equip->weight / 5000; 79 roll -= equip->weight / 5000;
80
82 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED)) 81 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED))
83 roll -= equip->weight / 100; 82 roll -= equip->weight / 100;
84 } 83 }
84
85 if (roll < 0) 85 if (roll < 0)
86 roll = 0; 86 roll = 0;
87
87 return roll; 88 return roll;
88} 89}
89 90
90/* 91/*
91 * When stealing: dependent on the intelligence/wisdom of whom you're 92 * When stealing: dependent on the intelligence/wisdom of whom you're
… …
94 * or not. 95 * or not.
95 * op is the target (person being pilfered) 96 * op is the target (person being pilfered)
96 * who is the person doing the stealing. 97 * who is the person doing the stealing.
97 * skill is the skill object (stealing). 98 * skill is the skill object (stealing).
98 */ 99 */
99
100static int 100static int
101attempt_steal (object *op, object *who, object *skill) 101attempt_steal (object *op, object *who, object *skill)
102{ 102{
103 object *success = NULL, *tmp = NULL, *next; 103 object *success = NULL, *tmp = NULL, *next;
104 int roll = 0, chance = 0, stats_value; 104 int roll = 0, chance = 0, stats_value;
105 rv_vector rv; 105 rv_vector rv;
106 106
107 stats_value = ((who->stats.Dex + who->stats.Int) * 3) / 2; 107 stats_value = (who->stats.Dex + who->stats.Int) * 3 / 2;
108 108
109 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them) 109 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them)
110 * they will try to prevent stealing if they can. Only unseen theives will 110 * they will try to prevent stealing if they can. Only unseen theives will
111 * have much chance of success. 111 * have much chance of success.
112 */ 112 */
113 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_NO_STEAL)) 113 if (!op->is_player () && op->flag [FLAG_NO_STEAL])
114 { 114 {
115 if (can_detect_enemy (op, who, &rv)) 115 if (can_detect_enemy (op, who, &rv))
116 { 116 {
117 npc_call_help (op); 117 npc_call_help (op);
118 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 118 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
119 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!"); 119 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!");
120 return 0; 120 return 0;
121 } 121 }
122 else /* help npc to detect thief next time by raising its wisdom */ 122 else /* help npc to detect thief next time by raising its wisdom */
123 op->stats.Wis += (op->stats.Int / 5) + 1; 123 op->stats.Wis += (op->stats.Int / 5) + 1;
124
124 if (op->stats.Wis > MAX_STAT) 125 if (op->stats.Wis > MAX_STAT)
125 op->stats.Wis = MAX_STAT; 126 op->stats.Wis = MAX_STAT;
126 } 127 }
127 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ)) 128
129 if (op->is_player () && op->flag [FLAG_WIZ])
128 { 130 {
129 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 131 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n");
130 return 0; 132 return 0;
131 } 133 }
132#ifdef PROHIBIT_PLAYERKILL 134
135 // only allow stealing between hostile players (TODO: probably should change)
133 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful)) 136 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful))
134 { 137 {
135 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 138 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
136 return 0; 139 return 0;
137 } 140 }
138#else
139 if (op->type == PLAYER && who->type == PLAYER && settings.no_player_stealing)
140 {
141 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
142 return 0;
143 }
144#endif
145 141
146
147 /* Ok then, go thru their inventory, stealing */ 142 /* Ok then, go through their inventory, stealing */
148 for (tmp = op->inv; tmp != NULL; tmp = next) 143 for (tmp = op->inv; tmp; tmp = next)
149 { 144 {
150 next = tmp->below; 145 next = tmp->below;
151 146
152 /* you can't steal worn items, starting items, wiz stuff, 147 /* you can't steal worn items, starting items, wiz stuff,
153 * innate abilities, or items w/o a type. Generally 148 * innate abilities, or items w/o a type. Generally
… …
157 * future possible problems. -b.t. 152 * future possible problems. -b.t.
158 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL 153 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL
159 * already -b.t. 154 * already -b.t.
160 */ 155 */
161 156
162 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) || QUERY_FLAG (tmp, FLAG_APPLIED) 157 if (QUERY_FLAG (tmp, FLAG_APPLIED)
163 || !(tmp->type) 158 || !tmp->type
164 || tmp->type == EXPERIENCE || tmp->type == SPELL 159 || tmp->type == SPELL
165 || QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_STEAL) || tmp->invisible) 160 || QUERY_FLAG (tmp, FLAG_STARTEQUIP)
161 || QUERY_FLAG (tmp, FLAG_NO_STEAL)
162 || tmp->invisible)
166 continue; 163 continue;
167 164
168 /* Okay, try stealing this item. Dependent on dexterity of thief, 165 /* Okay, try stealing this item. Dependent on dexterity of thief,
169 * skill level, see the adj_stealroll fctn for more detail. 166 * skill level, see the adj_stealroll fctn for more detail.
170 */ 167 */
… …
173 170
174 if ((chance = adj_stealchance (who, op, (stats_value + skill->level * 10 - op->level * 3))) == -1) 171 if ((chance = adj_stealchance (who, op, (stats_value + skill->level * 10 - op->level * 3))) == -1)
175 return 0; 172 return 0;
176 else if (roll < chance) 173 else if (roll < chance)
177 { 174 {
178 tag_t tmp_count = tmp->count;
179
180 pick_up (who, tmp); 175 pick_up (who, tmp);
181 /* need to see if the player actually stole this item - 176 /* need to see if the player actually stole this item -
182 * if it is in the players inv, assume it is. This prevents 177 * if it is in the players inv, assume it is. This prevents
183 * abuses where the player can not carry the item, so just 178 * abuses where the player can not carry the item, so just
184 * keeps stealing it over and over. 179 * keeps stealing it over and over.
185 */ 180 */
186 if (was_destroyed (tmp, tmp_count) || tmp->env != op) 181 if (tmp->destroyed () || tmp->env != op)
187 { 182 {
188 /* for players, play_sound: steals item */ 183 /* for players, play_sound: steals item */
189 success = tmp; 184 success = tmp;
190 CLEAR_FLAG (tmp, FLAG_INV_LOCKED); 185 CLEAR_FLAG (tmp, FLAG_INV_LOCKED);
191
192 /* Don't delete it from target player until we know
193 * the thief has picked it up. can't just look at tmp->count,
194 * as it's possible that it got merged when picked up.
195 */
196 if (op->type == PLAYER)
197 esrv_del_item (op->contr, tmp_count);
198 } 186 }
187
199 break; 188 break;
200 } 189 }
201 } /* for loop looking for an item */ 190 } /* for loop looking for an item */
202 191
203 if (!tmp) 192 if (!tmp)
… …
212 */ 201 */
213 202
214 if ((roll >= skill->level) || !chance 203 if ((roll >= skill->level) || !chance
215 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW))))) 204 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW)))))
216 { 205 {
217
218 /* victim figures out where the thief is! */ 206 /* victim figures out where the thief is! */
219 if (who->hide) 207 if (who->flag [FLAG_HIDDEN])
220 make_visible (who); 208 make_visible (who);
221 209
222 if (op->type != PLAYER) 210 if (op->type != PLAYER)
223 { 211 {
224 /* The unaggressives look after themselves 8) */ 212 /* The unaggressives look after themselves 8) */
225 if (who->type == PLAYER) 213 if (who->type == PLAYER)
226 { 214 {
227 npc_call_help (op); 215 npc_call_help (op);
228 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op)); 216 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op));
229 } 217 }
218
230 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 219 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
231 /* all remaining npc items are guarded now. Set flag NO_STEAL 220 /* all remaining npc items are guarded now. Set flag NO_STEAL
232 * on the victim. 221 * on the victim.
233 */ 222 */
234 SET_FLAG (op, FLAG_NO_STEAL); 223 SET_FLAG (op, FLAG_NO_STEAL);
… …
237 { /* stealing from another player */ 226 { /* stealing from another player */
238 char buf[MAX_BUF]; 227 char buf[MAX_BUF];
239 228
240 /* Notify the other player */ 229 /* Notify the other player */
241 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW)) 230 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW))
242 {
243 sprintf (buf, "Your %s is missing!", query_name (success)); 231 sprintf (buf, "Your %s is missing!", query_name (success));
244 }
245 else 232 else
246 {
247 sprintf (buf, "Your pack feels strangely lighter."); 233 sprintf (buf, "Your pack feels strangely lighter.");
248 } 234
249 new_draw_info (NDI_UNIQUE, 0, op, buf); 235 new_draw_info (NDI_UNIQUE, 0, op, buf);
250 if (!success) 236 if (!success)
251 { 237 {
252 if (who->invisible) 238 if (who->invisible)
253 {
254 sprintf (buf, "you feel itchy fingers getting at your pack."); 239 sprintf (buf, "you feel itchy fingers getting at your pack.");
255 }
256 else 240 else
257 {
258 sprintf (buf, "%s looks very shifty.", query_name (who)); 241 sprintf (buf, "%s looks very shifty.", query_name (who));
259 } 242
260 new_draw_info (NDI_UNIQUE, 0, op, buf); 243 new_draw_info (NDI_UNIQUE, 0, op, buf);
261 } 244 }
262 } /* else stealing from another player */ 245 } /* else stealing from another player */
263 /* play_sound("stop! thief!"); kindofthing */ 246 /* play_sound("stop! thief!"); kindofthing */
264 } /* if you weren't 100% successful */ 247 } /* if you weren't 100% successful */
248
265 return success ? 1 : 0; 249 return success ? 1 : 0;
266} 250}
267
268 251
269int 252int
270steal (object *op, int dir, object *skill) 253steal (object *op, int dir, object *skill)
271{ 254{
272 object *tmp, *next; 255 object *tmp, *next;
273 sint16 x, y; 256 sint16 x, y;
274 mapstruct *m; 257 maptile *m;
275 int mflags; 258 int mflags;
276 259
277 x = op->x + freearr_x[dir]; 260 x = op->x + freearr_x[dir];
278 y = op->y + freearr_y[dir]; 261 y = op->y + freearr_y[dir];
279 262
… …
294 /* If player can't move onto the space, can't steal from it. */ 277 /* If player can't move onto the space, can't steal from it. */
295 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 278 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
296 return 0; 279 return 0;
297 280
298 /* Find the topmost object at this spot */ 281 /* Find the topmost object at this spot */
299 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 282 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
300 283
301 /* For all the stacked objects at this point, attempt a steal */ 284 /* For all the stacked objects at this point, attempt a steal */
302 for (; tmp != NULL; tmp = next) 285 for (; tmp != NULL; tmp = next)
303 { 286 {
304 next = tmp->below; 287 next = tmp->below;
… …
320 return 0; 303 return 0;
321 304
322 /* no xp for stealing from pets (of players) */ 305 /* no xp for stealing from pets (of players) */
323 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 306 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
324 { 307 {
325 object *owner = get_owner (tmp); 308 object *owner = tmp->owner;
326 309
327 if (owner != NULL && owner->type == PLAYER) 310 if (owner != NULL && owner->type == PLAYER)
328 return 0; 311 return 0;
329 } 312 }
330 313
… …
385 { 368 {
386 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there."); 369 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there.");
387 return 0; 370 return 0;
388 } 371 }
389 372
390 for (tmp = get_map_ob (pl->map, x, y); tmp; tmp = tmp->above) 373 for (tmp = GET_MAP_OB (pl->map, x, y); tmp; tmp = tmp->above)
391 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 374 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
392 break; 375 break;
393 376
394 if (!tmp) 377 if (!tmp)
395 { 378 {
… …
417 { 400 {
418 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to pick the lock."); 401 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to pick the lock.");
419 return 0; 402 return 0;
420 } 403 }
421} 404}
422
423 405
424/* HIDE CODE. The user becomes undetectable (not just 'invisible') for 406/* HIDE CODE. The user becomes undetectable (not just 'invisible') for
425 * a short while (success and duration dependant on player SK_level, 407 * a short while (success and duration dependant on player SK_level,
426 * dexterity, charisma, and map difficulty). 408 * dexterity, charisma, and map difficulty).
427 * Players have a good chance of becoming 'unhidden' if they move 409 * Players have a good chance of becoming 'unhidden' if they move
428 * and like invisiblity will be come visible if they attack 410 * and like invisiblity will be come visible if they attack
429 * Implemented by b.t. (thomas@astro.psu.edu) 411 * Implemented by b.t. (thomas@astro.psu.edu)
430 * July 7, 1995 - made hiding possible for monsters. -b.t. 412 * July 7, 1995 - made hiding possible for monsters. -b.t.
431 */ 413 */
432
433static int 414static int
434attempt_hide (object *op, object *skill) 415attempt_hide (object *op, object *skill)
435{ 416{
436 int number, difficulty = op->map->difficulty; 417 int number, difficulty = op->map->difficulty;
437 int terrain = hideability (op); 418 int terrain = hideability (op);
… …
440 return 0; 421 return 0;
441 422
442 /* Hiding success and duration dependant on skill level, 423 /* Hiding success and duration dependant on skill level,
443 * op->stats.Dex, map difficulty and terrain. 424 * op->stats.Dex, map difficulty and terrain.
444 */ 425 */
445
446 number = (die_roll (2, 25, op, PREFER_LOW) - 2) / 2; 426 number = (die_roll (2, 25, op, PREFER_LOW) - 2) / 2;
427
447 if (!stand_near_hostile (op) && (number < (op->stats.Dex + skill->level + terrain - difficulty))) 428 if (!stand_near_hostile (op) && (number < (op->stats.Dex + skill->level + terrain - difficulty)))
448 { 429 {
449 op->invisible += 100; /* set the level of 'hiddeness' */ 430 op->invisible += 100; /* set the level of 'hiddeness' */
431
450 if (op->type == PLAYER) 432 if (op->type == PLAYER)
451 op->contr->tmp_invis = 1; 433 op->contr->tmp_invis = 1;
452 op->hide = 1; 434
435 op->flag [FLAG_HIDDEN] = 1;
453 return 1; 436 return 1;
454 } 437 }
438
455 return 0; 439 return 0;
456} 440}
457 441
458/* patched this to take terrain into consideration */ 442/* patched this to take terrain into consideration */
459
460int 443int
461hide (object *op, object *skill) 444hide (object *op, object *skill)
462{ 445{
463
464 /* the preliminaries -- Can we really hide now? */ 446 /* the preliminaries -- Can we really hide now? */
465 /* this keeps monsters from using invisibilty spells and hiding */ 447 /* this keeps monsters from using invisibilty spells and hiding */
466 448
467 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 449 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
468 { 450 {
469 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 451 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
470 return 0; 452 return 0;
471 } 453 }
472 else if (!op->hide && op->invisible > 0 && op->type == PLAYER) 454 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
473 { 455 {
474 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!"); 456 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!");
475 make_visible (op); 457 make_visible (op);
476 } 458 }
477 459
478 if (op->invisible > (50 * skill->level)) 460 if (op->invisible > 50 * skill->level)
479 { 461 {
480 new_draw_info (NDI_UNIQUE, 0, op, "You are as hidden as you can get."); 462 new_draw_info (NDI_UNIQUE, 0, op, "You are as hidden as you can get.");
481 return 0; 463 return 0;
482 } 464 }
483 465
… …
485 { 467 {
486 new_draw_info (NDI_UNIQUE, 0, op, "You hide in the shadows."); 468 new_draw_info (NDI_UNIQUE, 0, op, "You hide in the shadows.");
487 update_object (op, UP_OBJ_FACE); 469 update_object (op, UP_OBJ_FACE);
488 return calc_skill_exp (op, NULL, skill); 470 return calc_skill_exp (op, NULL, skill);
489 } 471 }
472
490 new_draw_info (NDI_UNIQUE, 0, op, "You fail to conceal yourself."); 473 new_draw_info (NDI_UNIQUE, 0, op, "You fail to conceal yourself.");
491 return 0; 474 return 0;
492} 475}
493
494 476
495/* stop_jump() - End of jump. Clear flags, restore the map, and 477/* stop_jump() - End of jump. Clear flags, restore the map, and
496 * freeze the jumper a while to simulate the exhaustion 478 * freeze the jumper a while to simulate the exhaustion
497 * of jumping. 479 * of jumping.
498 */ 480 */
499static void 481static void
500stop_jump (object *pl, int dist, int spaces) 482stop_jump (object *pl, int dist, int spaces)
501{ 483{
502 fix_player (pl); 484 pl->update_stats ();
503 insert_ob_in_map (pl, pl->map, pl, 0); 485 pl->map->insert (pl, pl->x, pl->y, pl);
486 pl->speed_left -= fabs (pl->speed * 8);
504} 487}
505
506 488
507static int 489static int
508attempt_jump (object *pl, int dir, int spaces, object *skill) 490attempt_jump (object *pl, int dir, int spaces, object *skill)
509{ 491{
510 object *tmp; 492 object *tmp;
511 int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags; 493 int i, dx = freearr_x[dir], dy = freearr_y[dir], mflags;
512 sint16 x, y; 494 sint16 x, y;
513 mapstruct *m; 495 maptile *m;
514 496
515 /* Jump loop. Go through spaces opject wants to jump. Halt the 497 /* Jump loop. Go through spaces object wants to jump. Halt the
516 * jump if a wall or creature is in the way. We set FLAG_FLYING 498 * jump if a wall or creature is in the way. We set FLAG_FLYING
517 * temporarily to allow player to aviod exits/archs that are not 499 * temporarily to allow player to aviod exits/archs that are not
518 * fly_on, fly_off. This will also prevent pickup of objects 500 * fly_on, fly_off. This will also prevent pickup of objects
519 * while jumping over them. 501 * while jumping over them.
520 */ 502 */
521 503 pl->remove ();
522 remove_ob (pl);
523
524 /*
525 * I don't think this is actually needed - all the movement
526 * code is handled in this function, and I don't see anyplace
527 * that cares about the move_type being flying.
528 */
529 pl->move_type |= MOVE_FLY_LOW; 504 pl->move_type |= MOVE_FLY_LOW;
530 505
531 for (i = 0; i <= spaces; i++) 506 for (i = 0; i <= spaces; i++)
532 { 507 {
533 x = pl->x + dx; 508 x = pl->x + dx;
… …
536 511
537 mflags = get_map_flags (m, &m, x, y, &x, &y); 512 mflags = get_map_flags (m, &m, x, y, &x, &y);
538 513
539 if (mflags & P_OUT_OF_MAP) 514 if (mflags & P_OUT_OF_MAP)
540 { 515 {
541 (void) stop_jump (pl, i, spaces); 516 stop_jump (pl, i, spaces);
542 return 0; 517 return 0;
543 } 518 }
519
520 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
521 {
522 /* Jump into creature */
523 if (QUERY_FLAG (tmp, FLAG_MONSTER)
524 || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
525 {
526 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
527
528 stop_jump (pl, i, spaces);
529
530 int exp = 0;
531
532 if (tmp->type != PLAYER
533 || (pl->type == PLAYER && !pl->contr->party)
534 || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
535 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
536
537 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
538 }
539 }
540
544 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) 541 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y)))
545 { 542 {
546 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked."); 543 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked.");
547 stop_jump (pl, i, spaces); 544 stop_jump (pl, i, spaces);
548 return 0; 545 return 0;
549 } 546 }
550 547
551 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above)
552 {
553 /* Jump into creature */
554 if (QUERY_FLAG (tmp, FLAG_MONSTER) || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
555 {
556 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
557 if (tmp->type != PLAYER ||
558 (pl->type == PLAYER && pl->contr->party == NULL) ||
559 (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
560 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
561 stop_jump (pl, i, spaces);
562 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
563 }
564 /* If the space has fly on set (no matter what the space is),
565 * we should get the effects - after all, the player is
566 * effectively flying.
567 */
568 if (tmp->move_on & MOVE_FLY_LOW)
569 {
570 pl->x = x;
571 pl->y = y;
572 pl->map = m;
573 stop_jump (pl, i, spaces);
574 return calc_skill_exp (pl, NULL, skill);
575 }
576 }
577 pl->x = x; 548 pl->x = x;
578 pl->y = y; 549 pl->y = y;
579 pl->map = m; 550 pl->map = m;
551
552 if (m->at (x, y).move_on & pl->move_type)
553 {
554 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is stopped.");
555 stop_jump (pl, i, spaces);
556 return 0;
557 }
580 } 558 }
559
581 stop_jump (pl, i, spaces); 560 stop_jump (pl, i, spaces);
561
582 return calc_skill_exp (pl, NULL, skill); 562 return calc_skill_exp (pl, NULL, skill);
583} 563}
584 564
585/* jump() - this is both a new type of movement for player/monsters and 565/* jump() - this is both a new type of movement for player/monsters and
586 * an attack as well. 566 * an attack as well.
587 * Perhaps we should allow more spaces based on level, eg, level 50 567 * Perhaps we should allow more spaces based on level, eg, level 50
588 * jumper can jump several spaces? 568 * jumper can jump several spaces?
589 */ 569 */
590
591int 570int
592jump (object *pl, int dir, object *skill) 571jump (object *pl, int dir, object *skill)
593{ 572{
594 int spaces = 0, stats;
595 int str = pl->stats.Str; 573 int str = pl->stats.Str;
596 int dex = pl->stats.Dex; 574 int dex = pl->stats.Dex;
597 575
598 dex = dex ? dex : 15; 576 dex = dex ? dex : 15;
599 str = str ? str : 10; 577 str = str ? str : 10;
600 578
601 stats = str * str * str * dex * skill->level; 579 int stats = str * str * str * dex * skill->level;
580 int spaces = min (3, skill->level, stats / (pl->carrying + 1));
602 581
603 if (pl->carrying != 0) /* don't want div by zero !! */
604 spaces = (int) (stats / pl->carrying);
605 else
606 spaces = 2; /* pl has no objects - gets the far jump */
607
608 if (spaces > 2)
609 spaces = 2;
610 else if (spaces == 0) 582 if (spaces == 0)
611 { 583 {
612 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump."); 584 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump.");
613 return 0; 585 return 0;
614 } 586 }
587
615 return attempt_jump (pl, dir, spaces, skill); 588 return attempt_jump (pl, dir, spaces, skill);
616} 589}
617
618 590
619/* skill_ident() - this code is supposed to allow players to identify 591/* skill_ident() - this code is supposed to allow players to identify
620 * classes of objects with the various "auto-ident" skills. Player must 592 * classes of objects with the various "auto-ident" skills. Player must
621 * have unidentified objects of the right type in order for the skill 593 * have unidentified objects of the right type in order for the skill
622 * to work. While multiple classes of objects may be identified, 594 * to work. While multiple classes of objects may be identified,
623 * this code is kind of yucky -- it would be nice to make it a bit 595 * this code is kind of yucky -- it would be nice to make it a bit
624 * more generalized. Right now, skill indices are embedded in this routine. 596 * more generalized. Right now, skill indices are embedded in this routine.
625 * Returns amount of experience gained (on successful ident). 597 * Returns amount of experience gained (on successful ident).
626 * - b.t. (thomas@astro.psu.edu) 598 * - b.t. (thomas@astro.psu.edu)
627 */ 599 */
628
629static int 600static int
630do_skill_detect_curse (object *pl, object *skill) 601do_skill_detect_curse (object *pl, object *skill)
631{ 602{
632 object *tmp; 603 object *tmp;
633 int success = 0; 604 int success = 0;
… …
641 esrv_update_item (UPD_FLAGS, pl, tmp); 612 esrv_update_item (UPD_FLAGS, pl, tmp);
642 success += calc_skill_exp (pl, tmp, skill); 613 success += calc_skill_exp (pl, tmp, skill);
643 } 614 }
644 615
645 /* Check ground, too, but only objects the player could pick up */ 616 /* Check ground, too, but only objects the player could pick up */
646 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 617 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
647 if (can_pick (pl, tmp) && 618 if (can_pick (pl, tmp) &&
648 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && 619 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) &&
649 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 620 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)
650 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 621 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level)
651 { 622 {
… …
672 esrv_update_item (UPD_FLAGS, pl, tmp); 643 esrv_update_item (UPD_FLAGS, pl, tmp);
673 success += calc_skill_exp (pl, tmp, skill); 644 success += calc_skill_exp (pl, tmp, skill);
674 } 645 }
675 646
676 /* Check ground, too, but like above, only if the object can be picked up */ 647 /* Check ground, too, but like above, only if the object can be picked up */
677 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 648 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
678 if (can_pick (pl, tmp) && 649 if (can_pick (pl, tmp) &&
679 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level) 650 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level)
680 { 651 {
681 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 652 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
682 esrv_update_item (UPD_FLAGS, pl, tmp); 653 esrv_update_item (UPD_FLAGS, pl, tmp);
… …
711 if (tmp->msg) 682 if (tmp->msg)
712 { 683 {
713 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 684 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:");
714 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg); 685 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg);
715 } 686 }
716
717 /* identify will take care of updating the item if it is in the players inventory. IF on map, do it here */
718 if (tmp->map)
719 esrv_send_item (pl, tmp);
720 } 687 }
688
721 success += calc_skill_exp (pl, tmp, skill); 689 success += calc_skill_exp (pl, tmp, skill);
722 } 690 }
723 else 691 else
724 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); 692 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT);
725 } 693 }
… …
730/* do_skill_ident() - workhorse for skill_ident() -b.t. 698/* do_skill_ident() - workhorse for skill_ident() -b.t.
731 */ 699 */
732static int 700static int
733do_skill_ident (object *pl, int obj_class, object *skill) 701do_skill_ident (object *pl, int obj_class, object *skill)
734{ 702{
735 object *tmp;
736 int success = 0; 703 int success = 0;
737 704
738 for (tmp = pl->inv; tmp; tmp = tmp->below) 705 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
739 success += do_skill_ident2 (tmp, pl, obj_class, skill); 706 success += do_skill_ident2 (tmp, pl, obj_class, skill);
740 /* check the ground */ 707 /* check the ground */
741 708
742 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 709 for (object *tmp = pl->ms ().bot; tmp; tmp = tmp->above)
743 success += do_skill_ident2 (tmp, pl, obj_class, skill); 710 success += do_skill_ident2 (tmp, pl, obj_class, skill);
744 711
745 return success; 712 return success;
746} 713}
747 714
… …
755 722
756 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby..."); 723 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby...");
757 724
758 switch (skill->subtype) 725 switch (skill->subtype)
759 { 726 {
760 case SK_SMITHERY: 727 case SK_SMITHERY:
761 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill) 728 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill)
762 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill) 729 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill)
763 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill) 730 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill)
764 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill); 731 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill);
765 break; 732 break;
766 733
767 case SK_BOWYER: 734 case SK_BOWYER:
768 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill); 735 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill);
769 break; 736 break;
770 737
771 case SK_ALCHEMY: 738 case SK_ALCHEMY:
772 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill) 739 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill)
773 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill); 740 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill);
774 break; 741 break;
775 742
776 case SK_WOODSMAN: 743 case SK_WOODSMAN:
777 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill); 744 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill);
778 break; 745 break;
779 746
780 case SK_JEWELER: 747 case SK_JEWELER:
781 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill); 748 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill);
782 break; 749 break;
783 750
784 case SK_LITERACY: 751 case SK_LITERACY:
785 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill); 752 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill);
786 break; 753 break;
787 754
788 case SK_THAUMATURGY: 755 case SK_THAUMATURGY:
789 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill); 756 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill);
790 break; 757 break;
791 758
792 case SK_DET_CURSE: 759 case SK_DET_CURSE:
793 success = do_skill_detect_curse (pl, skill); 760 success = do_skill_detect_curse (pl, skill);
794 if (success) 761 if (success)
795 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!"); 762 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!");
796 break; 763 break;
797 764
798 case SK_DET_MAGIC: 765 case SK_DET_MAGIC:
799 success = do_skill_detect_magic (pl, skill); 766 success = do_skill_detect_magic (pl, skill);
800 if (success) 767 if (success)
801 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!"); 768 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!");
802 break; 769 break;
803 770
804 default: 771 default:
805 LOG (llevError, "Error: bad call to skill_ident()\n"); 772 LOG (llevError, "Error: bad call to skill_ident()\n");
806 return 0; 773 return 0;
807 break; 774 break;
808 } 775 }
776
809 if (!success) 777 if (!success)
810 {
811 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 778 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more.");
812 } 779
813 return success; 780 return success;
814} 781}
815
816 782
817/* players using this skill can 'charm' a monster -- 783/* players using this skill can 'charm' a monster --
818 * into working for them. It can only be used on 784 * into working for them. It can only be used on
819 * non-special (see below) 'neutral' creatures. 785 * non-special (see below) 'neutral' creatures.
820 * -b.t. (thomas@astro.psu.edu) 786 * -b.t. (thomas@astro.psu.edu)
821 */ 787 */
822
823int 788int
824use_oratory (object *pl, int dir, object *skill) 789use_oratory (object *pl, int dir, object *skill)
825{ 790{
826 sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir];
827 int mflags, chance;
828 object *tmp;
829 mapstruct *m;
830
831 if (pl->type != PLAYER) 791 if (pl->type != PLAYER)
832 return 0; /* only players use this skill */ 792 return 0; /* only players use this skill */
793
794 sint16 x = pl->x + freearr_x[dir],
795 y = pl->y + freearr_y[dir];
833 m = pl->map; 796 maptile *m = pl->map;
797
834 mflags = get_map_flags (m, &m, x, y, &x, &y); 798 int mflags = get_map_flags (m, &m, x, y, &x, &y);
835 if (mflags & P_OUT_OF_MAP) 799 if (mflags & P_OUT_OF_MAP)
836 return 0; 800 return 0;
837 801
838 /* Save some processing - we have the flag already anyways 802 /* Save some processing - we have the flag already anyways
839 */ 803 */
… …
841 { 805 {
842 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 806 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to.");
843 return 0; 807 return 0;
844 } 808 }
845 809
810 object *tmp;
846 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 811 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
847 { 812 {
848 /* can't persuade players - return because there is nothing else 813 /* can't persuade players - return because there is nothing else
849 * on that space to charm. Same for multi space monsters and 814 * on that space to charm. Same for multi space monsters and
850 * special monsters - we don't allow them to be charmed, and there 815 * special monsters - we don't allow them to be charmed, and there
851 * is no reason to do further processing since they should be the 816 * is no reason to do further processing since they should be the
852 * only monster on the space. 817 * only monster on the space.
853 */ 818 */
854 if (tmp->type == PLAYER) 819 if (tmp->type == PLAYER
855 return 0; 820 || tmp->more || tmp->head_ () != tmp
856 if (tmp->more || tmp->head) 821 || tmp->msg)
857 return 0;
858 if (tmp->msg)
859 return 0; 822 return 0;
860 823
861 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 824 if (QUERY_FLAG (tmp, FLAG_MONSTER))
862 break; 825 break;
863 } 826 }
… …
878 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 841 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
879 return 0; 842 return 0;
880 } 843 }
881 844
882 /* it's already allied! */ 845 /* it's already allied! */
883 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && (tmp->attack_movement == PETMOVE)) 846 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
884 { 847 {
885 if (get_owner (tmp) == pl) 848 if (tmp->owner == pl)
886 { 849 {
887 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 850 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
888 return 0; 851 return 0;
889 } 852 }
890 else if (skill->level > tmp->level) 853 else if (skill->level > tmp->level)
891 { 854 {
892 /* you steal the follower. Perhaps we should really look at the 855 /* you steal the follower. Perhaps we should really look at the
893 * level of the owner above? 856 * level of the owner above?
894 */ 857 */
895 set_owner (tmp, pl); 858 tmp->set_owner (pl);
859 tmp->skill = skill->skill;
860
896 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp)); 861 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp));
897 /* Abuse fix - don't give exp since this can otherwise 862 /* Abuse fix - don't give exp since this can otherwise
898 * be used by a couple players to gets lots of exp. 863 * be used by a couple players to gets lots of exp.
899 */ 864 */
900 return 0; 865 return 0;
… …
904 /* In this case, you can't steal it from the other player */ 869 /* In this case, you can't steal it from the other player */
905 return 0; 870 return 0;
906 } 871 }
907 } /* Creature was already a pet of someone */ 872 } /* Creature was already a pet of someone */
908 873
909 chance = skill->level * 2 + (pl->stats.Cha - 2 * tmp->stats.Int) / 2; 874 int level = skill->level + (pl->stats.Cha - tmp->stats.Int) / 2;
910 875
911 /* Ok, got a 'sucker' lets try to make them a follower */ 876 /* Ok, got a 'sucker' lets try to make them a follower */
912 if (chance > 0 && tmp->level < (random_roll (0, chance - 1, pl, PREFER_HIGH) - 1)) 877 if (level > 0 && tmp->level < (random_roll (0, level - 1, pl, PREFER_HIGH) - 1))
913 { 878 {
914 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp)); 879 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp));
915 880
881 INVOKE_OBJECT (KILL, tmp, ARG_OBJECT (pl));
916 set_owner (tmp, pl); 882 tmp->set_owner (pl);
883 tmp->skill = skill->skill;
917 tmp->stats.exp = 0; 884 tmp->stats.exp = 0;
918 add_friendly_object (tmp);
919 SET_FLAG (tmp, FLAG_FRIENDLY);
920 tmp->attack_movement = PETMOVE; 885 tmp->attack_movement = PETMOVE;
886
887 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
888 add_friendly_object (tmp);
889
921 return calc_skill_exp (pl, tmp, skill); 890 return calc_skill_exp (pl, tmp, skill);
922 } 891 }
923 /* Charm failed. Creature may be angry now */ 892 /* Charm failed. Creature may be angry now */
924 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW)) 893 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
925 { 894 {
926 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 895 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
927 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 896 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
928 { 897 {
929 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
930 remove_friendly_object (tmp); 898 remove_friendly_object (tmp);
931 tmp->attack_movement = 0; /* needed? */ 899 tmp->attack_movement = 0; /* needed? */
932 } 900 }
901
933 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 902 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
934 } 903 }
904
935 return 0; /* Fall through - if we get here, we didn't charm anything */ 905 return 0; /* Fall through - if we get here, we didn't charm anything */
936} 906}
937 907
938/* Singing() -this skill allows the player to pacify nearby creatures. 908/* Singing() -this skill allows the player to pacify nearby creatures.
939 * There are few limitations on who/what kind of 909 * There are few limitations on who/what kind of
… …
942 * successfully pacified the creature gets Int=1. Thus, a player 912 * successfully pacified the creature gets Int=1. Thus, a player
943 * may only pacify a creature once. 913 * may only pacify a creature once.
944 * BTW, I appologize for the naming of the skill, I couldnt think 914 * BTW, I appologize for the naming of the skill, I couldnt think
945 * of anything better! -b.t. 915 * of anything better! -b.t.
946 */ 916 */
947
948int 917int
949singing (object *pl, int dir, object *skill) 918singing (object *pl, int dir, object *skill)
950{ 919{
951 int i, exp = 0, chance, mflags; 920 int i, exp = 0;
952 object *tmp; 921 object *tmp;
953 mapstruct *m; 922 maptile *m;
954 sint16 x, y; 923 sint16 x, y;
955 924
956 if (pl->type != PLAYER) 925 if (pl->type != PLAYER)
957 return 0; /* only players use this skill */ 926 return 0; /* only players use this skill */
958 927
… …
961 { 930 {
962 x = pl->x + freearr_x[i]; 931 x = pl->x + freearr_x[i];
963 y = pl->y + freearr_y[i]; 932 y = pl->y + freearr_y[i];
964 m = pl->map; 933 m = pl->map;
965 934
966 mflags = get_map_flags (m, &m, x, y, &x, &y); 935 int mflags = get_map_flags (m, &m, x, y, &x, &y);
967 if (mflags & P_OUT_OF_MAP) 936 if (mflags & P_OUT_OF_MAP)
968 continue; 937 continue;
969 if (!(mflags & P_IS_ALIVE)) 938 if (!(mflags & P_IS_ALIVE))
970 continue; 939 continue;
971 940
972 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 941 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
973 { 942 {
974 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 943 if (QUERY_FLAG (tmp, FLAG_MONSTER))
975 break; 944 break;
976 /* can't affect players */ 945 /* can't affect players */
977 if (tmp->type == PLAYER) 946 if (tmp->type == PLAYER)
… …
990 959
991 /* stealing isn't really related (although, maybe it should 960 /* stealing isn't really related (although, maybe it should
992 * be). This is mainly to prevent singing to the same monster 961 * be). This is mainly to prevent singing to the same monster
993 * over and over again and getting exp for it. 962 * over and over again and getting exp for it.
994 */ 963 */
995 chance = skill->level * 2 + (pl->stats.Cha - 5 - tmp->stats.Int) / 2; 964 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2;
965
996 if (chance && tmp->level * 2 < random_roll (0, chance - 1, pl, PREFER_HIGH)) 966 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH))
997 { 967 {
998 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 968 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
999 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp)); 969 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp));
1000 /* Give exp only if they are not aware */ 970 /* Give exp only if they are not aware */
971
1001 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL)) 972 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL))
1002 exp += calc_skill_exp (pl, tmp, skill); 973 exp += calc_skill_exp (pl, tmp, skill);
974
1003 SET_FLAG (tmp, FLAG_NO_STEAL); 975 SET_FLAG (tmp, FLAG_NO_STEAL);
1004 } 976 }
1005 else 977 else
1006 { 978 {
1007 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 979 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
… …
1020find_traps (object *pl, object *skill) 992find_traps (object *pl, object *skill)
1021{ 993{
1022 object *tmp, *tmp2; 994 object *tmp, *tmp2;
1023 int i, expsum = 0, mflags; 995 int i, expsum = 0, mflags;
1024 sint16 x, y; 996 sint16 x, y;
1025 mapstruct *m; 997 maptile *m;
1026 998
1027 /* First we search all around us for runes and traps, which are 999 /* First we search all around us for runes and traps, which are
1028 * all type RUNE 1000 * all type RUNE
1029 */ 1001 */
1030 1002
… …
1037 mflags = get_map_flags (m, &m, x, y, &x, &y); 1009 mflags = get_map_flags (m, &m, x, y, &x, &y);
1038 if (mflags & P_OUT_OF_MAP) 1010 if (mflags & P_OUT_OF_MAP)
1039 continue; 1011 continue;
1040 1012
1041 /* Check everything in the square for trapness */ 1013 /* Check everything in the square for trapness */
1042 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1014 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1043 { 1015 {
1044 1016
1045 /* And now we'd better do an inventory traversal of each 1017 /* And now we'd better do an inventory traversal of each
1046 * of these objects' inventory 1018 * of these objects' inventory
1047 * We can narrow this down a bit - no reason to search through 1019 * We can narrow this down a bit - no reason to search through
… …
1086int 1058int
1087remove_trap (object *op, int dir, object *skill) 1059remove_trap (object *op, int dir, object *skill)
1088{ 1060{
1089 object *tmp, *tmp2; 1061 object *tmp, *tmp2;
1090 int i, success = 0, mflags; 1062 int i, success = 0, mflags;
1091 mapstruct *m; 1063 maptile *m;
1092 sint16 x, y; 1064 sint16 x, y;
1093 1065
1094 for (i = 0; i < 9; i++) 1066 for (i = 0; i < 9; i++)
1095 { 1067 {
1096 x = op->x + freearr_x[i]; 1068 x = op->x + freearr_x[i];
… …
1100 mflags = get_map_flags (m, &m, x, y, &x, &y); 1072 mflags = get_map_flags (m, &m, x, y, &x, &y);
1101 if (mflags & P_OUT_OF_MAP) 1073 if (mflags & P_OUT_OF_MAP)
1102 continue; 1074 continue;
1103 1075
1104 /* Check everything in the square for trapness */ 1076 /* Check everything in the square for trapness */
1105 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1077 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1106 { 1078 {
1107 /* And now we'd better do an inventory traversal of each 1079 /* And now we'd better do an inventory traversal of each
1108 * of these objects inventory. Like above, only 1080 * of these objects inventory. Like above, only
1109 * do this for interesting objects. 1081 * do this for interesting objects.
1110 */ 1082 */
… …
1131 success += calc_skill_exp (op, tmp, skill); 1103 success += calc_skill_exp (op, tmp, skill);
1132 } 1104 }
1133 } 1105 }
1134 } 1106 }
1135 } 1107 }
1108
1136 return success; 1109 return success;
1137} 1110}
1138
1139 1111
1140/* pray() - when this skill is called from do_skill(), it allows 1112/* pray() - when this skill is called from do_skill(), it allows
1141 * the player to regain lost grace points at a faster rate. -b.t. 1113 * the player to regain lost grace points at a faster rate. -b.t.
1142 * This always returns 0 - return value is used by calling function 1114 * This always returns 0 - return value is used by calling function
1143 * such that if it returns true, player gets exp in that skill. This 1115 * such that if it returns true, player gets exp in that skill. This
1144 * the effect here can be done on demand, we probably don't want to 1116 * the effect here can be done on demand, we probably don't want to
1145 * give infinite exp by returning true in any cases. 1117 * give infinite exp by returning true in any cases.
1146 */ 1118 */
1147
1148int 1119int
1149pray (object *pl, object *skill) 1120pray (object *pl, object *skill)
1150{ 1121{
1151 char buf[MAX_BUF]; 1122 char buf[MAX_BUF];
1152 object *tmp; 1123 object *tmp;
… …
1177 if (pl->stats.grace < pl->stats.maxgrace) 1148 if (pl->stats.grace < pl->stats.maxgrace)
1178 { 1149 {
1179 pl->stats.grace++; 1150 pl->stats.grace++;
1180 pl->last_grace = -1; 1151 pl->last_grace = -1;
1181 } 1152 }
1153
1182 return 0; 1154 return 0;
1183} 1155}
1184 1156
1185/* This skill allows the player to regain a few sp or hp for a 1157/* This skill allows the player to regain a few sp or hp for a
1186 * brief period of concentration. No armour or weapons may be 1158 * brief period of concentration. No armour or weapons may be
1187 * wielded/applied for this to work. The amount of time needed 1159 * wielded/applied for this to work. The amount of time needed
1188 * to concentrate and the # of points regained is dependant on 1160 * to concentrate and the # of points regained is dependant on
1189 * the level of the user. - b.t. thomas@astro.psu.edu 1161 * the level of the user. - b.t. thomas@astro.psu.edu
1190 */ 1162 */
1191
1192void 1163void
1193meditate (object *pl, object *skill) 1164meditate (object *pl, object *skill)
1194{ 1165{
1195 object *tmp; 1166 object *tmp;
1196 1167
… …
1204 return; 1175 return;
1205 } 1176 }
1206 else 1177 else
1207 { 1178 {
1208 for (tmp = pl->inv; tmp; tmp = tmp->below) 1179 for (tmp = pl->inv; tmp; tmp = tmp->below)
1209 if (((tmp->type == ARMOUR && skill->level < 12) 1180 if (((tmp->type == ARMOUR && skill->level < 12)
1210 || (tmp->type == HELMET && skill->level < 10) 1181 || (tmp->type == HELMET && skill->level < 10)
1211 || (tmp->type == SHIELD && skill->level < 6) 1182 || (tmp->type == SHIELD && skill->level < 6)
1212 || (tmp->type == BOOTS && skill->level < 4) || (tmp->type == GLOVES && skill->level < 2)) && QUERY_FLAG (tmp, FLAG_APPLIED)) 1183 || (tmp->type == BOOTS && skill->level < 4)
1184 || (tmp->type == GLOVES && skill->level < 2))
1185 && QUERY_FLAG (tmp, FLAG_APPLIED))
1213 { 1186 {
1214 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n"); 1187 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n");
1215 return; 1188 return;
1216 } 1189 }
1217 } 1190 }
… …
1237 pl->last_heal = -1; 1210 pl->last_heal = -1;
1238 } 1211 }
1239} 1212}
1240 1213
1241/* write_note() - this routine allows players to inscribe messages in 1214/* write_note() - this routine allows players to inscribe messages in
1242 * ordinary 'books' (anything that is type BOOK). b.t. 1215 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1243 */ 1216 */
1244
1245static int 1217static int
1246write_note (object *pl, object *item, const char *msg, object *skill) 1218write_note (object *pl, object *item, const char *msg, object *skill)
1247{ 1219{
1220 if (strstr (msg, "\nendmsg"))
1221 {
1222 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1223 return 0;
1224 }
1225
1226 int len = strlen (msg);
1227
1228 if (!is_utf8_string ((U8 *)msg, len))
1229 {
1230 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!");
1231 return 0;
1232 }
1233
1234 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1235 return RESULT_INT (0);
1236
1248 char buf[1024]; 1237 char buf[1024];
1249 object *newBook = NULL;
1250 1238
1251 /* a pair of sanity checks */ 1239 if (len < sizeof (buf) - 2)
1252 if (!item || item->type != BOOK)
1253 return 0;
1254
1255 if (!msg)
1256 {
1257 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!");
1258 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill);
1259 return 0;
1260 } 1240 {
1261 if (strcasestr_local (msg, "endmsg")) 1241 snprintf (buf, sizeof (buf), "%s\n", msg);
1262 {
1263 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1264 return 0;
1265 }
1266 1242
1267 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1243 object *newbook = arch_to_object (item->other_arch);
1268 return strlen (msg); 1244 item->decrease ();
1269
1270 buf[0] = 0;
1271 if (!book_overflow (item->msg, msg, sizeof (buf)))
1272 { /* add msg string to book */
1273 if (item->msg)
1274 strcpy (buf, item->msg);
1275
1276 strcat (buf, msg);
1277 strcat (buf, "\n"); /* new msg needs a LF */
1278 if (item->nrof > 1)
1279 {
1280 newBook = get_object ();
1281 copy_object (item, newBook);
1282 decrease_ob (item);
1283 esrv_send_item (pl, item);
1284 newBook->nrof = 1; 1245 newbook->nrof = 1;
1285 newBook->msg = buf; 1246 newbook->msg = buf;
1286 newBook = insert_ob_in_ob (newBook, pl); 1247 newbook->flag [FLAG_IDENTIFIED] = true;
1287 esrv_send_item (pl, newBook); 1248
1249 if (item->subtype == 1) // mailscrolls
1288 } 1250 {
1289 else 1251 newbook->name = item->name;
1252 newbook->name_pl = item->name_pl;
1290 { 1253 }
1291 item->msg = buf; 1254
1292 /* This shouldn't be necessary - the object hasn't changed in any 1255 pl->insert (newbook);
1293 * visible way 1256
1294 */ 1257 pl->contr->play_sound (sound_find ("inscribe_success"));
1295 /* esrv_send_item(pl, item); */
1296 }
1297 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item)); 1258 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1298 return strlen (msg); 1259 return strlen (msg);
1299 } 1260 }
1300 else 1261 else
1301 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1262 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", &item->name);
1302 1263
1303 return 0; 1264 return 0;
1304} 1265}
1305 1266
1306/* write_scroll() - this routine allows players to inscribe spell scrolls 1267/* write_scroll() - this routine allows players to inscribe spell scrolls
1307 * of spells which they know. Backfire effects are possible with the 1268 * of spells which they know. Backfire effects are possible with the
1308 * severity of the backlash correlated with the difficulty of the scroll 1269 * severity of the backlash correlated with the difficulty of the scroll
1309 * that is attempted. -b.t. thomas@astro.psu.edu 1270 * that is attempted. -b.t. thomas@astro.psu.edu
1310 */ 1271 */
1311
1312static int 1272static int
1313write_scroll (object *pl, object *scroll, object *skill) 1273write_scroll (object *pl, object *scroll, object *skill)
1314{ 1274{
1315 int success = 0, confused = 0; 1275 int success = 0, confused = 0;
1316 object *newscroll, *chosen_spell, *tmp;
1317
1318 /* this is a sanity check */
1319 if (scroll->type != SCROLL)
1320 {
1321 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!");
1322 return 0;
1323 }
1324 1276
1325 /* Check if we are ready to attempt inscription */ 1277 /* Check if we are ready to attempt inscription */
1326 chosen_spell = pl->contr->ranges[range_magic]; 1278 object *chosen_spell = pl->contr->ranged_ob;
1327 if (!chosen_spell) 1279
1280 if (!chosen_spell || chosen_spell->type != SPELL)
1328 { 1281 {
1329 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1282 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1330 return 0; 1283 return 0;
1331 } 1284 }
1285
1332 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace) 1286 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace)
1333 { 1287 {
1334 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name); 1288 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name);
1335 return 0; 1289 return 0;
1336 } 1290 }
1291
1337 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1292 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1338 { 1293 {
1339 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1294 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1340 return 0;
1341 }
1342
1343 /* if there is a spell already on the scroll then player could easily
1344 * accidently read it while trying to write the new one. give player
1345 * a 50% chance to overwrite spell at their own level
1346 */
1347 if ((scroll->stats.sp || scroll->inv) && random_roll (0, scroll->level * 2, pl, PREFER_LOW) > skill->level)
1348 {
1349 new_draw_info_format (NDI_UNIQUE, 0, pl, "Oops! You accidently read it while trying to write on it.");
1350 manual_apply (pl, scroll, 0);
1351 return 0; 1295 return 0;
1352 } 1296 }
1353 1297
1354 /* ok, we are ready to try inscription */ 1298 /* ok, we are ready to try inscription */
1355 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1299 if (QUERY_FLAG (pl, FLAG_CONFUSED))
… …
1359 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1303 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1360 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1304 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1361 1305
1362 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1306 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1363 { 1307 {
1364 if (scroll->nrof > 1) 1308 object *newscroll = arch_to_object (scroll->other_arch);
1365 { 1309 scroll->decrease ();
1366 newscroll = get_object ();
1367 copy_object (scroll, newscroll);
1368 decrease_ob (scroll);
1369 newscroll->nrof = 1; 1310 newscroll->nrof = 1;
1370 } 1311
1371 else 1312 pl->contr->play_sound (sound_find ("inscribe_success"));
1372 {
1373 newscroll = scroll;
1374 }
1375 1313
1376 if (!confused) 1314 if (!confused)
1377 { 1315 {
1378 newscroll->level = MAX (skill->level, chosen_spell->level); 1316 newscroll->level = MAX (skill->level, chosen_spell->level);
1317 newscroll->flag [FLAG_IDENTIFIED] = true;
1379 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1318 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1380 } 1319 }
1381 else 1320 else
1382 { 1321 {
1383 chosen_spell = find_random_spell_in_ob (pl, NULL); 1322 chosen_spell = find_random_spell_in_ob (pl, NULL);
1384 if (!chosen_spell) 1323 if (!chosen_spell)
… …
1386 1325
1387 newscroll->level = MAX (skill->level, chosen_spell->level); 1326 newscroll->level = MAX (skill->level, chosen_spell->level);
1388 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1327 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1389 } 1328 }
1390 1329
1391 if (newscroll->inv) 1330 object *tmp = chosen_spell->clone ();
1392 {
1393 object *ninv;
1394
1395 ninv = newscroll->inv;
1396 remove_ob (ninv);
1397 free_object (ninv);
1398 }
1399 tmp = get_object ();
1400 copy_object (chosen_spell, tmp);
1401 insert_ob_in_ob (tmp, newscroll); 1331 insert_ob_in_ob (tmp, newscroll);
1402 1332
1403 /* Same code as from treasure.c - so they can better merge. 1333 /* Same code as from treasure.C - so they can better merge.
1404 * if players want to sell them, so be it. 1334 * if players want to sell them, so be it.
1405 */ 1335 */
1406 newscroll->value = newscroll->arch->clone.value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50); 1336 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50);
1407 newscroll->stats.exp = newscroll->value / 5; 1337 newscroll->stats.exp = newscroll->value / 5;
1408 1338
1409 /* wait until finished manipulating the scroll before inserting it */ 1339 pl->insert (newscroll);
1410 if (newscroll == scroll) 1340
1411 {
1412 /* Remove to correctly merge with other items which may exist in inventory */
1413 remove_ob (newscroll);
1414 esrv_del_item (pl->contr, newscroll->count);
1415 }
1416 newscroll = insert_ob_in_ob (newscroll, pl);
1417 esrv_send_item (pl, newscroll);
1418 success = calc_skill_exp (pl, newscroll, skill); 1341 success = calc_skill_exp (pl, newscroll, skill);
1419 if (!confused) 1342 if (!confused)
1420 success *= 2; 1343 success *= 2;
1344
1421 success = success * skill->level; 1345 success = success * skill->level;
1422 return success; 1346 return success;
1423
1424 } 1347 }
1425 else 1348 else
1426 { /* Inscription has failed */ 1349 { /* Inscription has failed */
1350 pl->contr->play_sound (sound_find ("inscribe_fail"));
1427 1351
1428 if (chosen_spell->level > skill->level || confused) 1352 if (chosen_spell->level > skill->level || confused)
1429 { /*backfire! */ 1353 { /*backfire! */
1430 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1354 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");
1355
1431 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1356 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1432 drain_specific_stat (pl, 4); 1357 pl->drain_specific_stat (4);
1433 else 1358 else
1434 { 1359 {
1435 confuse_player (pl, pl, 99); 1360 confuse_player (pl, pl, 99);
1436 return (-30 * chosen_spell->level); 1361 return -30 * chosen_spell->level;
1437 } 1362 }
1438 } 1363 }
1439 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15) 1364 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15)
1440 { 1365 {
1441 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind!"); 1366 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind! H<Frankly spoken, you were too dumb and unlucky.>");
1442 confuse_player (pl, pl, 99); 1367 confuse_player (pl, pl, 99);
1443 } 1368 }
1444 else 1369 else
1445 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1370 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll. H<Try a lower-level spell, if possible at all.>");
1446 } 1371 }
1372
1447 return 0; 1373 return 0;
1448} 1374}
1449 1375
1450/* write_on_item() - wrapper for write_note and write_scroll */ 1376/* write_on_item() - wrapper for write_note and write_scroll */
1451int 1377int
1452write_on_item (object *pl, const char *params, object *skill) 1378write_on_item (object *pl, const char *params, object *skill)
1453{ 1379{
1454 object *item;
1455 const char *string = params;
1456 int msgtype;
1457 archetype *skat; 1380 archetype *skat;
1458 1381
1459 if (pl->type != PLAYER) 1382 if (pl->type != PLAYER)
1460 return 0; 1383 return 0;
1461 1384
1462 if (!params) 1385 if (!params)
1463 {
1464 params = ""; 1386 params = "";
1465 string = params; 1387
1466 }
1467 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1388 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1468 1389
1469 /* Need to be able to read before we can write! */ 1390 /* Need to be able to read before we can write! */
1470 if (!find_skill_by_name (pl, skat->clone.skill)) 1391 if (!find_skill_by_name (pl, skat->skill))
1471 { 1392 {
1472 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write!"); 1393 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
1473 return 0; 1394 return 0;
1474 } 1395 }
1475 1396
1476 /* if there is a message then it goes in a book and no message means 1397 object *item = find_marked_object (pl);
1477 * write active spell into the scroll
1478 */
1479 msgtype = (string[0] != '\0') ? BOOK : SCROLL;
1480 1398
1481 /* find an item of correct type to write on */ 1399 /* find an item of correct type to write on */
1482 if (!(item = find_marked_object (pl))) 1400 if (!item)
1401 {
1402 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to make an item.>");
1403 return 0;
1483 { 1404 }
1484 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on."); 1405
1406 if (item->type != INSCRIBABLE)
1407 {
1408 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1485 return 0; 1409 return 0;
1486 } 1410 }
1487 1411
1488 if (QUERY_FLAG (item, FLAG_UNPAID)) 1412 if (QUERY_FLAG (item, FLAG_UNPAID))
1489 { 1413 {
1490 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1414 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1491 return 0; 1415 return 0;
1492 } 1416 }
1493 if (msgtype != item->type) 1417
1418 if (item->other_arch->type == SCROLL)
1494 { 1419 {
1495 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1420 if (*params)
1421 {
1422 // check readied scroll
1423 new_draw_info_format (NDI_UNIQUE, 0, pl,
1424 "When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1425 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1496 return 0; 1426 return 0;
1497 } 1427 }
1498 1428
1499 if (msgtype == SCROLL)
1500 {
1501 return write_scroll (pl, item, skill); 1429 return write_scroll (pl, item, skill);
1502 } 1430 }
1503 else if (msgtype == BOOK) 1431 else
1504 { 1432 {
1433 if (!*params)
1434 {
1435 new_draw_info_format (NDI_UNIQUE, 0, pl,
1436 "When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1437 "Usage: use_skill %s <message>", &skill->skill);
1438 return 0;
1439 }
1440
1505 return write_note (pl, item, string, skill); 1441 return write_note (pl, item, params, skill);
1506 } 1442 }
1443
1507 return 0; 1444 return 0;
1508} 1445}
1509
1510
1511 1446
1512/* find_throw_ob() - if we request an object, then 1447/* find_throw_ob() - if we request an object, then
1513 * we search for it in the inventory of the owner (you've 1448 * we search for it in the inventory of the owner (you've
1514 * got to be carrying something in order to throw it!). 1449 * got to be carrying something in order to throw it!).
1515 * If we didnt request an object, then the top object in inventory 1450 * If we didnt request an object, then the top object in inventory
1516 * (that is "throwable", ie no throwing your skills away!) 1451 * (that is "throwable", ie no throwing your skills away!)
1517 * is the object of choice. Also check to see if object is 1452 * is the object of choice. Also check to see if object is
1518 * 'throwable' (ie not applied cursed obj, worn, etc). 1453 * 'throwable' (ie not applied cursed obj, worn, etc).
1519 */ 1454 */
1520
1521static object * 1455static object *
1522find_throw_ob (object *op, const char *request) 1456find_throw_ob (object *op, const char *request)
1523{ 1457{
1524 object *tmp; 1458 object *tmp;
1525 1459
… …
1546 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1547 { 1481 {
1548 /* can't toss invisible or inv-locked items */ 1482 /* can't toss invisible or inv-locked items */
1549 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1483 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED))
1550 continue; 1484 continue;
1551 if (!request || !strcmp (query_name (tmp), request) || !strcmp (tmp->name, request)) 1485 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1552 break; 1486 break;
1553 } 1487 }
1554 } 1488 }
1555 1489
1556 /* this should prevent us from throwing away 1490 /* this should prevent us from throwing away
… …
1595 return tmp; 1529 return tmp;
1596} 1530}
1597 1531
1598/* make_throw_ob() We construct the 'carrier' object in 1532/* make_throw_ob() We construct the 'carrier' object in
1599 * which we will insert the object that is being thrown. 1533 * which we will insert the object that is being thrown.
1600 * This combination becomes the 'thrown object'. -b.t. 1534 * This combination becomes the 'thrown object'. -b.t.
1601 */ 1535 */
1602
1603static object * 1536static object *
1604make_throw_ob (object *orig) 1537make_throw_ob (object *orig)
1605{ 1538{
1606 object *toss_item;
1607
1608 if (!orig) 1539 if (!orig)
1609 return NULL; 1540 return 0;
1610 1541
1611 toss_item = get_object ();
1612 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1542 if (QUERY_FLAG (orig, FLAG_APPLIED))
1613 { 1543 {
1614 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1544 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1615 /* insufficient workaround, but better than nothing */ 1545 /* insufficient workaround, but better than nothing */
1616 CLEAR_FLAG (orig, FLAG_APPLIED); 1546 CLEAR_FLAG (orig, FLAG_APPLIED);
1617 } 1547 }
1618 copy_object (orig, toss_item); 1548
1549 object *toss_item = orig->clone ();
1550
1619 toss_item->type = THROWN_OBJ; 1551 toss_item->type = THROWN_OBJ;
1620 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1552 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1621 toss_item->stats.dam = 0; /* default damage */ 1553 toss_item->stats.dam = 0; /* default damage */
1622 insert_ob_in_ob (orig, toss_item); 1554 toss_item->insert (orig);
1555
1623 return toss_item; 1556 return toss_item;
1624} 1557}
1625
1626 1558
1627/* do_throw() - op throws any object toss_item. This code 1559/* do_throw() - op throws any object toss_item. This code
1628 * was borrowed from fire_bow. 1560 * was borrowed from fire_bow.
1629 * Returns 1 if skill was successfully used, 0 if not 1561 * Returns 1 if skill was successfully used, 0 if not
1630 */ 1562 */
1631
1632static int 1563static int
1633do_throw (object *op, object *part, object *toss_item, int dir, object *skill) 1564do_throw (object *op, object *part, object *toss_item, int dir, object *skill)
1634{ 1565{
1635 object *throw_ob = toss_item, *left = NULL; 1566 object *throw_ob = toss_item, *left = NULL;
1636 tag_t left_tag;
1637 int eff_str = 0, maxc, str = op->stats.Str, dam = 0; 1567 int eff_str = 0, maxc, str = op->stats.Str, dam = 0;
1638 int pause_f, weight_f = 0, mflags; 1568 int pause_f, weight_f = 0, mflags;
1639 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0; 1569 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0;
1640 mapstruct *m; 1570 maptile *m;
1641 sint16 sx, sy; 1571 sint16 sx, sy;
1642 tag_t tag;
1643 1572
1644 if (throw_ob == NULL) 1573 if (throw_ob == NULL)
1645 { 1574 {
1646 if (op->type == PLAYER) 1575 if (op->type == PLAYER)
1647 {
1648 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw."); 1576 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw.");
1649 } 1577
1650 return 0; 1578 return 0;
1651 } 1579 }
1652 if (QUERY_FLAG (throw_ob, FLAG_STARTEQUIP)) 1580 if (QUERY_FLAG (throw_ob, FLAG_STARTEQUIP))
1653 { 1581 {
1654 if (op->type == PLAYER) 1582 if (op->type == PLAYER)
1655 {
1656 new_draw_info (NDI_UNIQUE, 0, op, "The gods won't let you throw that."); 1583 new_draw_info (NDI_UNIQUE, 0, op, "The gods won't let you throw that.");
1657 } 1584
1658 return 0; 1585 return 0;
1659 } 1586 }
1660 1587
1661 /* Because throwing effectiveness must be reduced by the 1588 /* Because throwing effectiveness must be reduced by the
1662 * encumbrance of the thrower and weight of the object. THus, 1589 * encumbrance of the thrower and weight of the object. THus,
… …
1705 */ 1632 */
1706 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy); 1633 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy);
1707 1634
1708 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW)) 1635 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW))
1709 { 1636 {
1710
1711 /* bounces off 'wall', and drops to feet */ 1637 /* bounces off 'wall', and drops to feet */
1712 remove_ob (throw_ob); 1638 throw_ob->insert_at (part, op);
1713 throw_ob->x = part->x; 1639
1714 throw_ob->y = part->y;
1715 insert_ob_in_map (throw_ob, part->map, op, 0);
1716 if (op->type == PLAYER) 1640 if (op->type == PLAYER)
1717 { 1641 {
1718 if (eff_str <= 1) 1642 if (eff_str <= 1)
1719 {
1720 new_draw_info_format (NDI_UNIQUE, 0, op, "Your load is so heavy you drop %s to the ground.", query_name (throw_ob)); 1643 new_draw_info_format (NDI_UNIQUE, 0, op, "Your load is so heavy you drop %s to the ground.", query_name (throw_ob));
1721 }
1722 else if (!dir) 1644 else if (!dir)
1723 {
1724 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob)); 1645 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob));
1725 }
1726 else 1646 else
1727 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1647 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1728 } 1648 }
1649
1729 return 0; 1650 return 0;
1730 } /* if object can't be thrown */ 1651 } /* if object can't be thrown */
1731 1652
1732 left = throw_ob; /* these are throwing objects left to the player */ 1653 left = throw_ob; /* these are throwing objects left to the player */
1733 left_tag = left->count;
1734 1654
1735 /* sometimes get_split_ob can't split an object (because op->nrof==0?) 1655 /* sometimes get_split_ob can't split an object (because op->nrof==0?)
1736 * and returns NULL. We must use 'left' then 1656 * and returns NULL. We must use 'left' then
1737 */ 1657 */
1738 1658 if (!(throw_ob = throw_ob->split ()))
1739 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1740 { 1659 {
1741 throw_ob = left; 1660 throw_ob = left;
1742 remove_ob (left); 1661 left->remove ();
1743 if (op->type == PLAYER)
1744 esrv_del_item (op->contr, left->count);
1745 }
1746 else if (op->type == PLAYER)
1747 {
1748 if (was_destroyed (left, left_tag))
1749 esrv_del_item (op->contr, left_tag);
1750 else
1751 esrv_update_item (UPD_NROF, op, left);
1752 } 1662 }
1753 1663
1754 /* special case: throwing powdery substances like dust, dirt */ 1664 /* special case: throwing powdery substances like dust, dirt */
1755 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST) 1665 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST)
1756 { 1666 {
… …
1771 { 1681 {
1772 insert_ob_in_ob (throw_ob, op); 1682 insert_ob_in_ob (throw_ob, op);
1773 return 0; 1683 return 0;
1774 } 1684 }
1775 1685
1776 set_owner (throw_ob, op); 1686 throw_ob->set_owner (op);
1777 /* At some point in the attack code, the actual real object (op->inv) 1687 /* At some point in the attack code, the actual real object (op->inv)
1778 * becomes the hitter. As such, we need to make sure that has a proper 1688 * becomes the hitter. As such, we need to make sure that has a proper
1779 * owner value so exp goes to the right place. 1689 * owner value so exp goes to the right place.
1780 */ 1690 */
1781 set_owner (throw_ob->inv, op); 1691 throw_ob->inv->set_owner (op);
1782 throw_ob->direction = dir; 1692 throw_ob->direction = dir;
1783 throw_ob->x = part->x;
1784 throw_ob->y = part->y;
1785 1693
1786 /* the damage bonus from the force of the throw */ 1694 /* the damage bonus from the force of the throw */
1787 dam = (int) (str_factor * dam_bonus[eff_str]); 1695 dam = int (str_factor * dam_bonus[eff_str]);
1788 1696
1789 /* Now, lets adjust the properties of the thrown_ob. */ 1697 /* Now, lets adjust the properties of the thrown_ob. */
1790 1698
1791 /* how far to fly */ 1699 /* how far to fly */
1792 throw_ob->last_sp = (eff_str * 3) / 5; 1700 throw_ob->last_sp = (eff_str * 3) / 5;
1793 1701
1794 /* speed */ 1702 /* speed */
1795 throw_ob->speed = (speed_bonus[eff_str] + 1.0) / 1.5; 1703 throw_ob->set_speed (min (1.0, speed_bonus[eff_str] + 1.0) / 1.5); /* no faster than an arrow! */
1796 throw_ob->speed = MIN (1.0, throw_ob->speed); /* no faster than an arrow! */
1797 1704
1798 /* item damage. Eff_str and item weight influence damage done */ 1705 /* item damage. Eff_str and item weight influence damage done */
1799 weight_f = (throw_ob->weight / 2000) > MAX_STAT ? MAX_STAT : (throw_ob->weight / 2000); 1706 weight_f = (throw_ob->weight / 2000) > MAX_STAT ? MAX_STAT : (throw_ob->weight / 2000);
1800 throw_ob->stats.dam += (dam / 3) + dam_bonus[weight_f] + (throw_ob->weight / 15000) - 2; 1707 throw_ob->stats.dam += (dam / 3) + dam_bonus[weight_f] + (throw_ob->weight / 15000) - 2;
1801 1708
1802 /* chance of breaking. Proportional to force used and weight of item */ 1709 /* chance of breaking. Proportional to force used and weight of item */
1803 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000); 1710 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000);
1804 1711
1805 /* replace 25 with a call to clone.arch wc? messes up w/ NPC */ 1712 /* replace 25 with a call to clone.arch wc? messes up w/ NPC */
1806 throw_ob->stats.wc = 25 - dex_bonus[op->stats.Dex] - thaco_bonus[eff_str] - skill->level; 1713 throw_ob->stats.wc = 25 - dex_bonus[op->stats.Dex] - thaco_bonus[eff_str] - skill->level;
1807
1808 1714
1809 /* the properties of objects which are meant to be thrown (ie dart, 1715 /* the properties of objects which are meant to be thrown (ie dart,
1810 * throwing knife, etc) will differ from ordinary items. Lets tailor 1716 * throwing knife, etc) will differ from ordinary items. Lets tailor
1811 * this stuff in here. 1717 * this stuff in here.
1812 */ 1718 */
… …
1815 { 1721 {
1816 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1722 throw_ob->last_sp += eff_str / 3; /* fly a little further */
1817 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2; 1723 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
1818 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc; 1724 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1819 /* only throw objects get directional faces */ 1725 /* only throw objects get directional faces */
1820 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1726 if (throw_ob->has_anim () && throw_ob->anim_frames ())
1821 SET_ANIMATION (throw_ob, dir); 1727 throw_ob->set_anim_frame (dir);
1822 } 1728 }
1823 else 1729 else
1824 { 1730 {
1731 uint16 mat = throw_ob->materials;
1732
1825 /* some materials will adjust properties.. */ 1733 /* some materials will adjust properties.. */
1826 if (throw_ob->material & M_LEATHER) 1734 if (mat & M_LEATHER)
1827 { 1735 {
1828 throw_ob->stats.dam -= 1; 1736 throw_ob->stats.dam -= 1;
1829 throw_ob->stats.food -= 10; 1737 throw_ob->stats.food -= 10;
1830 } 1738 }
1739
1831 if (throw_ob->material & M_GLASS) 1740 if (mat & M_GLASS)
1832 throw_ob->stats.food += 60; 1741 throw_ob->stats.food += 60;
1833 1742
1834 if (throw_ob->material & M_ORGANIC) 1743 if (mat & M_ORGANIC)
1835 { 1744 {
1836 throw_ob->stats.dam -= 3; 1745 throw_ob->stats.dam -= 3;
1837 throw_ob->stats.food += 55; 1746 throw_ob->stats.food += 55;
1838 } 1747 }
1839 if (throw_ob->material & M_PAPER || throw_ob->material & M_CLOTH) 1748
1749 if (mat & M_PAPER || mat & M_CLOTH)
1840 { 1750 {
1841 throw_ob->stats.dam -= 5; 1751 throw_ob->stats.dam -= 5;
1842 throw_ob->speed *= 0.8; 1752 throw_ob->speed *= 0.8;
1843 throw_ob->stats.wc += 3; 1753 throw_ob->stats.wc += 3;
1844 throw_ob->stats.food -= 30; 1754 throw_ob->stats.food -= 30;
1845 } 1755 }
1756
1846 /* light obj have more wind resistance, fly slower */ 1757 /* light obj have more wind resistance, fly slower */
1847 if (throw_ob->weight > 500) 1758 if (throw_ob->weight > 500)
1848 throw_ob->speed *= 0.8; 1759 throw_ob->speed *= 0.8;
1760
1849 if (throw_ob->weight > 50) 1761 if (throw_ob->weight > 50)
1850 throw_ob->speed *= 0.5; 1762 throw_ob->speed *= 0.5;
1851
1852 } /* else tailor thrown object */ 1763 } /* else tailor thrown object */
1853 1764
1854 /* some limits, and safeties (needed?) */ 1765 /* some limits, and safeties (needed?) */
1855 if (throw_ob->stats.dam < 0) 1766 if (throw_ob->stats.dam < 0)
1856 throw_ob->stats.dam = 0; 1767 throw_ob->stats.dam = 0;
… …
1876 * In short summary, a throw can take anywhere between speed 5 and 1787 * In short summary, a throw can take anywhere between speed 5 and
1877 * speed 0.5 1788 * speed 0.5
1878 */ 1789 */
1879 op->speed_left -= 50 / pause_f; 1790 op->speed_left -= 50 / pause_f;
1880 1791
1881 update_ob_speed (throw_ob);
1882 throw_ob->speed_left = 0; 1792 throw_ob->speed_left = 0;
1883 throw_ob->map = part->map; 1793 throw_ob->map = part->map;
1884 1794
1885 throw_ob->move_type = MOVE_FLY_LOW; 1795 throw_ob->move_type = MOVE_FLY_LOW;
1886 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK; 1796 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK;
… …
1896 LOG (llevDebug, " pause_f=%d \n", pause_f); 1806 LOG (llevDebug, " pause_f=%d \n", pause_f);
1897 LOG (llevDebug, " %s stats: wc=%d dam=%d dist=%d spd=%f break=%d\n", 1807 LOG (llevDebug, " %s stats: wc=%d dam=%d dist=%d spd=%f break=%d\n",
1898 throw_ob->name, throw_ob->stats.wc, throw_ob->stats.dam, throw_ob->last_sp, throw_ob->speed, throw_ob->stats.food); 1808 throw_ob->name, throw_ob->stats.wc, throw_ob->stats.dam, throw_ob->last_sp, throw_ob->speed, throw_ob->stats.food);
1899 LOG (llevDebug, "inserting tossitem (%d) into map\n", throw_ob->count); 1809 LOG (llevDebug, "inserting tossitem (%d) into map\n", throw_ob->count);
1900#endif 1810#endif
1901 tag = throw_ob->count; 1811
1902 insert_ob_in_map (throw_ob, part->map, op, 0); 1812 throw_ob->insert_at (part, op);
1903 if (!was_destroyed (throw_ob, tag)) 1813
1814 if (!throw_ob->destroyed ())
1904 move_arrow (throw_ob); 1815 move_arrow (throw_ob);
1816
1905 return 1; 1817 return 1;
1906} 1818}
1907 1819
1908int 1820int
1909skill_throw (object *op, object *part, int dir, const char *params, object *skill) 1821skill_throw (object *op, object *part, int dir, const char *params, object *skill)

Diff Legend

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