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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.127 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.142 by root, Sun Apr 13 20:21:50 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <cmath> 24#include <cmath>
25 25
26#include <global.h> 26#include <global.h>
113 { 113 {
114 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
115 { 115 {
116 identify (marked); 116 identify (marked);
117 117
118 buf.printf ("You have %s.", long_desc (marked, pl)); 118 buf.printf ("You have %s.\n\n", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 buf << "The item has a story:\n" << marked->msg; 120 buf << "The item has a story:\n\n" << marked->msg << "\n\n";
121 121
122 return !money; 122 return !money;
123 } 123 }
124 } 124 }
125 125
129 { 129 {
130 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
131 { 131 {
132 identify (id); 132 identify (id);
133 133
134 buf.printf ("You have %s.", long_desc (id, pl)); 134 buf.printf ("You have %s.\n\n", long_desc (id, pl));
135 if (id->msg) 135 if (id->msg)
136 buf << "The item has a story:\n" << id->msg; 136 buf << "The item has a story:\n\n" << id->msg << "\n\n";
137 137
138 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
139 if (!money || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
140 break; 140 break;
141 } 141 }
146 } 146 }
147 } 147 }
148 } 148 }
149 149
150 if (buf.empty ()) 150 if (buf.empty ())
151 buf << ("You have nothing that needs identifying"); 151 pl->failmsg ("You have nothing that needs identifying");
152 152 else
153 pl->contr->infobox ("Identify", buf); 153 pl->contr->infobox (MSG_CHANNEL ("identify"), buf);
154 154
155 return !money; 155 return !money;
156} 156}
157 157
158/** 158/**
623 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 623 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
624 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 624 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
625 weapon->stats.exp || /* speed */ 625 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 626 weapon->stats.ac) /* AC - only taifu's I think */
627 { 627 {
628 op->failmsg ("You cannot prepare magic weapons."); 628 op->failmsg ("You cannot prepare magic weapons. "
629 "H<A weapon is considered magical if it changes regeneration, "
630 "speed or ac.>");
629 return 0; 631 return 0;
630 } 632 }
631 633
632 sacrifice_count = check_sacrifice (op, improver); 634 sacrifice_count = check_sacrifice (op, improver);
633 if (sacrifice_count <= 0) 635 if (sacrifice_count <= 0)
834 if (armour->magic >= settings.armor_max_enchant) 836 if (armour->magic >= settings.armor_max_enchant)
835 { 837 {
836 op->failmsg ("This armour can not be enchanted any further!"); 838 op->failmsg ("This armour can not be enchanted any further!");
837 return 0; 839 return 0;
838 } 840 }
841
839 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 842 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
840 * etc), so take the easy way out and don't worry about it. 843 * etc), so take the easy way out and don't worry about it.
841 * Note - maybe add scrolls which make the random artifact versions (eg, armour 844 * Note - maybe add scrolls which make the random artifact versions (eg, armour
842 * of gnarg and what not?) 845 * of gnarg and what not?)
843 */ 846 */
845 { 848 {
846 op->failmsg ("This armour will not accept further enchantment."); 849 op->failmsg ("This armour will not accept further enchantment.");
847 return 0; 850 return 0;
848 } 851 }
849 852
850 /* Split objects if needed. Can't insert tmp until the 853 /* Split objects if needed. Can't insert tmp until the
851 * end of this function - otherwise it will just re-merge. 854 * end of this function - otherwise it will just re-merge.
852 */ 855 */
853 if (armour->nrof > 1) 856 if (armour->nrof > 1)
854 tmp = get_split_ob (armour, armour->nrof - 1); 857 tmp = get_split_ob (armour, armour->nrof - 1);
855 else 858 else
916} 919}
917 920
918/* 921/*
919 * convert_item() returns 1 if anything was converted, 0 if the item was not 922 * convert_item() returns 1 if anything was converted, 0 if the item was not
920 * what the converter wants, -1 if the converter is broken. 923 * what the converter wants, -1 if the converter is broken.
921 */ 924 *
922#define CONV_FROM(xyz) xyz->slaying
923#define CONV_TO(xyz) xyz->other_arch
924#define CONV_NR(xyz) xyz->stats.sp
925#define CONV_NEED(xyz) xyz->stats.food
926
927/* Takes one items and makes another. 925 * Takes one type of items and makes another.
928 * converter is the object that is doing the conversion. 926 * converter is the object that is doing the conversion.
929 * item is the object that triggered the converter - if it is not 927 * item is the object that triggered the converter - if it is not
930 * what the converter wants, this will not do anything. 928 * what the converter wants, this will not do anything.
931 */ 929 */
932int 930static int
933convert_item (object *item, object *converter) 931convert_item (object *item, object *converter)
934{ 932{
935 int nr = 0;
936 uint32 price_in; 933 sint64 nr, price_in;
934
935 if (item->flag [FLAG_UNPAID])
936 return 0;
937
938 shstr conv_from = converter->slaying;
939 archetype *conv_to = converter->other_arch;
940 sint64 need = converter->stats.food;
941 sint64 give = converter->stats.sp;
937 942
938 /* We make some assumptions - we assume if it takes money as it type, 943 /* We make some assumptions - we assume if it takes money as it type,
939 * it wants some amount. We don't make change (ie, if something costs 944 * it wants some amount. We don't make change (ie, if something costs
940 * 3 gp and player drops a platinum, tough luck) 945 * 3 gp and player drops a platinum, tough luck)
941 */ 946 */
942 if (CONV_FROM (converter) == shstr_money) 947 if (conv_from == shstr_money)
943 { 948 {
944 if (item->type != MONEY) 949 if (item->type != MONEY)
945 return 0; 950 return 0;
946 951
947 nr = (item->nrof * item->value) / CONV_NEED (converter); 952 nr = sint64 (item->nrof) * item->value / need;
948 if (!nr) 953 if (!nr)
949 return 0; 954 return 0;
950 955
951 converter->play_sound (sound_find ("shop_buy")); 956 converter->play_sound (sound_find ("shop_buy"));
952 957
953 int cost = nr * CONV_NEED (converter) / item->value; 958 sint64 cost = (nr * need + item->value - 1) / item->value;
954 /* take into account rounding errors */
955 if (nr * CONV_NEED (converter) % item->value)
956 cost++;
957 959
958 decrease_ob_nr (item, cost); 960 decrease_ob_nr (item, cost);
959 961
960 price_in = cost * item->value; 962 price_in = cost * item->value;
961 } 963 }
962 else 964 else
963 { 965 {
964 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 966 if (item->type == PLAYER
965 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 967 || conv_from != item->arch->archname
968 || (need && need > (uint16) item->nrof))
966 return 0; 969 return 0;
967 970
968 converter->play_sound (sound_find ("convert_item")); 971 converter->play_sound (sound_find ("convert_item"));
969 972
970 if (CONV_NEED (converter)) 973 if (need)
971 { 974 {
972 nr = item->nrof / CONV_NEED (converter); 975 nr = sint64 (item->nrof) / need;
973 decrease_ob_nr (item, nr * CONV_NEED (converter)); 976 decrease_ob_nr (item, nr * need);
974 price_in = nr * CONV_NEED (converter) * item->value; 977 price_in = nr * need * item->value;
975 } 978 }
976 else 979 else
977 { 980 {
978 price_in = item->value; 981 price_in = item->value;
979 item->destroy (); 982 item->destroy ();
996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 999 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
997 unflag_inv (item, FLAG_IS_A_TEMPLATE); 1000 unflag_inv (item, FLAG_IS_A_TEMPLATE);
998 } 1001 }
999 else 1002 else
1000 { 1003 {
1001 if (converter->other_arch == NULL) 1004 if (!conv_to)
1002 { 1005 {
1003 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 1006 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
1004 &converter->name, &converter->map->path, converter->x, converter->y); 1007 &converter->name, &converter->map->path, converter->x, converter->y);
1005 return -1; 1008 return -1;
1006 } 1009 }
1007 1010
1008 item = object_create_arch (converter->other_arch); 1011 item = object_create_arch (conv_to);
1009 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 1012 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1010 } 1013 }
1011 1014
1012 if (CONV_NR (converter)) 1015 if (give)
1013 item->nrof = CONV_NR (converter); 1016 item->nrof = give;
1014 1017
1015 if (nr) 1018 if (nr)
1016 item->nrof *= nr; 1019 item->nrof *= nr;
1017 1020
1018 if (is_in_shop (converter)) 1021 if (is_in_shop (converter))
1019 SET_FLAG (item, FLAG_UNPAID); 1022 SET_FLAG (item, FLAG_UNPAID);
1020 else if (price_in < item->nrof * item->value) 1023 else if (price_in < sint64 (item->nrof) * item->value)
1021 { 1024 {
1022 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1025 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1023 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1026 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1024 /** 1027 /**
1025 * elmex: we are going to let the game continue, as the mapcreator 1028 * elmex: we are going to let the game continue, as the mapcreator
1310 } 1313 }
1311 1314
1312 if (op->contr) 1315 if (op->contr)
1313 if (client *ns = op->contr->ns) 1316 if (client *ns = op->contr->ns)
1314 { 1317 {
1318 if (sign->sound)
1315 ns->play_sound (sign->sound); 1319 ns->play_sound (sign->sound);
1316 msgType = get_readable_message_type (sign); 1320 else if (autoapply)
1321 ns->play_sound (sound_find ("msg_voice"));
1317 1322
1318 if (ns->can_msg) 1323 if (ns->can_msg)
1319 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg); 1324 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1320 else 1325 else
1321 { 1326 {
1322 char newbuf[HUGE_BUF]; 1327 msgType = get_readable_message_type (sign);
1323 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg); 1328 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1324 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1329 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1325 } 1330 }
1326 } 1331 }
1327} 1332}
1328 1333
1329/** 1334/**
1524 * players output. 1529 * players output.
1525 */ 1530 */
1526 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1531 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1527 victim->statusmsg (trap->msg, NDI_NAVY); 1532 victim->statusmsg (trap->msg, NDI_NAVY);
1528 1533
1534 trap->play_sound (trap->sound);
1529 victim->enter_exit (trap); 1535 victim->enter_exit (trap);
1530 } 1536 }
1531 goto leave; 1537 goto leave;
1532 1538
1533 case ENCOUNTER: 1539 case ENCOUNTER:
1600 } 1606 }
1601 1607
1602 lev_diff = tmp->level - (skill_ob->level + 5); 1608 lev_diff = tmp->level - (skill_ob->level + 5);
1603 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1609 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1604 { 1610 {
1605 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension." 1611 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1606 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1612 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1607 : lev_diff < 5 ? "This book is beyond your comprehension." 1613 : lev_diff < 5 ? "This book is beyond your comprehension."
1608 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension." 1614 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1609 : lev_diff < 15 ? "This book is way beyond your comprehension." 1615 : lev_diff < 15 ? "This book is way beyond your comprehension."
1610 : "This book is totally beyond your comprehension."); 1616 : "This book is totally beyond your comprehension.");
1614 readable_message_type *msgType = get_readable_message_type (tmp); 1620 readable_message_type *msgType = get_readable_message_type (tmp);
1615 1621
1616 if (player *pl = op->contr) 1622 if (player *pl = op->contr)
1617 if (client *ns = pl->ns) 1623 if (client *ns = pl->ns)
1618 if (ns->can_msg) 1624 if (ns->can_msg)
1619 { 1625 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1620 dynbuf_text buf;
1621 buf << long_desc (tmp, op)
1622 << "\n\n"
1623 << tmp->msg
1624 << '\0';
1625 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1626 }
1627 else 1626 else
1628 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1627 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1629 msgType->message_type, msgType->message_subtype, 1628 msgType->message_type, msgType->message_subtype,
1630 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1629 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1631 long_desc (tmp, op), &tmp->msg); 1630 long_desc (tmp, op), &tmp->msg);
1998 if (tmp->type == FOOD || tmp->type == FLESH) 1997 if (tmp->type == FOOD || tmp->type == FLESH)
1999 op->failmsg ("You feel full, but what a waste of food!"); 1998 op->failmsg ("You feel full, but what a waste of food!");
2000 else 1999 else
2001 op->statusmsg ("Most of the drink goes down your face not your throat!"); 2000 op->statusmsg ("Most of the drink goes down your face not your throat!");
2002 } 2001 }
2002
2003 tmp->play_sound (
2004 tmp->sound
2005 ? tmp->sound
2006 : tmp->type == DRINK
2007 ? sound_find ("eat_drink")
2008 : sound_find ("eat_food")
2009 );
2003 2010
2004 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 2011 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2005 { 2012 {
2006 const char *buf; 2013 const char *buf;
2007 2014
2278 2285
2279#if 0 //TODO 2286#if 0 //TODO
2280 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2287 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2281 return 0; /* This is a reset town portal */ 2288 return 0; /* This is a reset town portal */
2282#endif 2289#endif
2290
2291 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2283 2292
2284 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2293 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2285 2294
2286 if (exitmap) 2295 if (exitmap)
2287 { 2296 {
2599 if (op->env && (pl->move_type & MOVE_FLYING)) 2608 if (op->env && (pl->move_type & MOVE_FLYING))
2600 { 2609 {
2601 /* player is flying and applying object not in inventory */ 2610 /* player is flying and applying object not in inventory */
2602 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2611 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2603 { 2612 {
2604 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2613 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2605 return 0; 2614 return 0;
2606 } 2615 }
2607 } 2616 }
2608 2617
2609 pl->contr->last_used = op; 2618 pl->contr->last_used = op;
2610 2619
2611 tmp = manual_apply (pl, op, aflag); 2620 tmp = manual_apply (pl, op, aflag);
2612 if (!quiet) 2621 if (!quiet)
2613 { 2622 {
2614 if (tmp == 0) 2623 if (tmp == 0)
2615 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2624 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2616 else if (tmp == 2) 2625 else if (tmp == 2)
2617 op->failmsg ("You must get it first!\n"); 2626 pl->failmsg ("You must get it first!\n");
2618 } 2627 }
2619 2628
2620 return tmp; 2629 return tmp;
2621} 2630}
2622 2631

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines