… | |
… | |
21 | * |
21 | * |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | #include <global.h> |
25 | #include <global.h> |
26 | #include <pwd.h> |
|
|
27 | #include <sproto.h> |
26 | #include <sproto.h> |
28 | #include <sounds.h> |
27 | #include <sounds.h> |
29 | #include <living.h> |
28 | #include <living.h> |
30 | #include <object.h> |
29 | #include <object.h> |
31 | #include <spells.h> |
30 | #include <spells.h> |
… | |
… | |
202 | |
201 | |
203 | ob->remove (); |
202 | ob->remove (); |
204 | ob->map = 0; |
203 | ob->map = 0; |
205 | party = 0; |
204 | party = 0; |
206 | |
205 | |
207 | // for weird reasons, this is often "ob", keeping a circular reference |
206 | combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this |
208 | ranges [range_skill] = 0; |
|
|
209 | |
207 | |
210 | players.erase (this); |
208 | players.erase (this); |
211 | } |
209 | } |
212 | |
210 | |
213 | // connect the player with a specific client |
211 | // connect the player with a specific client |
214 | // also changed, rationalises, and fixes some incorrect settings |
212 | // also changes, rationalises, and fixes some incorrect settings |
215 | void |
213 | void |
216 | player::connect (client *ns) |
214 | player::connect (client *ns) |
217 | { |
215 | { |
218 | this->ns = ns; |
216 | this->ns = ns; |
219 | ns->pl = this; |
217 | ns->pl = this; |
… | |
… | |
230 | ns->reset_stats (); |
228 | ns->reset_stats (); |
231 | |
229 | |
232 | /* make sure he's a player -- needed because of class change. */ |
230 | /* make sure he's a player -- needed because of class change. */ |
233 | ob->type = PLAYER; // we are paranoid |
231 | ob->type = PLAYER; // we are paranoid |
234 | ob->race = ob->arch->clone.race; |
232 | ob->race = ob->arch->clone.race; |
235 | |
|
|
236 | if (!legal_range (ob, shoottype)) |
|
|
237 | shoottype = range_none; |
|
|
238 | |
233 | |
239 | ob->carrying = sum_weight (ob); |
234 | ob->carrying = sum_weight (ob); |
240 | link_player_skills (ob); |
235 | link_player_skills (ob); |
241 | |
236 | |
242 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
237 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
… | |
… | |
263 | |
258 | |
264 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
259 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
265 | |
260 | |
266 | esrv_new_player (this, ob->weight + ob->carrying); |
261 | esrv_new_player (this, ob->weight + ob->carrying); |
267 | |
262 | |
|
|
263 | for (object *op = ob->inv; op; op = op->below) |
|
|
264 | if (op->flag [FLAG_APPLIED]) |
|
|
265 | switch (op->type) |
|
|
266 | { |
|
|
267 | case WAND: |
|
|
268 | case ROD: |
|
|
269 | case HORN: |
|
|
270 | case BOW: |
|
|
271 | case SKILL: |
|
|
272 | case SKILL_TOOL: |
|
|
273 | case WEAPON: |
|
|
274 | apply_special (ob, op, AP_UNAPPLY); |
|
|
275 | apply_special (ob, op, AP_APPLY); |
|
|
276 | break; |
|
|
277 | } |
|
|
278 | |
268 | ob->update_stats (); |
279 | ob->update_stats (); |
269 | ns->floorbox_update (); |
280 | ns->floorbox_update (); |
270 | |
281 | |
271 | esrv_send_inventory (ob, ob); |
282 | esrv_send_inventory (ob, ob); |
272 | esrv_add_spells (this, 0); |
283 | esrv_add_spells (this, 0); |
… | |
… | |
325 | unapply = unapply_nochoice; |
336 | unapply = unapply_nochoice; |
326 | |
337 | |
327 | savebed_map = first_map_path; /* Init. respawn position */ |
338 | savebed_map = first_map_path; /* Init. respawn position */ |
328 | |
339 | |
329 | gen_sp_armour = 10; |
340 | gen_sp_armour = 10; |
330 | shoottype = range_none; |
|
|
331 | bowtype = bow_normal; |
341 | bowtype = bow_normal; |
332 | petmode = pet_normal; |
342 | petmode = pet_normal; |
333 | listening = 10; |
343 | listening = 10; |
334 | usekeys = containers; |
344 | usekeys = containers; |
335 | peaceful = 1; /* default peaceful */ |
345 | peaceful = 1; /* default peaceful */ |
… | |
… | |
817 | } |
827 | } |
818 | |
828 | |
819 | void |
829 | void |
820 | object::swap_stats (int a, int b) |
830 | object::swap_stats (int a, int b) |
821 | { |
831 | { |
822 | int tmp = get_attr_value (&contr->orig_stats, a); |
832 | swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b)); |
823 | set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b)); |
|
|
824 | set_attr_value (&contr->orig_stats, b, tmp); |
|
|
825 | |
833 | |
|
|
834 | for (int i = 0; i < NUM_STATS; ++i) |
826 | stats.Str = contr->orig_stats.Str; |
835 | stats.stat (i) = contr->orig_stats.stat (i); |
827 | stats.Dex = contr->orig_stats.Dex; |
|
|
828 | stats.Con = contr->orig_stats.Con; |
|
|
829 | stats.Int = contr->orig_stats.Int; |
|
|
830 | stats.Wis = contr->orig_stats.Wis; |
|
|
831 | stats.Pow = contr->orig_stats.Pow; |
|
|
832 | stats.Cha = contr->orig_stats.Cha; |
|
|
833 | |
836 | |
834 | //TODO: the following code looks so borked and should, at the very least, |
837 | //TODO: the following code looks so borked and should, at the very least, |
835 | // be merged with the similar code in roll_stats |
838 | // be merged with the similar code in roll_stats |
836 | stats.ac = 0; |
839 | stats.ac = 0; |
837 | |
840 | |
… | |
… | |
1014 | /* Cornered, get rid of scared */ |
1017 | /* Cornered, get rid of scared */ |
1015 | CLEAR_FLAG (op, FLAG_SCARED); |
1018 | CLEAR_FLAG (op, FLAG_SCARED); |
1016 | op->enemy = NULL; |
1019 | op->enemy = NULL; |
1017 | } |
1020 | } |
1018 | |
1021 | |
1019 | |
|
|
1020 | /* check_pick sees if there is stuff to be picked up/picks up stuff. |
1022 | /* check_pick sees if there is stuff to be picked up/picks up stuff. |
1021 | * IT returns 1 if the player should keep on moving, 0 if he should |
1023 | * It returns 1 if the player should keep on moving, 0 if he should |
1022 | * stop. |
1024 | * stop. |
1023 | */ |
1025 | */ |
1024 | int |
1026 | int |
1025 | check_pick (object *op) |
1027 | check_pick (object *op) |
1026 | { |
1028 | { |
… | |
… | |
1464 | * find_better_arrow to find a decent arrow to use. |
1466 | * find_better_arrow to find a decent arrow to use. |
1465 | * op = the shooter |
1467 | * op = the shooter |
1466 | * type = bow->race |
1468 | * type = bow->race |
1467 | * dir = fire direction |
1469 | * dir = fire direction |
1468 | */ |
1470 | */ |
1469 | |
|
|
1470 | object * |
1471 | object * |
1471 | pick_arrow_target (object *op, const char *type, int dir) |
1472 | pick_arrow_target (object *op, const char *type, int dir) |
1472 | { |
1473 | { |
1473 | object *tmp = NULL; |
1474 | object *tmp = NULL; |
1474 | maptile *m; |
1475 | maptile *m; |
… | |
… | |
1548 | { |
1549 | { |
1549 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1550 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1550 | return 0; |
1551 | return 0; |
1551 | } |
1552 | } |
1552 | |
1553 | |
1553 | if (op->type == PLAYER) |
1554 | if (player *pl = op->contr) |
1554 | bow = op->contr->ranges[range_bow]; |
1555 | { |
|
|
1556 | bow = pl->ranged_ob; |
|
|
1557 | if (!op->change_weapon (bow)) |
|
|
1558 | return 0; |
|
|
1559 | } |
1555 | else |
1560 | else |
1556 | { |
1561 | { |
1557 | for (bow = op->inv; bow; bow = bow->below) |
1562 | for (bow = op->inv; bow; bow = bow->below) |
1558 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1563 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1559 | * don't need to switch back and forth between bows and weapons. |
1564 | * don't need to switch back and forth between bows and weapons. |
… | |
… | |
1564 | if (!bow) |
1569 | if (!bow) |
1565 | { |
1570 | { |
1566 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1571 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1567 | return 0; |
1572 | return 0; |
1568 | } |
1573 | } |
|
|
1574 | |
|
|
1575 | // optimisation: move object to top so we will find it quickly again |
|
|
1576 | if (bow->below) |
|
|
1577 | { |
|
|
1578 | bow->remove (); |
|
|
1579 | op->insert (bow); |
|
|
1580 | } |
|
|
1581 | |
1569 | } |
1582 | } |
1570 | |
1583 | |
1571 | if (!bow->race || !bow->skill) |
1584 | if (!bow->race || !bow->skill) |
1572 | { |
1585 | { |
1573 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
1586 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
… | |
… | |
1590 | if (op->type == PLAYER) |
1603 | if (op->type == PLAYER) |
1591 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1604 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1592 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1605 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1593 | else |
1606 | else |
1594 | CLEAR_FLAG (op, FLAG_READY_BOW); |
1607 | CLEAR_FLAG (op, FLAG_READY_BOW); |
|
|
1608 | |
1595 | return 0; |
1609 | return 0; |
1596 | } |
1610 | } |
1597 | } |
1611 | } |
1598 | |
1612 | |
1599 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
1613 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
… | |
… | |
1623 | |
1637 | |
1624 | arrow->set_owner (op); |
1638 | arrow->set_owner (op); |
1625 | arrow->skill = bow->skill; |
1639 | arrow->skill = bow->skill; |
1626 | arrow->direction = dir; |
1640 | arrow->direction = dir; |
1627 | |
1641 | |
|
|
1642 | arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ |
|
|
1643 | arrow->stats.hp = arrow->stats.dam; |
|
|
1644 | arrow->stats.grace = arrow->attacktype; |
|
|
1645 | |
|
|
1646 | if (arrow->slaying) |
|
|
1647 | arrow->spellarg = strdup (arrow->slaying); |
|
|
1648 | |
1628 | if (op->type == PLAYER) |
1649 | if (op->type == PLAYER) |
1629 | { |
1650 | { |
1630 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
1651 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
1631 | op->update_stats (); |
1652 | op->update_stats (); |
1632 | } |
1653 | } |
1633 | |
1654 | |
1634 | SET_ANIMATION (arrow, arrow->direction); |
1655 | SET_ANIMATION (arrow, arrow->direction); |
1635 | arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ |
|
|
1636 | arrow->stats.hp = arrow->stats.dam; |
|
|
1637 | arrow->stats.grace = arrow->attacktype; |
|
|
1638 | if (arrow->slaying != NULL) |
|
|
1639 | arrow->spellarg = strdup (arrow->slaying); |
|
|
1640 | |
1656 | |
1641 | /* Note that this was different for monsters - they got their level |
1657 | arrow->stats.dam += op->stats.dam + arrow->magic; |
1642 | * added to the damage. I think the strength bonus is more proper. |
|
|
1643 | */ |
|
|
1644 | |
|
|
1645 | arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic; |
|
|
1646 | |
1658 | |
1647 | /* update the speed */ |
1659 | /* update the speed */ |
1648 | arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? |
1660 | arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 |
1649 | 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; |
1661 | + bow->stats.dam / 7.0; |
1650 | |
1662 | |
1651 | arrow->set_speed (max (arrow->speed, 1.0)); |
1663 | arrow->set_speed (max (arrow->speed, 2.0)); |
1652 | arrow->speed_left = 0; |
1664 | arrow->speed_left = 0; |
1653 | |
1665 | |
|
|
1666 | arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; |
|
|
1667 | |
1654 | if (op->type == PLAYER) |
1668 | if (op->type == PLAYER) |
1655 | { |
1669 | { |
1656 | arrow->stats.wc = 20 - bow->magic - arrow->magic - |
|
|
1657 | (op->chosen_skill ? op->chosen_skill->level : op->level) - |
|
|
1658 | dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod; |
|
|
1659 | |
|
|
1660 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
1670 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
|
|
1671 | arrow->stats.wc -= dex_bonus[op->stats.Dex]; |
|
|
1672 | |
|
|
1673 | if (!arrow->slaying) |
|
|
1674 | arrow->slaying = op->slaying; |
|
|
1675 | |
|
|
1676 | arrow->attacktype |= op->attacktype; |
1661 | } |
1677 | } |
1662 | else |
1678 | else |
1663 | { |
1679 | { |
1664 | arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod; |
|
|
1665 | arrow->level = op->level; |
1680 | arrow->level = op->level; |
1666 | } |
1681 | arrow->stats.wc -= bow->magic; |
1667 | |
1682 | |
1668 | if (arrow->attacktype == AT_PHYSICAL) |
1683 | if (!arrow->slaying) |
|
|
1684 | arrow->slaying = bow->slaying; |
|
|
1685 | |
1669 | arrow->attacktype |= bow->attacktype; |
1686 | arrow->attacktype |= bow->attacktype; |
|
|
1687 | } |
1670 | |
1688 | |
1671 | if (bow->slaying) |
1689 | arrow->stats.wc -= arrow->level; |
1672 | arrow->slaying = bow->slaying; |
|
|
1673 | |
1690 | |
1674 | arrow->move_type = MOVE_FLY_LOW; |
1691 | arrow->move_type = MOVE_FLY_LOW; |
1675 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1692 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1676 | |
1693 | |
1677 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
1694 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
… | |
… | |
1703 | { |
1720 | { |
1704 | int ret = 0, wcmod = 0; |
1721 | int ret = 0, wcmod = 0; |
1705 | |
1722 | |
1706 | if (op->contr->bowtype == bow_bestarrow) |
1723 | if (op->contr->bowtype == bow_bestarrow) |
1707 | { |
1724 | { |
1708 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); |
1725 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); |
1709 | } |
1726 | } |
1710 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1727 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1711 | { |
1728 | { |
1712 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1729 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1713 | wcmod = -1; |
1730 | wcmod = -1; |
… | |
… | |
1723 | else if (op->contr->bowtype == bow_spreadshot) |
1740 | else if (op->contr->bowtype == bow_spreadshot) |
1724 | { |
1741 | { |
1725 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1742 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1726 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1743 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1727 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1744 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1728 | |
|
|
1729 | } |
1745 | } |
1730 | else |
1746 | else |
1731 | { |
1747 | { |
1732 | /* Simple case */ |
1748 | /* Simple case */ |
1733 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1749 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1734 | } |
1750 | } |
|
|
1751 | |
1735 | return ret; |
1752 | return ret; |
1736 | } |
1753 | } |
1737 | |
1754 | |
1738 | |
1755 | |
1739 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1756 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1740 | * Broken apart from 'fire' to keep it more readable. |
1757 | * Broken apart from 'fire' to keep it more readable. |
1741 | */ |
1758 | */ |
1742 | void |
1759 | void |
1743 | fire_misc_object (object *op, int dir) |
1760 | fire_misc_object (object *op, int dir) |
1744 | { |
1761 | { |
1745 | object *item; |
1762 | object *item = op->contr->ranged_ob; |
1746 | |
1763 | |
1747 | if (!op->contr->ranges[range_misc]) |
1764 | if (!item) |
1748 | { |
1765 | { |
1749 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1766 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1750 | return; |
1767 | return; |
1751 | } |
1768 | } |
1752 | |
1769 | |
1753 | item = op->contr->ranges[range_misc]; |
|
|
1754 | if (!item->inv) |
1770 | if (!item->inv) |
1755 | { |
1771 | { |
1756 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1772 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1757 | return; |
1773 | return; |
1758 | } |
1774 | } |
|
|
1775 | |
|
|
1776 | if (!op->change_weapon (item)) |
|
|
1777 | return; |
|
|
1778 | |
1759 | if (item->type == WAND) |
1779 | if (item->type == WAND) |
1760 | { |
1780 | { |
1761 | if (item->stats.food <= 0) |
1781 | if (item->stats.food <= 0) |
1762 | { |
1782 | { |
1763 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1783 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1764 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
1784 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
|
|
1785 | |
1765 | return; |
1786 | return; |
1766 | } |
1787 | } |
1767 | } |
1788 | } |
1768 | else if (item->type == ROD || item->type == HORN) |
1789 | else if (item->type == ROD || item->type == HORN) |
1769 | { |
1790 | { |
1770 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1791 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1771 | { |
1792 | { |
1772 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1793 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
|
|
1794 | |
1773 | if (item->type == ROD) |
1795 | if (item->type == ROD) |
1774 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1796 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1775 | else |
1797 | else |
1776 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
1798 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
|
|
1799 | |
1777 | return; |
1800 | return; |
1778 | } |
1801 | } |
1779 | } |
1802 | } |
1780 | |
1803 | |
1781 | if (cast_spell (op, item, dir, item->inv, NULL)) |
1804 | if (cast_spell (op, item, dir, item->inv, NULL)) |
… | |
… | |
1812 | |
1835 | |
1813 | /* check for loss of invisiblity/hide */ |
1836 | /* check for loss of invisiblity/hide */ |
1814 | if (action_makes_visible (op)) |
1837 | if (action_makes_visible (op)) |
1815 | make_visible (op); |
1838 | make_visible (op); |
1816 | |
1839 | |
1817 | switch (op->contr->shoottype) |
1840 | player *pl = op->contr; |
|
|
1841 | |
|
|
1842 | if (pl->golem) |
1818 | { |
1843 | { |
1819 | case range_none: |
1844 | control_golem (op->contr->golem, dir); |
1820 | return; |
1845 | return; |
|
|
1846 | } |
1821 | |
1847 | |
1822 | case range_bow: |
1848 | object *ob = pl->ranged_ob; |
|
|
1849 | |
|
|
1850 | if (!ob) |
|
|
1851 | return; |
|
|
1852 | |
|
|
1853 | switch (ob->type) |
|
|
1854 | { |
|
|
1855 | case BOW: |
1823 | player_fire_bow (op, dir); |
1856 | player_fire_bow (op, dir); |
1824 | return; |
1857 | break; |
1825 | |
1858 | |
1826 | case range_magic: /* Casting spells */ |
1859 | case SPELL: |
1827 | spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); |
1860 | spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); |
1828 | return; |
1861 | break; |
1829 | |
1862 | |
1830 | case range_misc: |
1863 | case BUILDER: |
|
|
1864 | apply_map_builder (op, dir); |
|
|
1865 | break; |
|
|
1866 | |
|
|
1867 | case SKILL: |
|
|
1868 | case SKILL_TOOL: |
|
|
1869 | do_skill (op, op, ob, dir, 0); |
|
|
1870 | break; |
|
|
1871 | |
|
|
1872 | default: |
1831 | fire_misc_object (op, dir); |
1873 | fire_misc_object (op, dir); |
1832 | return; |
1874 | break; |
1833 | |
|
|
1834 | case range_golem: /* Control summoned monsters from scrolls */ |
|
|
1835 | control_golem (op->contr->ranges[range_golem], dir); |
|
|
1836 | return; |
|
|
1837 | |
|
|
1838 | case range_skill: |
|
|
1839 | if (!op->chosen_skill) |
|
|
1840 | { |
|
|
1841 | if (op->type == PLAYER) |
|
|
1842 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
|
|
1843 | |
|
|
1844 | return; |
|
|
1845 | } |
|
|
1846 | |
|
|
1847 | do_skill (op, op, op->chosen_skill, dir, NULL); |
|
|
1848 | return; |
|
|
1849 | case range_builder: |
|
|
1850 | apply_map_builder (op, dir); |
|
|
1851 | return; |
|
|
1852 | default: |
|
|
1853 | new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); |
|
|
1854 | return; |
|
|
1855 | } |
1875 | } |
1856 | } |
1876 | } |
1857 | |
1877 | |
1858 | /* find_key |
1878 | /* find_key |
1859 | * We try to find a key for the door as passed. If we find a key |
1879 | * We try to find a key for the door as passed. If we find a key |
… | |
… | |
1959 | if (key) |
1979 | if (key) |
1960 | { |
1980 | { |
1961 | object *container = key->env; |
1981 | object *container = key->env; |
1962 | |
1982 | |
1963 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
1983 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
|
|
1984 | |
1964 | if (action_makes_visible (op)) |
1985 | if (action_makes_visible (op)) |
1965 | make_visible (op); |
1986 | make_visible (op); |
|
|
1987 | |
1966 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1988 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1967 | spring_trap (door->inv, op); |
1989 | spring_trap (door->inv, op); |
1968 | |
1990 | |
1969 | if (door->type == DOOR) |
1991 | if (door->type == DOOR) |
1970 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
1992 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
… | |
… | |
2000 | */ |
2022 | */ |
2001 | void |
2023 | void |
2002 | move_player_attack (object *op, int dir) |
2024 | move_player_attack (object *op, int dir) |
2003 | { |
2025 | { |
2004 | object *tmp, *mon; |
2026 | object *tmp, *mon; |
2005 | sint16 nx, ny; |
|
|
2006 | int on_battleground; |
2027 | int on_battleground; |
2007 | maptile *m; |
2028 | maptile *m; |
2008 | |
2029 | |
2009 | nx = freearr_x[dir] + op->x; |
2030 | sint16 nx = freearr_x[dir] + op->x; |
2010 | ny = freearr_y[dir] + op->y; |
2031 | sint16 ny = freearr_y[dir] + op->y; |
2011 | |
2032 | |
2012 | on_battleground = op_on_battleground (op, 0, 0); |
2033 | on_battleground = op_on_battleground (op, 0, 0); |
2013 | |
2034 | |
2014 | /* If braced, or can't move to the square, and it is not out of the |
2035 | /* If braced, or can't move to the square, and it is not out of the |
2015 | * map, attack it. Note order of if statement is important - don't |
2036 | * map, attack it. Note order of if statement is important - don't |
… | |
… | |
2095 | /* If we're braced, we don't want to switch places with it */ |
2116 | /* If we're braced, we don't want to switch places with it */ |
2096 | if (op->contr->braced) |
2117 | if (op->contr->braced) |
2097 | return; |
2118 | return; |
2098 | |
2119 | |
2099 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2120 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2100 | (void) push_ob (mon, dir, op); |
2121 | push_ob (mon, dir, op); |
2101 | if (op->contr->tmp_invis || op->hide) |
2122 | if (op->contr->tmp_invis || op->hide) |
2102 | make_visible (op); |
2123 | make_visible (op); |
2103 | |
2124 | |
2104 | return; |
2125 | return; |
2105 | } |
2126 | } |
… | |
… | |
2448 | gen_grace = op->stats.maxgrace; |
2469 | gen_grace = op->stats.maxgrace; |
2449 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2470 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2450 | } |
2471 | } |
2451 | |
2472 | |
2452 | /* Regenerate Spell Points */ |
2473 | /* Regenerate Spell Points */ |
2453 | if (!op->contr->ranges[range_golem] && --op->last_sp < 0) |
2474 | if (!op->contr->golem && --op->last_sp < 0) |
2454 | { |
2475 | { |
2455 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2476 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2456 | if (op->stats.sp < op->stats.maxsp) |
2477 | if (op->stats.sp < op->stats.maxsp) |
2457 | { |
2478 | { |
2458 | op->stats.sp++; |
2479 | op->stats.sp++; |
… | |
… | |
3493 | * not readied. |
3514 | * not readied. |
3494 | */ |
3515 | */ |
3495 | void |
3516 | void |
3496 | player_unready_range_ob (player *pl, object *ob) |
3517 | player_unready_range_ob (player *pl, object *ob) |
3497 | { |
3518 | { |
3498 | for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3519 | if (pl->ob->current_weapon == ob) |
|
|
3520 | pl->ob->current_weapon = 0; |
|
|
3521 | |
|
|
3522 | if (pl->combat_ob == ob) |
|
|
3523 | pl->combat_ob = 0; |
|
|
3524 | |
3499 | if (pl->ranges[i] == ob) |
3525 | if (pl->ranged_ob == ob) |
3500 | { |
|
|
3501 | pl->ranges[i] = 0; |
3526 | pl->ranged_ob = 0; |
3502 | if (pl->shoottype == i) |
|
|
3503 | pl->shoottype = range_none; |
|
|
3504 | } |
|
|
3505 | } |
3527 | } |
3506 | |
3528 | |
3507 | sint8 |
3529 | sint8 |
3508 | player::visibility_at (maptile *map, int x, int y) const |
3530 | player::visibility_at (maptile *map, int x, int y) const |
3509 | { |
3531 | { |