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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.85 by root, Sun May 4 19:14:23 2008 UTC vs.
Revision 1.109 by root, Sun Mar 28 02:53:45 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 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 (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
261/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, 262/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
262 * make this macro to clean those up. Not usuable outside change_abil 263 * make this macro to clean those up. Not usuable outside change_abil
263 * function since some of the values passed to new_draw_info are hardcoded. 264 * function since some of the values passed to new_draw_info are hardcoded.
264 */ 265 */
265#define DIFF_MSG(flag, msg1, msg2) \ 266#define DIFF_MSG(flag, msg1, msg2) \
266 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 267 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
267 268
268/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */ 269/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
269 270
270/* flag is set to 1 if we are applying the object, -1 if we are removing 271/* flag is set to 1 if we are applying the object, -1 if we are removing
271 * the object. 272 * the object.
… …
400 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low 401 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
401 * status doesn't make a difference if you are flying high 402 * status doesn't make a difference if you are flying high
402 */ 403 */
403 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) 404 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
404 { 405 {
405 DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground."); 406 DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
406 } 407 }
407 408
408 if (tmp->move_type & MOVE_FLY_HIGH) 409 if (tmp->move_type & MOVE_FLY_HIGH)
409 { 410 {
410 /* double conditional - second case covers if you have move_fly_low - 411 /* double conditional - second case covers if you have move_fly_low -
… …
414 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); 415 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
415 } 416 }
416 417
417 if (tmp->move_type & MOVE_SWIM) 418 if (tmp->move_type & MOVE_SWIM)
418 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 419 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
419
420 /* Changing move status may mean you are affected by things you weren't before */
421 check_move_on (op, op);
422 } 420 }
423 421
424 /* becoming UNDEAD... a special treatment for this flag. Only those not 422 /* becoming UNDEAD... a special treatment for this flag. Only those not
425 * originally undead may change their status 423 * originally undead may change their status
426 */ 424 */
… …
594object::drain_specific_stat (int deplete_stats) 592object::drain_specific_stat (int deplete_stats)
595{ 593{
596 object *tmp; 594 object *tmp;
597 archetype *at; 595 archetype *at;
598 596
599 at = archetype::find (ARCH_DEPLETION); 597 at = archetype::find (shstr_depletion);
600 if (!at) 598 if (!at)
601 { 599 {
602 LOG (llevError, "Couldn't find archetype depletion.\n"); 600 LOG (llevError, "Couldn't find archetype depletion.\n");
603 return; 601 return;
604 } 602 }
… …
606 { 604 {
607 tmp = present_arch_in_ob (at, this); 605 tmp = present_arch_in_ob (at, this);
608 606
609 if (!tmp) 607 if (!tmp)
610 { 608 {
611 tmp = arch_to_object (at); 609 tmp = at->instance ();
612 tmp = insert_ob_in_ob (tmp, this); 610 tmp = insert_ob_in_ob (tmp, this);
613 SET_FLAG (tmp, FLAG_APPLIED); 611 SET_FLAG (tmp, FLAG_APPLIED);
614 } 612 }
615 } 613 }
616 614
… …
624 * via an applied bad_luck object. 622 * via an applied bad_luck object.
625 */ 623 */
626void 624void
627object::change_luck (int value) 625object::change_luck (int value)
628{ 626{
629 archetype *at = archetype::find ("luck"); 627 archetype *at = archetype::find (shstr_luck);
630 if (!at) 628 if (!at)
631 LOG (llevError, "Couldn't find archetype luck.\n"); 629 LOG (llevError, "Couldn't find archetype luck.\n");
632 else 630 else
633 { 631 {
634 object *tmp = present_arch_in_ob (at, this); 632 object *tmp = present_arch_in_ob (at, this);
… …
636 if (!tmp) 634 if (!tmp)
637 { 635 {
638 if (!value) 636 if (!value)
639 return; 637 return;
640 638
641 tmp = arch_to_object (at); 639 tmp = at->instance ();
642 tmp = insert_ob_in_ob (tmp, this); 640 tmp = insert_ob_in_ob (tmp, this);
643 SET_FLAG (tmp, FLAG_APPLIED); 641 SET_FLAG (tmp, FLAG_APPLIED);
644 } 642 }
645 643
646 if (value) 644 if (value)
… …
763 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 761 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
764 object *grace_obj = NULL, *mana_obj = NULL, *tmp; 762 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
765 float old_speed = speed; 763 float old_speed = speed;
766 int stat_sum [NUM_STATS]; 764 int stat_sum [NUM_STATS];
767 765
766 MoveType move_type; // we use change_move_type to change it, so use a local copy
767
768 /* First task is to clear all the values back to their original values */ 768 /* First task is to clear all the values back to their original values */
769 if (type == PLAYER) 769 if (type == PLAYER)
770 { 770 {
771 contr->delayed_update = false;
772
771 for (int i = 0; i < NUM_STATS; i++) 773 for (int i = 0; i < NUM_STATS; i++)
772 stat_sum [i] = contr->orig_stats.stat (i); 774 stat_sum [i] = contr->orig_stats.stat (i);
773 775
774 if (settings.spell_encumbrance == TRUE) 776 if (settings.spell_encumbrance == TRUE)
775 contr->encumbrance = 0; 777 contr->encumbrance = 0;
… …
808 path_repelled = arch->path_repelled; 810 path_repelled = arch->path_repelled;
809 path_denied = arch->path_denied; 811 path_denied = arch->path_denied;
810 glow_radius = arch->glow_radius; 812 glow_radius = arch->glow_radius;
811 move_type = arch->move_type; 813 move_type = arch->move_type;
812 814
813 chosen_skill = 0; 815 object *chosen_skill = 0;
814 816
815 /* initializing resistances from the values in player/monster's 817 /* initializing resistances from the values in player/monster's
816 * archetype clone 818 * archetype clone
817 */ 819 */
818 memcpy (&resist, &arch->resist, sizeof (resist)); 820 memcpy (&resist, &arch->resist, sizeof (resist));
… …
858 * then calls this function. 860 * then calls this function.
859 */ 861 */
860 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
861 continue; 863 continue;
862 864
863 /* See note in map.c:update_position about making this additive
864 * since light sources are never applied, need to put check here.
865 */
866 glow_radius = max (glow_radius, tmp->glow_radius); 865 glow_radius += tmp->glow_radius;
867 866
868 /* For some things, we don't care what is equipped */ 867 /* For some things, we don't care what is equipped */
869 if (tmp->type == SKILL) 868 if (tmp->type == SKILL)
870 { 869 {
871 /* Want to take the highest skill here. */ 870 /* Want to take the highest skill here. */
… …
896 * up, etc. 895 * up, etc.
897 */ 896 */
898 if ((tmp->flag [FLAG_APPLIED] 897 if ((tmp->flag [FLAG_APPLIED]
899 && tmp->type != CONTAINER 898 && tmp->type != CONTAINER
900 && tmp->type != CLOSE_CON) 899 && tmp->type != CLOSE_CON)
901 || (tmp->type == SKILL
902 && tmp->subtype == SK_PRAYING)) 900 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
903 { 901 {
904 if (type == PLAYER) 902 if (type == PLAYER)
905 { 903 {
906 contr->item_power += tmp->item_power; 904 contr->item_power += tmp->item_power;
907 905
… …
911 && !tmp->flag [FLAG_CURSED] 909 && !tmp->flag [FLAG_CURSED]
912 && !tmp->flag [FLAG_DAMNED]) 910 && !tmp->flag [FLAG_DAMNED])
913 continue; 911 continue;
914 912
915 for (int i = 0; i < NUM_STATS; i++) 913 for (int i = 0; i < NUM_STATS; i++)
916 stat_sum [i] = stat_sum [i] + tmp->stats.stat (i); 914 stat_sum [i] += tmp->stats.stat (i);
917 915
918 if (digest_types [tmp->type]) 916 if (digest_types [tmp->type])
919 { 917 {
920 contr->digestion += tmp->stats.food; 918 contr->digestion += tmp->stats.food;
921 contr->gen_hp += tmp->stats.hp; 919 contr->gen_hp += tmp->stats.hp;
920 if (tmp->type != BOW) // ugly exception for bows
922 contr->gen_sp += tmp->stats.sp; 921 contr->gen_sp += tmp->stats.sp;
923 contr->gen_grace += tmp->stats.grace; 922 contr->gen_grace += tmp->stats.grace;
924 contr->gen_sp_armour += tmp->gen_sp_armour; 923 contr->gen_sp_armour += tmp->gen_sp_armour;
925 } 924 }
926 } /* if this is a player */ 925 } /* if this is a player */
927 else 926 else
… …
998 added_speed += tmp->stats.exp; 997 added_speed += tmp->stats.exp;
999 } 998 }
1000 999
1001 switch (tmp->type) 1000 switch (tmp->type)
1002 { 1001 {
1003#if 0
1004 case WAND:
1005 case ROD:
1006 case HORN:
1007 if (type != PLAYER || current_weapon == tmp)
1008 chosen_skill = tmp;
1009 break;
1010#endif
1011
1012 /* skills modifying the character -b.t. */ 1002 /* skills modifying the character -b.t. */
1013 /* for all skills and skill granting objects */ 1003 /* for all skills and skill granting objects */
1014 case SKILL: 1004 case SKILL:
1015 { 1005 {
1016 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY) 1006 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
… …
1077 if (tmp->stats.ac) 1067 if (tmp->stats.ac)
1078 ac -= tmp->stats.ac + tmp->magic; 1068 ac -= tmp->stats.ac + tmp->magic;
1079 1069
1080 break; 1070 break;
1081 1071
1072 case WAND:
1073 case ROD:
1074 case HORN:
1075 case SKILL_TOOL:
1076 if (type != PLAYER)
1077 chosen_skill = find_skill_by_name (this, tmp->skill);
1078 break;
1079
1082 case BOW: 1080 case BOW:
1083 case WEAPON: 1081 case WEAPON:
1084 if (type != PLAYER || current_weapon == tmp) 1082 if (type != PLAYER || current_weapon == tmp)
1085 { 1083 {
1084 chosen_skill = find_skill_by_name (this, tmp->skill);
1085
1086 wc -= tmp->stats.wc + tmp->magic; 1086 wc -= tmp->stats.wc + tmp->magic;
1087 1087
1088 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1088 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1089 ac -= tmp->stats.ac + tmp->magic; 1089 ac -= tmp->stats.ac + tmp->magic;
1090 1090
… …
1136 else /* To nullify the below effect */ 1136 else /* To nullify the below effect */
1137 ac += tmp->stats.ac + tmp->magic; 1137 ac += tmp->stats.ac + tmp->magic;
1138 } 1138 }
1139 1139
1140 if (tmp->stats.wc) 1140 if (tmp->stats.wc)
1141 wc -= (tmp->stats.wc + tmp->magic); 1141 wc -= tmp->stats.wc + tmp->magic;
1142 1142
1143 if (tmp->stats.ac) 1143 if (tmp->stats.ac)
1144 ac -= (tmp->stats.ac + tmp->magic); 1144 ac -= tmp->stats.ac + tmp->magic;
1145 1145
1146 if (ARMOUR_SPEED (tmp)) 1146 if (ARMOUR_SPEED (tmp))
1147 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); 1147 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1148 1148
1149 break; 1149 break;
1150 } /* switch tmp->type */ 1150 } /* switch tmp->type */
1151 } /* item is equipped */ 1151 } /* item is equipped */
1152 } /* for loop of items */ 1152 } /* for loop of items */
1153
1154 if (type != PLAYER)
1155 this->chosen_skill = chosen_skill;
1156
1157 glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
1153 1158
1154 /* We've gone through all the objects the player has equipped. For many things, we 1159 /* We've gone through all the objects the player has equipped. For many things, we
1155 * have generated intermediate values which we now need to assign. 1160 * have generated intermediate values which we now need to assign.
1156 */ 1161 */
1157 1162
… …
1171 1176
1172 if (type == PLAYER) 1177 if (type == PLAYER)
1173 { 1178 {
1174 // clamp various player stats 1179 // clamp various player stats
1175 for (int i = 0; i < NUM_STATS; ++i) 1180 for (int i = 0; i < NUM_STATS; ++i)
1176 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT); 1181 stats.stat (i) = stat_sum [i];
1182
1183 check_stat_bounds (&stats);
1177 1184
1178 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION); 1185 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1179 1186
1180 /* Figure out the players sp/mana/hp totals. */ 1187 /* Figure out the players sp/mana/hp totals. */
1181 int pl_level; 1188 int pl_level;
1182 1189
1183 check_stat_bounds (&(stats));
1184 pl_level = level;
1185
1186 if (pl_level < 1)
1187 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1190 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1188 1191
1189 /* You basically get half a con bonus/level. But we do take into account rounding, 1192 /* You basically get half a con bonus/level. But we do take into account rounding,
1190 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1193 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1191 */ 1194 */
1192 stats.maxhp = 0; 1195 stats.maxhp = 0;
… …
1327 1330
1328 speed = 1.f + speed_bonus[stats.Dex]; 1331 speed = 1.f + speed_bonus[stats.Dex];
1329 1332
1330 if (settings.search_items && contr->search_str[0]) 1333 if (settings.search_items && contr->search_str[0])
1331 speed -= 1; 1334 speed -= 1;
1332
1333 if (attacktype == 0)
1334 attacktype = arch->attacktype;
1335 } /* End if player */ 1335 } /* End if player */
1336 1336
1337 if (added_speed >= 0) 1337 if (added_speed >= 0)
1338 speed += added_speed / 10.f; 1338 speed += added_speed / 10.f;
1339 else /* Something wrong here...: */ 1339 else /* Something wrong here...: */
… …
1358 speed *= speed_reduce_from_disease; 1358 speed *= speed_reduce_from_disease;
1359 1359
1360 /* Put a lower limit on speed. Note with this speed, you move once every 1360 /* Put a lower limit on speed. Note with this speed, you move once every
1361 * 25 ticks or so. This amounts to once every 3 seconds of realtime. 1361 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1362 */ 1362 */
1363 if (speed < 0.04f && type == PLAYER) 1363 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1364 speed = 0.04f;
1365 1364
1366 if (speed != old_speed) 1365 if (speed != old_speed)
1367 set_speed (speed); 1366 set_speed (speed);
1368 1367
1369 if (type == PLAYER) 1368 if (type == PLAYER)
… …
1404 if (move_type == 0) 1403 if (move_type == 0)
1405 move_type = MOVE_WALK; 1404 move_type = MOVE_WALK;
1406 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1405 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1407 move_type &= ~MOVE_WALK; 1406 move_type &= ~MOVE_WALK;
1408 1407
1408 // now apply the new move_type
1409 if (this->move_type != move_type)
1410 change_move_type (move_type);
1411
1409 /* It is quite possible that a player's spell costing might have changed, 1412 /* It is quite possible that a player's spell costing might have changed,
1410 * so we will check that now. 1413 * so we will check that now.
1411 */ 1414 */
1412 if (type == PLAYER) 1415 if (is_player ())
1413 { 1416 contr->update_spells ();
1414 esrv_update_stats (contr);
1415 esrv_update_spells (contr);
1416 }
1417 1417
1418 // update the mapspace, if we are on a map 1418 // update the mapspace, if we are on a map
1419 if (!flag [FLAG_REMOVED] && map) 1419 if (!flag [FLAG_REMOVED] && map)
1420 map->at (x, y).flags_ = 0; 1420 map->at (x, y).flags_ = 0;
1421}
1422
1423void
1424object::set_glow_radius (sint8 rad)
1425{
1426 glow_radius = rad;
1427
1428 if (is_on_map ())
1429 update_all_los (map, x, y);
1430 else if (object *env = outer_env ())
1431 {
1432 env->update_stats ();
1433
1434 if (env->is_on_map ())
1435 update_all_los (env->map, env->x, env->y);
1436 }
1421} 1437}
1422 1438
1423/* 1439/*
1424 * Returns true if the given player is a legal class. 1440 * Returns true if the given player is a legal class.
1425 * The function to add and remove class-bonuses to the stats doesn't 1441 * The function to add and remove class-bonuses to the stats doesn't
… …
1441 1457
1442/* 1458/*
1443 * set the new dragon name after gaining levels or 1459 * set the new dragon name after gaining levels or
1444 * changing ability focus (later this can be extended to 1460 * changing ability focus (later this can be extended to
1445 * eventually change the player's face and animation) 1461 * eventually change the player's face and animation)
1446 *
1447 * Note that the title is written to 'own_title' in the
1448 * player struct. This should be changed to 'ext_title'
1449 * as soon as clients support this!
1450 * Please, anyone, write support for 'ext_title'.
1451 */ 1462 */
1452void 1463void
1453set_dragon_name (object *pl, const object *abil, const object *skin) 1464set_dragon_name (object *pl, const object *abil, const object *skin)
1454{ 1465{
1455 int atnr = -1; /* attacknumber of highest level */ 1466 int atnr = -1; /* attacknumber of highest level */
… …
1473 /* now if there are equals at highest level, pick the one with focus, 1484 /* now if there are equals at highest level, pick the one with focus,
1474 or else at random */ 1485 or else at random */
1475 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1486 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1476 atnr = abil->stats.exp; 1487 atnr = abil->stats.exp;
1477 1488
1478 level = (int) (level / 25.);
1479
1480 /* now set the new title */ 1489 /* now set the new title */
1481 if (pl->contr)
1482 {
1483 if (level == 0)
1484 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1490 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1485 else if (level == 1)
1486 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1491 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1487 else if (level == 2)
1488 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1492 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1489 else if (level == 3)
1490 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1493 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1491 else 1494 else
1492 { 1495 {
1493 /* special titles for extra high resistance! */ 1496 /* special titles for extra high resistance! */
1494 if (skin->resist[atnr] > 80)
1495 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1497 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1496 else if (skin->resist[atnr] > 50)
1497 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1498 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1498 else
1499 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1499 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1500 }
1501 } 1500 }
1502 1501
1503 strcpy (pl->contr->own_title, ""); 1502 strcpy (pl->contr->own_title, "");
1504} 1503}
1505 1504
1506/* 1505/*
1507 * This function is called when a dragon-player gains 1506 * This function is called when a dragon-player gains
1508 * an overall level. Here, the dragon might gain new abilities 1507 * an overall level. Here, the dragon might gain new abilities
1509 * or change the ability-focus. 1508 * or change the ability-focus.
1510 */ 1509 */
1511void 1510static void
1512dragon_level_gain (object *who) 1511dragon_level_gain (object *who)
1513{ 1512{
1514 object *abil = NULL; /* pointer to dragon ability force */ 1513 object *abil = NULL; /* pointer to dragon ability force */
1515 object *skin = NULL; /* pointer to dragon skin force */ 1514 object *skin = NULL; /* pointer to dragon skin force */
1516 object *tmp = NULL; /* tmp. object */ 1515 object *tmp = NULL; /* tmp. object */
… …
1572 object *skill_obj; 1571 object *skill_obj;
1573 1572
1574 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1573 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1575 if (!skill_obj) 1574 if (!skill_obj)
1576 { 1575 {
1577 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1576 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1578 return NULL; 1577 return NULL;
1579 } 1578 }
1580 1579
1581 /* clear the flag - exp goes into this bucket, but player 1580 /* clear the flag - exp goes into this bucket, but player
1582 * still doesn't know it. 1581 * still doesn't know it.
1583 */ 1582 */
1584 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1583 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1585 skill_obj->stats.exp = 0; 1584 skill_obj->stats.exp = 0;
1586 skill_obj->level = 1; 1585 skill_obj->level = 1;
1587 insert_ob_in_ob (skill_obj, op); 1586 op->insert (skill_obj);
1588 1587
1589 if (player *pl = op->contr) 1588 if (player *pl = op->contr)
1590 { 1589 pl->link_skills ();
1591 pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1592 if (pl->ns)
1593 pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1594 }
1595 1590
1596 return skill_obj; 1591 return skill_obj;
1597} 1592}
1598 1593
1599/* player_lvl_adj() - for the new exp system. we are concerned with 1594/* player_lvl_adj() - for the new exp system. we are concerned with
… …
1616 { 1611 {
1617 changed = true; 1612 changed = true;
1618 1613
1619 op->level++; 1614 op->level++;
1620 1615
1621 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1616 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1622 dragon_level_gain (who); 1617 dragon_level_gain (who);
1623 1618
1624 /* Only roll these if it is the player (who) that gained the level */ 1619 /* Only roll these if it is the player (who) that gained the level */
1625 if (op == who && (who->level < 11) && who->type == PLAYER) 1620 if (op == who && (who->level < 11) && who->type == PLAYER)
1626 { 1621 {
… …
1659 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1654 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1660 } 1655 }
1661 } 1656 }
1662 1657
1663 if (changed) 1658 if (changed)
1664 { 1659 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1665 who->update_stats ();
1666 esrv_update_stats (who->contr);
1667 /* check if the spell data has changed */
1668 esrv_update_spells (who->contr);
1669 }
1670} 1660}
1671 1661
1672/* 1662/*
1673 * Returns how much experience is needed for a player to become 1663 * Returns how much experience is needed for a player to become
1674 * the given level. level should really never exceed max_level 1664 * the given level. level should really never exceed max_level
… …
1718 * flag is what to do if the player doesn't have the skill: 1708 * flag is what to do if the player doesn't have the skill:
1719 */ 1709 */
1720static void 1710static void
1721add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1711add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1722{ 1712{
1723 object *skill_obj = NULL; 1713 object *skill_obj;
1724 sint64 limit, exp_to_add; 1714 sint64 limit, exp_to_add;
1725 int i; 1715 int i;
1726 1716
1727 /* prevents some forms of abuse. */ 1717 /* prevents some forms of abuse. */
1728 if (op->contr->braced) 1718 if (op->contr->braced)
… …
1731 /* Try to find the matching skill. 1721 /* Try to find the matching skill.
1732 * We do a shortcut/time saving mechanism first - see if it matches 1722 * We do a shortcut/time saving mechanism first - see if it matches
1733 * chosen_skill. This means we don't need to search through 1723 * chosen_skill. This means we don't need to search through
1734 * the players inventory. 1724 * the players inventory.
1735 */ 1725 */
1726 skill_obj = 0;
1727
1736 if (skill_name) 1728 if (skill_name)
1737 { 1729 {
1738 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1730 skill_obj = op->contr->find_skill (skill_name);
1739 skill_obj = op->chosen_skill;
1740 else
1741 {
1742 for (i = 0; i < NUM_SKILLS; i++)
1743 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1744 {
1745 skill_obj = op->contr->last_skill_ob[i];
1746 break;
1747 }
1748 1731
1749 /* Player doesn't have the skill. Check to see what to do, and give 1732 /* Player doesn't have the skill. Check to see what to do, and give
1750 * it to the player if necessary 1733 * it to the player if necessary
1751 */ 1734 */
1752 if (!skill_obj) 1735 if (!skill_obj)
1753 { 1736 {
1754 if (flag == SK_EXP_NONE) 1737 if (flag == SK_EXP_NONE)
1755 return; 1738 return;
1739
1756 else if (flag == SK_EXP_ADD_SKILL) 1740 if (flag == SK_EXP_ADD_SKILL)
1757 give_skill_by_name (op, skill_name); 1741 skill_obj = give_skill_by_name (op, skill_name);
1758 }
1759 } 1742 }
1760 } 1743 }
1761 1744
1762 if (flag != SK_EXP_SKILL_ONLY) 1745 if (flag != SK_EXP_SKILL_ONLY)
1763 { 1746 {
… …
1796 player_lvl_adj (op, skill_obj); 1779 player_lvl_adj (op, skill_obj);
1797 } 1780 }
1798} 1781}
1799 1782
1800/* This function checks to make sure that object 'op' can 1783/* This function checks to make sure that object 'op' can
1801 * lost 'exp' experience. It returns the amount of exp 1784 * lose 'exp' experience. It returns the amount of exp
1802 * object 'op' can in fact lose - it basically makes 1785 * object 'op' can in fact lose - it basically makes
1803 * adjustments based on permanent exp and the like. 1786 * adjustments based on permanent exp and the like.
1804 * This function should always be used for losing experience - 1787 * This function should always be used for losing experience -
1805 * the 'exp' value passed should be positive - this is the 1788 * the 'exp' value passed should be positive - this is the
1806 * amount that should get subtract from the player. 1789 * amount that should get subtract from the player.
1807 */ 1790 */
1808sint64 1791static sint64
1809check_exp_loss (const object *op, sint64 exp) 1792check_exp_loss (const object *op, sint64 exp)
1810{ 1793{
1811 sint64 del_exp; 1794 sint64 del_exp;
1812 1795
1813 if (exp > op->stats.exp) 1796 if (exp > op->stats.exp)
1814 exp = op->stats.exp; 1797 exp = op->stats.exp;
1798
1815 if (settings.permanent_exp_ratio) 1799 if (settings.permanent_exp_ratio)
1816 { 1800 {
1817 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1801 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1802
1818 if (del_exp < 0) 1803 if (del_exp < 0)
1819 del_exp = 0; 1804 del_exp = 0;
1805
1820 if (exp > del_exp) 1806 if (exp > del_exp)
1821 exp = del_exp; 1807 exp = del_exp;
1822 } 1808 }
1809
1823 return exp; 1810 return exp;
1824} 1811}
1825 1812
1826sint64 1813sint64
1827check_exp_adjust (const object *op, sint64 exp) 1814check_exp_adjust (const object *op, sint64 exp)
1828{ 1815{
1829 if (exp < 0) 1816 if (exp < 0)
1830 return check_exp_loss (op, exp); 1817 return check_exp_loss (op, exp);
1831 else 1818 else
1832 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1819 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1833} 1820}
1834
1835 1821
1836/* Subtracts experience from player. 1822/* Subtracts experience from player.
1837 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1823 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1838 * only subtract from the matching skill. Otherwise, 1824 * only subtract from the matching skill. Otherwise,
1839 * this subtracts a portion from all 1825 * this subtracts a portion from all
… …
1853 sint64 del_exp; 1839 sint64 del_exp;
1854 1840
1855 for (tmp = op->inv; tmp; tmp = tmp->below) 1841 for (tmp = op->inv; tmp; tmp = tmp->below)
1856 if (tmp->type == SKILL && tmp->stats.exp) 1842 if (tmp->type == SKILL && tmp->stats.exp)
1857 { 1843 {
1858 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1844 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1859 { 1845 {
1860 del_exp = check_exp_loss (tmp, exp); 1846 del_exp = check_exp_loss (tmp, exp);
1861 tmp->stats.exp -= del_exp; 1847 tmp->stats.exp -= del_exp;
1862 player_lvl_adj (op, tmp); 1848 player_lvl_adj (op, tmp);
1863 } 1849 }
… …
1951 * amount of permenent experience, whichever gives the lowest loss. 1937 * amount of permenent experience, whichever gives the lowest loss.
1952 */ 1938 */
1953void 1939void
1954apply_death_exp_penalty (object *op) 1940apply_death_exp_penalty (object *op)
1955{ 1941{
1956 object *tmp;
1957 sint64 loss; 1942 sint64 loss;
1958 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1943 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1959 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1944 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1960 1945
1961 for (tmp = op->inv; tmp; tmp = tmp->below) 1946 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1962 if (tmp->type == SKILL && tmp->stats.exp) 1947 if (tmp->type == SKILL && tmp->stats.exp)
1963 { 1948 {
1964
1965 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1949 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1966 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1950 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1967 1951
1968 /* With the revised exp system, you can get cases where 1952 /* With the revised exp system, you can get cases where
1969 * losing several levels would still require that you have more 1953 * losing several levels would still require that you have more
1970 * exp than you currently have - this is true if the levels 1954 * exp than you currently have - this is true if the levels
1971 * tables is a lot harder. 1955 * tables is a lot harder.
1972 */ 1956 */
1973 if (level_loss < 0) 1957 if (level_loss < 0)
1974 level_loss = 0; 1958 level_loss = 0;
1975 1959
1976 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1960 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1977 1961
1978 tmp->stats.exp -= loss; 1962 tmp->stats.exp -= loss;
1979 player_lvl_adj (op, tmp); 1963 player_lvl_adj (op, tmp);
1980 } 1964 }
1981 1965
1982 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1966 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1983 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1967 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1984 1968
1985 if (level_loss < 0) 1969 if (level_loss < 0)
1986 level_loss = 0; 1970 level_loss = 0;
1971
1987 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1972 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1988 1973
1989 op->stats.exp -= loss; 1974 op->stats.exp -= loss;
1990 player_lvl_adj (op, NULL); 1975 player_lvl_adj (op, NULL);
1991} 1976}
1992 1977

Diff Legend

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