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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.115 by root, Fri Apr 27 02:43:04 2007 UTC vs.
Revision 1.138 by root, Thu May 17 20:27:01 2007 UTC

… …
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>
… …
146 } 145 }
147 146
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
150}
151
152float
153player::weapon_speed () const
154{
155 return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
151} 156}
152 157
153/* This loads the first map an puts the player on it. */ 158/* This loads the first map an puts the player on it. */
154static void 159static void
155set_first_map (object *op) 160set_first_map (object *op)
… …
202 207
203 ob->remove (); 208 ob->remove ();
204 ob->map = 0; 209 ob->map = 0;
205 party = 0; 210 party = 0;
206 211
207 // for weird reasons, this is often "ob", keeping a circular reference 212 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208 ranges [range_skill] = 0;
209 213
210 players.erase (this); 214 players.erase (this);
211} 215}
212 216
213// connect the player with a specific client 217// connect the player with a specific client
214// also changed, rationalises, and fixes some incorrect settings 218// also changes, rationalises, and fixes some incorrect settings
215void 219void
216player::connect (client *ns) 220player::connect (client *ns)
217{ 221{
218 this->ns = ns; 222 this->ns = ns;
219 ns->pl = this; 223 ns->pl = this;
… …
230 ns->reset_stats (); 234 ns->reset_stats ();
231 235
232 /* make sure he's a player -- needed because of class change. */ 236 /* make sure he's a player -- needed because of class change. */
233 ob->type = PLAYER; // we are paranoid 237 ob->type = PLAYER; // we are paranoid
234 ob->race = ob->arch->clone.race; 238 ob->race = ob->arch->clone.race;
235
236 if (!legal_range (ob, shoottype))
237 shoottype = range_none;
238 239
239 ob->carrying = sum_weight (ob); 240 ob->carrying = sum_weight (ob);
240 link_player_skills (ob); 241 link_player_skills (ob);
241 242
242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 243 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
… …
263 264
264 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 265 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265 266
266 esrv_new_player (this, ob->weight + ob->carrying); 267 esrv_new_player (this, ob->weight + ob->carrying);
267 268
269 for (object *op = ob->inv; op; op = op->below)
270 if (op->flag [FLAG_APPLIED])
271 switch (op->type)
272 {
273 case WAND:
274 case ROD:
275 case HORN:
276 case BOW:
277 case SKILL_TOOL:
278 case WEAPON:
279 op->flag [FLAG_APPLIED] = false;
280 apply_special (ob, op, AP_APPLY);
281 break;
282 }
283
268 ob->update_stats (); 284 ob->update_stats ();
269 ns->floorbox_update (); 285 ns->floorbox_update ();
270 286
271 esrv_send_inventory (ob, ob); 287 esrv_send_inventory (ob, ob);
272 esrv_add_spells (this, 0); 288 esrv_add_spells (this, 0);
… …
308player::set_object (object *op) 324player::set_object (object *op)
309{ 325{
310 ob = op; 326 ob = op;
311 ob->contr = this; /* this aren't yet in archetype */ 327 ob->contr = this; /* this aren't yet in archetype */
312 328
313 ob->speed_left = 0.5; 329 ob->speed_left = 0.5f;
314 ob->speed = 1.0; 330 ob->speed = 1.0f;
315 ob->direction = 5; /* So player faces south */ 331 ob->direction = 5; /* So player faces south */
316} 332}
317 333
318player::player () 334player::player ()
319{ 335{
… …
325 unapply = unapply_nochoice; 341 unapply = unapply_nochoice;
326 342
327 savebed_map = first_map_path; /* Init. respawn position */ 343 savebed_map = first_map_path; /* Init. respawn position */
328 344
329 gen_sp_armour = 10; 345 gen_sp_armour = 10;
330 shoottype = range_none;
331 bowtype = bow_normal; 346 bowtype = bow_normal;
332 petmode = pet_normal; 347 petmode = pet_normal;
333 listening = 10; 348 listening = 10;
334 usekeys = containers; 349 usekeys = containers;
335 peaceful = 1; /* default peaceful */ 350 peaceful = 1; /* default peaceful */
… …
774} 789}
775 790
776void 791void
777object::roll_stats () 792object::roll_stats ()
778{ 793{
779 int statsort [7]; 794 int statsort [NUM_STATS];
780 795
781 for (;;) 796 for (;;)
782 { 797 {
783 int sum = 0; 798 int sum = 0;
784 for (int i = 7; i--; ) 799 for (int i = NUM_STATS; i--; )
785 sum += statsort [i] = roll_stat (); 800 sum += statsort [i] = roll_stat ();
786 801
787 if (sum >= 82 && sum <= 116) 802 if (sum >= 82 && sum <= 116)
788 break; 803 break;
789 } 804 }
790 805
791 // Sort the stats so that rerolling is easier... 806 // Sort the stats so that rerolling is easier...
792 std::sort (statsort, statsort + 7, std::greater<int>()); 807 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
793 808
809 for (int i = 0; i < NUM_STATS; ++i)
794 stats.Str = statsort[0]; 810 stats.stat (i) = statsort [i];
795 stats.Dex = statsort[1];
796 stats.Con = statsort[2];
797 stats.Int = statsort[3];
798 stats.Wis = statsort[4];
799 stats.Pow = statsort[5];
800 stats.Cha = statsort[6];
801 811
802 stats.exp = 0; 812 stats.exp = 0;
803 stats.ac = 0; 813 stats.ac = 0;
804 814
805 stats.hp = stats.maxhp; 815 stats.hp = stats.maxhp;
… …
817} 827}
818 828
819void 829void
820object::swap_stats (int a, int b) 830object::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 */
1024int 1026int
1025check_pick (object *op) 1027check_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
1470object * 1471object *
1471pick_arrow_target (object *op, const char *type, int dir) 1472pick_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;
… …
1539 */ 1540 */
1540int 1541int
1541fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1542fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1542{ 1543{
1543 object *left, *bow; 1544 object *left, *bow;
1544 int bowspeed, mflags; 1545 int mflags;
1545 maptile *m; 1546 maptile *m;
1546 1547
1547 if (!dir) 1548 if (!dir)
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 (op->contr)
1554 bow = op->contr->ranges[range_bow]; 1555 bow = op->current_weapon;
1555 else 1556 else
1556 { 1557 {
1557 for (bow = op->inv; bow; bow = bow->below) 1558 for (bow = op->inv; bow; bow = bow->below)
1558 /* Don't check for applied - monsters don't apply bows - in that way, they 1559 /* 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. 1560 * don't need to switch back and forth between bows and weapons.
… …
1564 if (!bow) 1565 if (!bow)
1565 { 1566 {
1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1567 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1567 return 0; 1568 return 0;
1568 } 1569 }
1570
1571 // optimisation: move object to top so we will find it quickly again
1572 if (bow->below)
1573 {
1574 bow->remove ();
1575 op->insert (bow);
1576 }
1577
1569 } 1578 }
1570 1579
1571 if (!bow->race || !bow->skill) 1580 if (!bow->race || !bow->skill)
1572 { 1581 {
1573 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1582 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1574 return 0; 1583 return 0;
1575 } 1584 }
1576
1577 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1578
1579 /* penalize ROF for bestarrow */
1580 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1581 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1582
1583 if (bowspeed < 1)
1584 bowspeed = 1;
1585 1585
1586 if (arrow == NULL) 1586 if (arrow == NULL)
1587 { 1587 {
1588 if ((arrow = find_arrow (op, bow->race)) == NULL) 1588 if ((arrow = find_arrow (op, bow->race)) == NULL)
1589 { 1589 {
1590 if (op->type == PLAYER) 1590 if (op->type == PLAYER)
1591 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1591 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 */ 1592 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1593 else 1593 else
1594 CLEAR_FLAG (op, FLAG_READY_BOW); 1594 CLEAR_FLAG (op, FLAG_READY_BOW);
1595
1595 return 0; 1596 return 0;
1596 } 1597 }
1597 } 1598 }
1598 1599
1599 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1600 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1623 1624
1624 arrow->set_owner (op); 1625 arrow->set_owner (op);
1625 arrow->skill = bow->skill; 1626 arrow->skill = bow->skill;
1626 arrow->direction = dir; 1627 arrow->direction = dir;
1627 1628
1629 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1630 arrow->stats.hp = arrow->stats.dam;
1631 arrow->stats.grace = arrow->attacktype;
1632
1633 if (arrow->slaying)
1634 arrow->spellarg = strdup (arrow->slaying);
1635
1636 if (player *pl = op->contr)
1637 {
1638 if (!pl->has_hit)
1639 {
1640 pl->has_hit = 1;
1641 pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1642 }
1643#if 0
1644 float speed = pl->weapon_sp;
1645
1646 /* penalize ROF for bestarrow */
1647 if (pl->bowtype == bow_bestarrow)
1648 speed *= .9f;
1649 else
1650 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1651
1652 op->speed_left += speed - op->speed;
1653#endif
1654 }
1655
1656 SET_ANIMATION (arrow, arrow->direction);
1657
1658 /* update the speed */
1659 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1660 + bow->stats.dam / 7.0;
1661
1662 arrow->set_speed (max (arrow->speed, 2.0));
1663 arrow->speed_left = 0;
1664
1665 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1666
1628 if (op->type == PLAYER) 1667 if (op->type == PLAYER)
1629 { 1668 {
1630 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1631 op->update_stats ();
1632 }
1633
1634 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
1641 /* Note that this was different for monsters - they got their level
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
1647 /* update the speed */
1648 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1649 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1650
1651 arrow->set_speed (max (arrow->speed, 1.0));
1652 arrow->speed_left = 0;
1653
1654 if (op->type == PLAYER)
1655 {
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; 1669 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1670 wc -= dex_bonus[op->stats.Dex];
1671
1672 if (!arrow->slaying)
1673 arrow->slaying = op->slaying;
1674
1675 arrow->attacktype |= op->attacktype;
1661 } 1676 }
1662 else 1677 else
1663 { 1678 {
1664 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1665 arrow->level = op->level; 1679 arrow->level = op->level;
1666 } 1680 arrow->stats.wc -= bow->magic;
1667 1681
1668 if (arrow->attacktype == AT_PHYSICAL) 1682 if (!arrow->slaying)
1683 arrow->slaying = bow->slaying;
1684
1669 arrow->attacktype |= bow->attacktype; 1685 arrow->attacktype |= bow->attacktype;
1686 }
1670 1687
1671 if (bow->slaying) 1688 wc -= arrow->level;
1672 arrow->slaying = bow->slaying; 1689 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1673 1690
1691 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1674 arrow->move_type = MOVE_FLY_LOW; 1692 arrow->move_type = MOVE_FLY_LOW;
1675 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1693 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1676 1694
1677 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1695 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1678 m->insert (arrow, sx, sy, op); 1696 m->insert (arrow, sx, sy, op);
… …
1703{ 1721{
1704 int ret = 0, wcmod = 0; 1722 int ret = 0, wcmod = 0;
1705 1723
1706 if (op->contr->bowtype == bow_bestarrow) 1724 if (op->contr->bowtype == bow_bestarrow)
1707 { 1725 {
1708 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1726 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1709 } 1727 }
1710 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1728 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1711 { 1729 {
1712 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1730 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1713 wcmod = -1; 1731 wcmod = -1;
… …
1723 else if (op->contr->bowtype == bow_spreadshot) 1741 else if (op->contr->bowtype == bow_spreadshot)
1724 { 1742 {
1725 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1743 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); 1744 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); 1745 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1728
1729 } 1746 }
1730 else 1747 else
1731 { 1748 {
1732 /* Simple case */ 1749 /* Simple case */
1733 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1750 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1734 } 1751 }
1752
1735 return ret; 1753 return ret;
1736} 1754}
1737
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 */
1742void 1759void
1743fire_misc_object (object *op, int dir) 1760fire_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 if (!op->change_weapon (ob))
1854 return;
1855
1856 switch (ob->type)
1857 {
1858 case BOW:
1823 player_fire_bow (op, dir); 1859 player_fire_bow (op, dir);
1824 return; 1860 break;
1825 1861
1826 case range_magic: /* Casting spells */ 1862 case SPELL:
1827 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1863 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1828 return; 1864 break;
1829 1865
1830 case range_misc: 1866 case BUILDER:
1867 apply_map_builder (op, dir);
1868 break;
1869
1870 case SKILL:
1871 do_skill (op, op, ob, dir, 0);
1872 break;
1873
1874 default:
1831 fire_misc_object (op, dir); 1875 fire_misc_object (op, dir);
1832 return; 1876 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 } 1877 }
1856} 1878}
1857 1879
1858/* find_key 1880/* find_key
1859 * We try to find a key for the door as passed. If we find a key 1881 * We try to find a key for the door as passed. If we find a key
… …
1959 if (key) 1981 if (key)
1960 { 1982 {
1961 object *container = key->env; 1983 object *container = key->env;
1962 1984
1963 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1985 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1986
1964 if (action_makes_visible (op)) 1987 if (action_makes_visible (op))
1965 make_visible (op); 1988 make_visible (op);
1989
1966 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1990 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1967 spring_trap (door->inv, op); 1991 spring_trap (door->inv, op);
1968 1992
1969 if (door->type == DOOR) 1993 if (door->type == DOOR)
1970 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1994 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
… …
2000 */ 2024 */
2001void 2025void
2002move_player_attack (object *op, int dir) 2026move_player_attack (object *op, int dir)
2003{ 2027{
2004 object *tmp, *mon; 2028 object *tmp, *mon;
2005 sint16 nx, ny;
2006 int on_battleground; 2029 int on_battleground;
2007 maptile *m; 2030 maptile *m;
2008 2031
2009 nx = freearr_x[dir] + op->x; 2032 sint16 nx = freearr_x[dir] + op->x;
2010 ny = freearr_y[dir] + op->y; 2033 sint16 ny = freearr_y[dir] + op->y;
2011 2034
2012 on_battleground = op_on_battleground (op, 0, 0); 2035 on_battleground = op_on_battleground (op, 0, 0);
2013 2036
2014 /* If braced, or can't move to the square, and it is not out of the 2037 /* 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 2038 * map, attack it. Note order of if statement is important - don't
… …
2080 2103
2081 /* If the creature is a pet, push it even if the player is not 2104 /* If the creature is a pet, push it even if the player is not
2082 * peaceful. Our assumption is the creature is a pet if the 2105 * peaceful. Our assumption is the creature is a pet if the
2083 * player owns it and it is either friendly or unagressive. 2106 * player owns it and it is either friendly or unagressive.
2084 */ 2107 */
2085 if ((op->type == PLAYER) 2108 if (op->type == PLAYER
2086#if COZY_SERVER
2087 &&
2088 ((mon->owner && mon->owner->contr 2109 && ((mon->owner && mon->owner->contr
2089 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2110 && same_party (mon->owner->contr->party, op->contr->party))
2090#else
2091 && mon->owner == op 2111 || mon->owner == op)
2092#endif
2093 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2112 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2094 { 2113 {
2095 /* If we're braced, we don't want to switch places with it */ 2114 /* If we're braced, we don't want to switch places with it */
2096 if (op->contr->braced) 2115 if (op->contr->braced)
2097 return; 2116 return;
2098 2117
2099 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2118 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2100 (void) push_ob (mon, dir, op); 2119 push_ob (mon, dir, op);
2101 if (op->contr->tmp_invis || op->hide) 2120 if (op->contr->tmp_invis || op->hide)
2102 make_visible (op); 2121 make_visible (op);
2103 2122
2104 return; 2123 return;
2105 } 2124 }
… …
2107 /* in certain circumstances, you shouldn't attack friendly 2126 /* in certain circumstances, you shouldn't attack friendly
2108 * creatures. Note that if you are braced, you can't push 2127 * creatures. Note that if you are braced, you can't push
2109 * someone, but put it inside this loop so that you won't 2128 * someone, but put it inside this loop so that you won't
2110 * attack them either. 2129 * attack them either.
2111 */ 2130 */
2112 if ((mon->type == PLAYER || mon->enemy != op) && 2131 if ((mon->type == PLAYER || mon->enemy != op)
2113 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2132 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2114#ifdef PROHIBIT_PLAYERKILL
2115 (op->contr->peaceful 2133 && ((op->contr->peaceful
2116 || (mon->type == PLAYER 2134 || (mon->type == PLAYER && mon->contr->peaceful))
2117 && mon->contr->
2118 peaceful)) &&
2119#else
2120 op->contr->peaceful &&
2121#endif
2122 !on_battleground)) 2135 && !on_battleground))
2123 { 2136 {
2124 if (!op->contr->braced) 2137 if (!op->contr->braced)
2125 { 2138 {
2126 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2139 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2127 push_ob (mon, dir, op); 2140 push_ob (mon, dir, op);
… …
2150 * that party_number -1 is no party, so attacks can still happen. 2163 * that party_number -1 is no party, so attacks can still happen.
2151 */ 2164 */
2152 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2165 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2153 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2166 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2154 { 2167 {
2155
2156 /* If the player hasn't hit something this tick, and does
2157 * so, give them speed boost based on weapon speed. Doing
2158 * it here is better than process_players2, which basically
2159 * incurred a 1 tick offset.
2160 */
2161 if (!op->contr->has_hit) 2168 if (!op->contr->has_hit)
2162 { 2169 {
2170 op->contr->has_hit = 1;
2163 op->speed_left += op->speed / op->contr->weapon_sp; 2171 op->speed_left += op->contr->weapon_speed () - op->speed;
2164
2165 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2166 } 2172 }
2167 2173
2168 skill_attack (mon, op, 0, 0, 0); 2174 skill_attack (mon, op, 0, 0, 0);
2169 2175
2170 /* If attacking another player, that player gets automatic 2176 /* If attacking another player, that player gets automatic
… …
2248handle_newcs_player (object *op) 2254handle_newcs_player (object *op)
2249{ 2255{
2250 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2251 { 2257 {
2252 flee_player (op); 2258 flee_player (op);
2259
2253 /* If player is still scared, that is his action for this tick */ 2260 /* If player is still scared, that is his action for this tick */
2254 if (QUERY_FLAG (op, FLAG_SCARED)) 2261 if (op->flag [FLAG_SCARED])
2255 { 2262 {
2256 op->speed_left--; 2263 --op->speed_left;
2257 return 0; 2264 return 0;
2258 } 2265 }
2259 } 2266 }
2260 2267
2261 /* call this here - we also will call this in do_ericserver, but 2268 /* call this here - we also will call this in do_ericserver, but
… …
2263 * called, so we recheck it here. 2270 * called, so we recheck it here.
2264 */ 2271 */
2265 if (op->contr->ns->handle_command ()) 2272 if (op->contr->ns->handle_command ())
2266 return 1; 2273 return 1;
2267 2274
2268 if (op->speed_left > 0) 2275 if (op->speed_left > 0.f)
2269 { 2276 {
2270 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2277 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2271 { 2278 {
2272 /* All move commands take 1 tick, at least for now */ 2279 /* All move commands take 1 tick, at least for now */
2273 op->speed_left--; 2280 --op->speed_left;
2274 2281
2275 /* Instead of all the stuff below, let move_player take care 2282 /* Instead of all the stuff below, let move_player take care
2276 * of it. Also, some of the skill stuff is only put in 2283 * of it. Also, some of the skill stuff is only put in
2277 * there, as well as the confusion stuff. 2284 * there, as well as the confusion stuff.
2278 */ 2285 */
2279 move_player (op, op->direction); 2286 move_player (op, op->direction);
2280 2287
2281 return op->speed_left > 0; 2288 return op->speed_left > 0.f;
2282 } 2289 }
2283 } 2290 }
2284 2291
2285 return 0; 2292 return 0;
2286} 2293}
… …
2448 gen_grace = op->stats.maxgrace; 2455 gen_grace = op->stats.maxgrace;
2449 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2456 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2450 } 2457 }
2451 2458
2452 /* Regenerate Spell Points */ 2459 /* Regenerate Spell Points */
2453 if (!op->contr->ranges[range_golem] && --op->last_sp < 0) 2460 if (!op->contr->golem && --op->last_sp < 0)
2454 { 2461 {
2455 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2462 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) 2463 if (op->stats.sp < op->stats.maxsp)
2457 { 2464 {
2458 op->stats.sp++; 2465 op->stats.sp++;
… …
2556 } 2563 }
2557 2564
2558 /* Digestion */ 2565 /* Digestion */
2559 if (--op->last_eat < 0) 2566 if (--op->last_eat < 0)
2560 { 2567 {
2561#ifdef COZY_SERVER
2562 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2563 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2564#else
2565 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2568 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2566#endif
2567 2569
2568 if (op->contr->gen_hp > 0) 2570 if (op->contr->gen_hp > 0)
2569 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2571 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2570 else 2572 else
2571 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2573 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
… …
2916 object *force; 2918 object *force;
2917 int at; 2919 int at;
2918 2920
2919 force = get_archetype (FORCE_NAME); 2921 force = get_archetype (FORCE_NAME);
2920 /* 50 ticks should be enough time for the spell to abate */ 2922 /* 50 ticks should be enough time for the spell to abate */
2921 force->speed = 0.1; 2923 force->speed = 0.1f;
2922 force->speed_left = -5.0; 2924 force->speed_left = -5.f;
2923 SET_FLAG (force, FLAG_APPLIED); 2925 SET_FLAG (force, FLAG_APPLIED);
2924 for (at = 0; at < NROFATTACKS; at++) 2926 for (at = 0; at < NROFATTACKS; at++)
2925 if (will_kill_again & (1 << at)) 2927 if (will_kill_again & (1 << at))
2926 force->resist[at] = 100; 2928 force->resist[at] = 100;
2927 2929
… …
3493 * not readied. 3495 * not readied.
3494 */ 3496 */
3495void 3497void
3496player_unready_range_ob (player *pl, object *ob) 3498player_unready_range_ob (player *pl, object *ob)
3497{ 3499{
3498 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3500 if (pl->ob->current_weapon == ob)
3501 pl->ob->current_weapon = 0;
3502
3503 if (pl->combat_ob == ob)
3504 pl->combat_ob = 0;
3505
3499 if (pl->ranges[i] == ob) 3506 if (pl->ranged_ob == ob)
3500 {
3501 pl->ranges[i] = 0; 3507 pl->ranged_ob = 0;
3502 if (pl->shoottype == i)
3503 pl->shoottype = range_none;
3504 }
3505} 3508}
3506 3509
3507sint8 3510sint8
3508player::visibility_at (maptile *map, int x, int y) const 3511player::visibility_at (maptile *map, int x, int y) const
3509{ 3512{

Diff Legend

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