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.70 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.83 by root, Mon Apr 5 16:24:59 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 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 (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
49 return -1; 49 return -1;
50 } 50 }
51 51
52 /* ADJUSTMENTS */ 52 /* ADJUSTMENTS */
53 53
54 /* Its harder to steal from hostile beings! */ 54 /* It's harder to steal from hostile beings! */
55 if (!QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 55 if (!victim->flag [FLAG_UNAGGRESSIVE])
56 roll = roll / 2; 56 roll = roll / 2;
57 57
58 /* Easier to steal from sleeping beings, or if the thief is 58 /* Easier to steal from sleeping beings, or if the thief is
59 * unseen */ 59 * unseen */
60 if (QUERY_FLAG (victim, FLAG_SLEEP)) 60 if (victim->flag [FLAG_SLEEP])
61 roll = roll * 3; 61 roll = roll * 3;
62 else if (op->invisible) 62 else if (op->invisible)
63 roll = roll * 2; 63 roll = roll * 2;
64 64
65 /* check stealing 'encumberance'. Having this equipment applied makes 65 /* check stealing 'encumberance'. Having this equipment applied makes
… …
260 260
261 x = op->x + freearr_x[dir]; 261 x = op->x + freearr_x[dir];
262 y = op->y + freearr_y[dir]; 262 y = op->y + freearr_y[dir];
263 263
264 if (dir == 0) 264 if (dir == 0)
265 { 265 return 0; // you can't steal from ourself!
266 /* Can't steal from ourself! */
267 return 0;
268 }
269 266
270 m = op->map; 267 m = op->map;
271 mflags = get_map_flags (m, &m, x, y, &x, &y); 268 mflags = get_map_flags (m, &m, x, y, &x, &y);
272 /* Out of map - can't do it. If nothing alive on this space, 269 /* Out of map - can't do it. If nothing alive on this space,
273 * don't need to look any further. 270 * don't need to look any further.
… …
281 278
282 /* Find the topmost object at this spot */ 279 /* Find the topmost object at this spot */
283 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 280 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
284 281
285 /* For all the stacked objects at this point, attempt a steal */ 282 /* For all the stacked objects at this point, attempt a steal */
286 for (; tmp != NULL; tmp = next) 283 for (; tmp; tmp = next)
287 { 284 {
288 next = tmp->below; 285 next = tmp->below;
289 /* Minor hack--for multi square beings - make sure we get 286 /* Minor hack--for multi square beings - make sure we get
290 * the 'head' coz 'tail' objects have no inventory! - b.t. 287 * the 'head' coz 'tail' objects have no inventory! - b.t.
291 */ 288 */
… …
296 continue; 293 continue;
297 294
298 /* do not reveal hidden DMs */ 295 /* do not reveal hidden DMs */
299 if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden) 296 if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)
300 continue; 297 continue;
298
301 if (attempt_steal (tmp, op, skill)) 299 if (attempt_steal (tmp, op, skill))
302 { 300 {
303 if (tmp->type == PLAYER) /* no xp for stealing from another player */ 301 if (tmp->type == PLAYER) /* no xp for stealing from another player */
304 return 0; 302 return 0;
305 303
306 /* no xp for stealing from pets (of players) */ 304 /* no xp for stealing from pets (of players) */
307 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 305 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
308 { 306 {
309 object *owner = tmp->owner; 307 object *owner = tmp->owner;
310 308
311 if (owner != NULL && owner->type == PLAYER) 309 if (owner && owner->type == PLAYER)
312 return 0; 310 return 0;
313 } 311 }
314 312
315 // reduce monster experience by experience we gained, as to 313 // reduce monster experience by experience we gained, as to
316 // limit the amount of exp that can be gained by stealing from monsters 314 // limit the amount of exp that can be gained by stealing from monsters
317 // (jessies gave ~20,000,000 exp otherwise. 315 // (jessies gave ~20,000,000 exp otherwise.
318 int exp = calc_skill_exp (op, tmp, skill); 316 int exp = calc_skill_exp (op, tmp, skill);
319 317
320 exp = MIN (tmp->stats.exp, exp); 318 exp = min (tmp->stats.exp, exp);
321 tmp->stats.exp -= exp; 319 tmp->stats.exp -= exp;
322 return exp; 320 return exp;
323 } 321 }
324 } 322 }
323
325 return 0; 324 return 0;
326} 325}
327 326
328static int 327static int
329attempt_pick_lock (object *door, object *pl, object *skill) 328attempt_pick_lock (object *door, object *pl, object *skill)
… …
482static void 481static void
483stop_jump (object *pl, int dist, int spaces) 482stop_jump (object *pl, int dist, int spaces)
484{ 483{
485 pl->update_stats (); 484 pl->update_stats ();
486 pl->map->insert (pl, pl->x, pl->y, pl); 485 pl->map->insert (pl, pl->x, pl->y, pl);
487 pl->speed_left -= fabs (pl->speed * 8); 486 pl->speed_left -= pl->speed * 8.;
488} 487}
489 488
490static int 489static int
491attempt_jump (object *pl, int dir, int spaces, object *skill) 490attempt_jump (object *pl, int dir, int spaces, object *skill)
492{ 491{
… …
790use_oratory (object *pl, int dir, object *skill) 789use_oratory (object *pl, int dir, object *skill)
791{ 790{
792 if (pl->type != PLAYER) 791 if (pl->type != PLAYER)
793 return 0; /* only players use this skill */ 792 return 0; /* only players use this skill */
794 793
794 if (!dir)
795 {
796 pl->failmsg ("In what direction?");
797 return 0;
798 }
799
795 sint16 x = pl->x + freearr_x[dir], 800 sint16 x = pl->x + freearr_x[dir],
796 y = pl->y + freearr_y[dir]; 801 y = pl->y + freearr_y[dir];
797 maptile *m = pl->map; 802 maptile *m = pl->map;
798 803
799 int mflags = get_map_flags (m, &m, x, y, &x, &y); 804 int mflags = get_map_flags (m, &m, x, y, &x, &y);
… …
924 sint16 x, y; 929 sint16 x, y;
925 930
926 if (pl->type != PLAYER) 931 if (pl->type != PLAYER)
927 return 0; /* only players use this skill */ 932 return 0; /* only players use this skill */
928 933
934 if (!dir)
935 {
936 pl->failmsg ("In what direction?");
937 return 0;
938 }
939
929 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing."); 940 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");
930 for (i = 0; i < MIN (skill->level, SIZEOFFREE); i++) 941 for (int i = skill->level >= SIZEOFFREE1 ? 0 : dir;
942 i < min (skill->level, SIZEOFFREE);
943 i++)
931 { 944 {
932 x = pl->x + freearr_x[i]; 945 x = pl->x + freearr_x[i];
933 y = pl->y + freearr_y[i]; 946 y = pl->y + freearr_y[i];
934 m = pl->map; 947 m = pl->map;
935 948
… …
986} 999}
987 1000
988/* The find_traps skill (aka, search). Checks for traps 1001/* The find_traps skill (aka, search). Checks for traps
989 * on the spaces or in certain objects 1002 * on the spaces or in certain objects
990 */ 1003 */
991
992int 1004int
993find_traps (object *pl, object *skill) 1005find_traps (object *pl, object *skill)
994{ 1006{
995 object *tmp, *tmp2; 1007 object *tmp, *tmp2;
996 int i, expsum = 0, mflags; 1008 int i, expsum = 0, mflags;
… …
998 maptile *m; 1010 maptile *m;
999 1011
1000 /* First we search all around us for runes and traps, which are 1012 /* First we search all around us for runes and traps, which are
1001 * all type RUNE 1013 * all type RUNE
1002 */ 1014 */
1003
1004 for (i = 0; i < 9; i++) 1015 for (i = 0; i < 9; i++)
1005 { 1016 {
1006 x = pl->x + freearr_x[i]; 1017 x = pl->x + freearr_x[i];
1007 y = pl->y + freearr_y[i]; 1018 y = pl->y + freearr_y[i];
1008 m = pl->map; 1019 m = pl->map;
… …
1010 mflags = get_map_flags (m, &m, x, y, &x, &y); 1021 mflags = get_map_flags (m, &m, x, y, &x, &y);
1011 if (mflags & P_OUT_OF_MAP) 1022 if (mflags & P_OUT_OF_MAP)
1012 continue; 1023 continue;
1013 1024
1014 /* Check everything in the square for trapness */ 1025 /* Check everything in the square for trapness */
1015 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1026 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1016 { 1027 {
1017
1018 /* And now we'd better do an inventory traversal of each 1028 /* And now we'd better do an inventory traversal of each
1019 * of these objects' inventory 1029 * of these objects' inventory
1020 * We can narrow this down a bit - no reason to search through 1030 * We can narrow this down a bit - no reason to search through
1021 * the players inventory or monsters for that matter. 1031 * the players inventory or monsters for that matter.
1022 */ 1032 */
1023 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1033 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
1024 {
1025 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1034 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
1026 if (tmp2->type == RUNE || tmp2->type == TRAP) 1035 if (tmp2->type == RUNE || tmp2->type == TRAP)
1027 if (trap_see (pl, tmp2)) 1036 if (trap_see (pl, tmp2))
1028 { 1037 {
1029 trap_show (tmp2, tmp); 1038 trap_show (tmp2, tmp);
1030 if (tmp2->stats.Cha > 1) 1039 if (tmp2->stats.Cha > 1)
1031 { 1040 {
1032 if (!tmp2->owner || tmp2->owner->type != PLAYER) 1041 if (!tmp2->owner || tmp2->owner->type != PLAYER)
1033 expsum += calc_skill_exp (pl, tmp2, skill); 1042 expsum += calc_skill_exp (pl, tmp2, skill);
1034 1043
1035 tmp2->stats.Cha = 1; /* unhide the trap */ 1044 tmp2->stats.Cha = 1; /* unhide the trap */
1036 } 1045 }
1037 } 1046 }
1038 } 1047
1039 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp)) 1048 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp))
1040 { 1049 {
1041 trap_show (tmp, tmp); 1050 trap_show (tmp, tmp);
1042 if (tmp->stats.Cha > 1) 1051 if (tmp->stats.Cha > 1)
1043 { 1052 {
… …
1046 tmp->stats.Cha = 1; /* unhide the trap */ 1055 tmp->stats.Cha = 1; /* unhide the trap */
1047 } 1056 }
1048 } 1057 }
1049 } 1058 }
1050 } 1059 }
1060
1051 new_draw_info (NDI_BLACK, 0, pl, "You search the area."); 1061 new_draw_info (NDI_BLACK, 0, pl, "You search the area.");
1052 return expsum; 1062 return expsum;
1053} 1063}
1054 1064
1055/* remove_trap() - This skill will disarm any previously discovered trap 1065/* remove_trap() - This skill will disarm any previously discovered trap
… …
1240 1250
1241 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len)); 1251 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len));
1242 1252
1243 if (char_len <= item->weight_limit) 1253 if (char_len <= item->weight_limit)
1244 { 1254 {
1245 object *newbook = arch_to_object (item->other_arch); 1255 object *newbook = item->other_arch->instance ();
1246 item->decrease (); 1256 item->decrease ();
1247 newbook->nrof = 1; 1257 newbook->nrof = 1;
1248 newbook->msg = shstr (msg); 1258 newbook->msg = shstr (msg);
1249 newbook->flag [FLAG_IDENTIFIED] = true; 1259 newbook->flag [FLAG_IDENTIFIED] = true;
1250 1260
… …
1306 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1316 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1307 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1317 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1308 1318
1309 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1319 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1310 { 1320 {
1311 object *newscroll = arch_to_object (scroll->other_arch); 1321 object *newscroll = scroll->other_arch->instance ();
1312 scroll->decrease (); 1322 scroll->decrease ();
1313 newscroll->nrof = 1; 1323 newscroll->nrof = 1;
1314 1324
1315 pl->contr->play_sound (sound_find ("inscribe_success")); 1325 pl->contr->play_sound (sound_find ("inscribe_success"));
1316 1326
1317 if (!confused) 1327 if (!confused)
1318 { 1328 {
1319 newscroll->level = MAX (skill->level, chosen_spell->level); 1329 newscroll->level = max (skill->level, chosen_spell->level);
1320 newscroll->flag [FLAG_IDENTIFIED] = true; 1330 newscroll->flag [FLAG_IDENTIFIED] = true;
1321 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell."); 1331 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1322 } 1332 }
1323 else 1333 else
1324 { 1334 {
1325 chosen_spell = find_random_spell_in_ob (pl, NULL); 1335 chosen_spell = find_random_spell_in_ob (pl, NULL);
1326 if (!chosen_spell) 1336 if (!chosen_spell)
1327 return 0; 1337 return 0;
1328 1338
1329 newscroll->level = MAX (skill->level, chosen_spell->level); 1339 newscroll->level = max (skill->level, chosen_spell->level);
1330 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1340 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1331 } 1341 }
1332 1342
1333 object *tmp = chosen_spell->clone (); 1343 object *tmp = chosen_spell->clone ();
1334 insert_ob_in_ob (tmp, newscroll); 1344 insert_ob_in_ob (tmp, newscroll);
… …
1352 { /* Inscription has failed */ 1362 { /* Inscription has failed */
1353 pl->contr->play_sound (sound_find ("inscribe_fail")); 1363 pl->contr->play_sound (sound_find ("inscribe_fail"));
1354 1364
1355 if (chosen_spell->level > skill->level || confused) 1365 if (chosen_spell->level > skill->level || confused)
1356 { /*backfire! */ 1366 { /*backfire! */
1357 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1367 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind! H<The spell level is too high for your inscription skill.>");
1358 1368
1359 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1369 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1360 pl->drain_specific_stat (4); 1370 pl->drain_specific_stat (4);
1361 else 1371 else
1362 { 1372 {
… …
1456 * 'throwable' (ie not applied cursed obj, worn, etc). 1466 * 'throwable' (ie not applied cursed obj, worn, etc).
1457 */ 1467 */
1458static object * 1468static object *
1459find_throw_ob (object *op, const char *request) 1469find_throw_ob (object *op, const char *request)
1460{ 1470{
1461 object *tmp;
1462
1463 if (!op)
1464 { /* safety */
1465 LOG (llevError, "find_throw_ob(): confused! have a NULL thrower!\n");
1466 return (object *) NULL;
1467 }
1468
1469 /* prefer marked item */ 1471 /* prefer marked item */
1470 tmp = find_marked_object (op); 1472 object *tmp = find_marked_object (op);
1471 if (tmp != NULL) 1473
1472 {
1473 /* can't toss invisible or inv-locked items */ 1474 /* can't toss invisible or inv-locked items */
1474 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1475 if (tmp && (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)))
1475 { 1476 tmp = 0;
1476 tmp = NULL;
1477 }
1478 }
1479 1477
1480 /* look through the inventory */ 1478 /* look through the inventory */
1481 if (tmp == NULL) 1479 if (tmp)
1482 {
1483 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1480 for (tmp = op->inv; tmp; tmp = tmp->below)
1484 { 1481 {
1485 /* can't toss invisible or inv-locked items */ 1482 /* can't toss invisible or inv-locked items */
1486 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1483 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED))
1487 continue; 1484 continue;
1485
1488 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request)) 1486 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1489 break; 1487 break;
1490 } 1488 }
1491 }
1492 1489
1493 /* this should prevent us from throwing away 1490 /* this should prevent us from throwing away
1494 * cursed items, worn armour, etc. Only weapons 1491 * cursed items, worn armour, etc. Only weapons
1495 * can be thrown from 'hand'. 1492 * can be thrown from 'hand'.
1496 */ 1493 */
1497 if (!tmp) 1494 if (!tmp)
1498 return NULL; 1495 return 0;
1499 1496
1500 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 1497 if (tmp->flag [FLAG_APPLIED])
1501 { 1498 {
1502 if (tmp->type != WEAPON) 1499 if (tmp->type != WEAPON)
1503 { 1500 {
1504 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s.", query_name (tmp)); 1501 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s. H<Unapply it first.>", query_name (tmp));
1505 tmp = NULL; 1502 tmp = 0;
1506 } 1503 }
1507 else if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 1504 else if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
1508 { 1505 {
1509 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s sticks to your hand!", query_name (tmp)); 1506 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s sticks to your hand! H<Cursed or damned items cannot be removed.>", query_name (tmp));
1510 tmp = NULL; 1507 tmp = 0;
1511 } 1508 }
1512 else 1509 else
1513 { 1510 {
1514 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 1511 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
1515 { 1512 {
1516 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n"); 1513 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n");
1517 tmp = NULL; 1514 tmp = 0;
1518 } 1515 }
1519 } 1516 }
1520 } 1517 }
1521 else if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1518 else if (QUERY_FLAG (tmp, FLAG_UNPAID))
1522 { 1519 {
1523 new_draw_info_format (NDI_UNIQUE, 0, op, "You should pay for the %s first.", query_name (tmp)); 1520 new_draw_info_format (NDI_UNIQUE, 0, op, "You should pay for the %s first.", query_name (tmp));
1524 tmp = NULL; 1521 tmp = 0;
1525 } 1522 }
1526 1523
1524 //TODO: why not chekc first and give sensible message to player?
1527 if (tmp && QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1525 if (tmp && QUERY_FLAG (tmp, FLAG_INV_LOCKED))
1528 { 1526 {
1529 LOG (llevError, "BUG: find_throw_ob(): object is locked\n"); 1527 LOG (llevError, "BUG: find_throw_ob(): object is locked\n");
1530 tmp = NULL; 1528 tmp = 0;
1531 } 1529 }
1530
1532 return tmp; 1531 return tmp;
1533} 1532}
1534 1533
1535/* make_throw_ob() We construct the 'carrier' object in 1534/* make_throw_ob() We construct the 'carrier' object in
1536 * which we will insert the object that is being thrown. 1535 * which we will insert the object that is being thrown.
… …
1571 int pause_f, weight_f = 0, mflags; 1570 int pause_f, weight_f = 0, mflags;
1572 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0; 1571 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0;
1573 maptile *m; 1572 maptile *m;
1574 sint16 sx, sy; 1573 sint16 sx, sy;
1575 1574
1576 if (throw_ob == NULL) 1575 if (!throw_ob)
1577 { 1576 {
1578 if (op->type == PLAYER) 1577 if (op->type == PLAYER)
1579 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw."); 1578 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw.");
1580 1579
1581 return 0; 1580 return 0;
1582 } 1581 }
1582
1583 if (QUERY_FLAG (throw_ob, FLAG_STARTEQUIP)) 1583 if (QUERY_FLAG (throw_ob, FLAG_STARTEQUIP))
1584 { 1584 {
1585 if (op->type == PLAYER) 1585 if (op->type == PLAYER)
1586 new_draw_info (NDI_UNIQUE, 0, op, "The gods won't let you throw that."); 1586 new_draw_info (NDI_UNIQUE, 0, op,
1587 "The gods won't let you throw that. "
1588 "H<Well, they would, but they would retrieve it "
1589 "- you wouldn't want that, would you?>");
1587 1590
1588 return 0; 1591 return 0;
1589 } 1592 }
1590 1593
1591 /* Because throwing effectiveness must be reduced by the 1594 /* Because throwing effectiveness must be reduced by the
… …
1608 /* lighter items are thrown harder, farther, faster */ 1611 /* lighter items are thrown harder, farther, faster */
1609 if (throw_ob->weight > 0) 1612 if (throw_ob->weight > 0)
1610 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight); 1613 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight);
1611 else 1614 else
1612 { /* 0 or negative weight?!? Odd object, can't throw it */ 1615 { /* 0 or negative weight?!? Odd object, can't throw it */
1613 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s.\n", query_name (throw_ob)); 1616 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s. H<Better report this to your dungeon master.>\n", query_name (throw_ob));
1614 return 0; 1617 return 0;
1615 } 1618 }
1616 1619
1617 eff_str = (int) (str * (load_factor < 1.0 ? load_factor : 1.0)); 1620 eff_str = (str * (load_factor < 1.0 ? load_factor : 1.0))
1618 eff_str = (int) ((float) eff_str * item_factor * str_factor); 1621 * item_factor * str_factor;
1619 1622
1620 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to 1623 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to
1621 * account for super-strong throwers. */ 1624 * account for super-strong throwers. */
1622 if (eff_str > MAX_STAT) 1625 min_it (eff_str, MAX_STAT);
1623 eff_str = MAX_STAT;
1624 1626
1625#ifdef DEBUG_THROW 1627#ifdef DEBUG_THROW
1626 LOG (llevDebug, "%s carries %d, eff_str=%d\n", op->name, op->carrying, eff_str); 1628 LOG (llevDebug, "%s carries %d, eff_str=%d\n", op->name, op->carrying, eff_str);
1627 LOG (llevDebug, " max_c=%d, item_f=%f, load_f=%f, str=%d\n", maxc, item_factor, load_factor, op->stats.Str); 1629 LOG (llevDebug, " max_c=%d, item_f=%f, load_f=%f, str=%d\n", maxc, item_factor, load_factor, op->stats.Str);
1628 LOG (llevDebug, " str_factor=%f\n", str_factor); 1630 LOG (llevDebug, " str_factor=%f\n", str_factor);
… …
1764 if (throw_ob->weight > 50) 1766 if (throw_ob->weight > 50)
1765 throw_ob->speed *= 0.5; 1767 throw_ob->speed *= 0.5;
1766 } /* else tailor thrown object */ 1768 } /* else tailor thrown object */
1767 1769
1768 /* some limits, and safeties (needed?) */ 1770 /* some limits, and safeties (needed?) */
1769 if (throw_ob->stats.dam < 0) 1771 max_it (throw_ob->stats.dam, 0);
1770 throw_ob->stats.dam = 0;
1771 if (throw_ob->last_sp > eff_str) 1772 min_it (throw_ob->last_sp, eff_str);
1772 throw_ob->last_sp = eff_str;
1773 if (throw_ob->stats.food < 0) 1773 max_it (throw_ob->stats.food, 0);
1774 throw_ob->stats.food = 0;
1775 if (throw_ob->stats.food > 100)
1776 throw_ob->stats.food = 100;
1777 if (throw_ob->stats.wc > 30) 1774 min_it (throw_ob->stats.wc, 30);
1778 throw_ob->stats.wc = 30;
1779 1775
1780 /* how long to pause the thrower. Higher values mean less pause */ 1776 /* how long to pause the thrower. Higher values mean less pause */
1781 pause_f = ((2 * eff_str) / 3) + 20 + skill->level; 1777 pause_f = ((2 * eff_str) / 3) + 20 + skill->level;
1782 1778
1783 /* Put a lower limit on this */ 1779 /* Put a lower limit on this */
1784 if (pause_f < 10) 1780 clamp_it (pause_f, 10, 100);
1785 pause_f = 10;
1786 if (pause_f > 100)
1787 pause_f = 100;
1788 1781
1789 /* Changed in 0.94.2 - the calculation before was really goofy. 1782 /* Changed in 0.94.2 - the calculation before was really goofy.
1790 * In short summary, a throw can take anywhere between speed 5 and 1783 * In short summary, a throw can take anywhere between speed 5 and
1791 * speed 0.5 1784 * speed 0.5
1792 */ 1785 */
… …
1830 else 1823 else
1831 throw_ob = find_mon_throw_ob (op); 1824 throw_ob = find_mon_throw_ob (op);
1832 1825
1833 return do_throw (op, part, throw_ob, dir, skill); 1826 return do_throw (op, part, throw_ob, dir, skill);
1834} 1827}
1828
1829bool
1830skill_mining (object *who, object *tool, object *skill, int dir, const char *string)
1831{
1832 if (!who->is_player ())
1833 return 0;
1834
1835 if (!dir)
1836 {
1837 who->failmsg ("In what direction?");
1838 return 0;
1839 }
1840
1841 mapxy pos (who); pos.move (dir);
1842
1843 if (!pos.normalise ())
1844 {
1845 who->failmsg (format (
1846 "You brandish your %s, with not so convincing results. "
1847 "H<There is nothing in this direction.>",
1848 &tool->name
1849 ));
1850 return 0;
1851 }
1852
1853 mapspace &ms = pos.ms ();
1854
1855 for (object *vein = pos.ms ().top; vein; vein = vein->below)
1856 if (vein->type == VEIN)
1857 {
1858 who->speed_left -= who->speed / tool->speed;
1859
1860 who->play_sound (tool->sound);
1861
1862 if (rndm (100 - vein->stats.ac) > rndm (tool->stats.wc))
1863 who->failmsg (format (
1864 "You use your %s.... nothing. "
1865 "H<Try again, perhaps?>",
1866 &tool->name
1867 ));
1868 else if (vein->race != tool->race)
1869 who->failmsg (format (
1870 "You use your %s.... but it doesn't work. "
1871 "H<Maybe you are using the wrong tool?>",
1872 &tool->name
1873 ));
1874 else if (!vein->stats.food)
1875 who->failmsg (format (
1876 "You use your %s.... but there is nothing. "
1877 "H<This space is exhausted, you should try somewhere else.>",
1878 &tool->name
1879 ));
1880 else
1881 {
1882 --vein->stats.food;
1883
1884 object *ore = vein->other_arch->instance ();
1885
1886 who->statusmsg (format (
1887 "You use your %s.... and find some %s!",
1888 &tool->name, &ore->name
1889 ));
1890
1891 ore->insert_at (who);
1892
1893 return true;
1894 }
1895 }
1896
1897 return false;
1898}
1899
1900bool
1901skill_fishing (object *who, object *tool, object *skill, int dir, const char *string)
1902{
1903 printf ("******** fishing\n");
1904 return false;
1905}

Diff Legend

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