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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.70 by root, Wed Apr 2 11:13:52 2008 UTC vs.
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
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
… …
32 32
33//#define TREASURE_VERBOSE 33//#define TREASURE_VERBOSE
34 34
35#include <global.h> 35#include <global.h>
36#include <treasure.h> 36#include <treasure.h>
37#include <funcpoint.h>
38#include <loader.h> 37#include <loader.h>
39 38
40extern char *spell_mapping[]; 39extern char *spell_mapping[];
41 40
42static treasurelist *first_treasurelist; 41static treasurelist *first_treasurelist;
… …
46typedef std::tr1::unordered_map< 45typedef std::tr1::unordered_map<
47 const char *, 46 const char *,
48 treasurelist *, 47 treasurelist *,
49 str_hash, 48 str_hash,
50 str_equal, 49 str_equal,
51 slice_allocator< std::pair<const char *const, treasurelist *> >, 50 slice_allocator< std::pair<const char *const, treasurelist *> >
52 true
53> tl_map_t; 51> tl_map_t;
54 52
55static tl_map_t tl_map; 53static tl_map_t tl_map;
56 54
57/* 55/*
… …
144 coroapi::cede_to_tick (); 142 coroapi::cede_to_tick ();
145 143
146 switch (f.kw) 144 switch (f.kw)
147 { 145 {
148 case KW_arch: 146 case KW_arch:
149 t->item = archetype::get (f.get_str ()); 147 t->item = archetype::find (f.get_str ());
148
149 if (!t->item)
150 {
151 f.parse_warn ("treasure references unknown archetype");
152 t->item = archetype::empty;
153 }
154
150 break; 155 break;
151 156
152 case KW_list: f.get (t->name); break; 157 case KW_list: f.get (t->name); break;
153 case KW_change_name: f.get (t->change_arch.name); break; 158 case KW_change_name: f.get (t->change_arch.name); break;
154 case KW_change_title: f.get (t->change_arch.title); break; 159 case KW_change_title: f.get (t->change_arch.title); break;
… …
168 t->next = read_treasure (f); 173 t->next = read_treasure (f);
169 return t; 174 return t;
170 175
171 default: 176 default:
172 if (!f.parse_error ("treasurelist", t->name)) 177 if (!f.parse_error ("treasurelist", t->name))
173 return 0; 178 goto error;
174 179
175 return t; 180 return t;
176 } 181 }
177 182
178 f.next (); 183 f.next ();
179 } 184 }
185
186 // not reached
187
188error:
189 delete t;
190 return 0;
180} 191}
181 192
182/* 193/*
183 * Each treasure is parsed with the help of load_treasure(). 194 * Each treasure is parsed with the help of load_treasure().
184 */ 195 */
… …
243 return; 254 return;
244 } 255 }
245 256
246 op->expand_tail (); 257 op->expand_tail ();
247 258
248 if (op->blocked (creator->map, creator->x, creator->y)) 259 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
249 op->destroy (); 260 op->destroy ();
250 else 261 else
251 { 262 {
252 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 263 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
253 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 264 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
… …
257 { 268 {
258 op = creator->insert (op); 269 op = creator->insert (op);
259 270
260 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 271 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
261 monster_check_apply (creator, op); 272 monster_check_apply (creator, op);
262
263 if (flags & GT_UPDATE_INV)
264 if (object *tmp = creator->in_player ())
265 esrv_send_item (tmp, op);
266 } 273 }
267} 274}
268 275
269/* if there are change_xxx commands in the treasure, we include the changes 276/* if there are change_xxx commands in the treasure, we include the changes
270 * in the generated object 277 * in the generated object
… …
570 if (op->type == ARMOUR) 577 if (op->type == ARMOUR)
571 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100; 578 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
572 579
573 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 580 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
574 magic = (-magic); 581 magic = (-magic);
582
575 op->weight = (op->arch->weight * (100 - magic * 10)) / 100; 583 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
576 } 584 }
577 else 585 else
578 { 586 {
579 if (op->type == ARMOUR) 587 if (op->type == ARMOUR)
580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 588 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
589
581 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 590 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
582 magic = (-magic); 591 magic = (-magic);
592
583 op->weight = (op->weight * (100 - magic * 10)) / 100; 593 op->weight = (op->weight * (100 - magic * 10)) / 100;
584 } 594 }
585} 595}
586 596
587/* 597/*
… …
816 ARG_INT (flags))) 826 ARG_INT (flags)))
817 return; 827 return;
818 828
819 if (!(flags & GT_MINIMAL)) 829 if (!(flags & GT_MINIMAL))
820 { 830 {
821 if (op->arch == crown_arch) 831 if (IS_ARCH (op->arch, crown))
822 { 832 {
823 set_magic (difficulty, op, max_magic, flags); 833 set_magic (difficulty, op, max_magic, flags);
824 num_enchantments = calc_item_power (op, 1); 834 num_enchantments = calc_item_power (op, 1);
825 generate_artifact (op, difficulty); 835 generate_artifact (op, difficulty);
826 } 836 }
… …
831 841
832 num_enchantments = calc_item_power (op, 1); 842 num_enchantments = calc_item_power (op, 1);
833 843
834 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 844 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
835 || op->type == HORN 845 || op->type == HORN
836 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 846 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
837 * used for shop_floors or treasures */
838 generate_artifact (op, difficulty); 847 generate_artifact (op, difficulty);
839 } 848 }
840 849
841 /* Object was made an artifact. Calculate its item_power rating. 850 /* Object was made an artifact. Calculate its item_power rating.
842 * the item_power in the object is what the artfiact adds. 851 * the item_power in the object is what the artfiact adds.
… …
884 { 893 {
885 if (op->type == POTION) 894 if (op->type == POTION)
886 /* Handle healing and magic power potions */ 895 /* Handle healing and magic power potions */
887 if (op->stats.sp && !op->randomitems) 896 if (op->stats.sp && !op->randomitems)
888 { 897 {
889 object *tmp;
890
891 tmp = get_archetype (spell_mapping[op->stats.sp]); 898 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
892 insert_ob_in_ob (tmp, op); 899 insert_ob_in_ob (tmp, op);
893 op->stats.sp = 0; 900 op->stats.sp = 0;
894 } 901 }
895 } 902 }
896 else if (!op->title) /* Only modify object if not special */ 903 else if (!op->title) /* Only modify object if not special */
… …
954 SET_FLAG (op, FLAG_CURSED); 961 SET_FLAG (op, FLAG_CURSED);
955 break; 962 break;
956 } 963 }
957 964
958 case AMULET: 965 case AMULET:
959 if (op->arch == amulet_arch) 966 if (IS_ARCH (op->arch, amulet))
960 op->value *= 5; /* Since it's not just decoration */ 967 op->value *= 5; /* Since it's not just decoration */
961 968
962 case RING: 969 case RING:
963 if (op->arch == NULL) 970 if (!op->arch) // wtf? schmorp
964 { 971 {
965 op->destroy (); 972 op->destroy ();
966 op = 0; 973 op = 0;
967 break; 974 break;
968 } 975 }
969 976
970 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 977 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
971 break; 978 break;
972 979
973 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 980 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
974 SET_FLAG (op, FLAG_CURSED); 981 SET_FLAG (op, FLAG_CURSED);
975 982
… …
1155 1162
1156 return 0; 1163 return 0;
1157} 1164}
1158 1165
1159/* 1166/*
1160 * For debugging purposes. Dumps all tables.
1161 */
1162void
1163dump_artifacts (void)
1164{
1165 artifactlist *al;
1166 artifact *art;
1167 linked_char *next;
1168
1169 fprintf (logfile, "\n");
1170 for (al = first_artifactlist; al != NULL; al = al->next)
1171 {
1172 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1173 for (art = al->items; art != NULL; art = art->next)
1174 {
1175 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1176 if (art->allowed != NULL)
1177 {
1178 fprintf (logfile, "\tallowed combinations:");
1179 for (next = art->allowed; next != NULL; next = next->next)
1180 fprintf (logfile, "%s,", &next->name);
1181 fprintf (logfile, "\n");
1182 }
1183 }
1184 }
1185 fprintf (logfile, "\n");
1186}
1187
1188/*
1189 * For debugging purposes. Dumps all treasures recursively (see below).
1190 */
1191void
1192dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1193{
1194 treasurelist *tl;
1195 int i;
1196
1197 if (depth > 100)
1198 return;
1199
1200 while (t)
1201 {
1202 if (t->name)
1203 {
1204 for (i = 0; i < depth; i++)
1205 fprintf (logfile, " ");
1206
1207 fprintf (logfile, "{ (list: %s)\n", &t->name);
1208
1209 tl = treasurelist::find (t->name);
1210 if (tl)
1211 dump_monster_treasure_rec (name, tl->items, depth + 2);
1212
1213 for (i = 0; i < depth; i++)
1214 fprintf (logfile, " ");
1215
1216 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1217 }
1218 else
1219 {
1220 for (i = 0; i < depth; i++)
1221 fprintf (logfile, " ");
1222
1223 if (t->item && t->item->type == FLESH)
1224 fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1225 else
1226 fprintf (logfile, "%s\n", &t->item->object::name);
1227 }
1228
1229 if (t->next_yes)
1230 {
1231 for (i = 0; i < depth; i++)
1232 fprintf (logfile, " ");
1233
1234 fprintf (logfile, " (if yes)\n");
1235 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1236 }
1237
1238 if (t->next_no)
1239 {
1240 for (i = 0; i < depth; i++)
1241 fprintf (logfile, " ");
1242
1243 fprintf (logfile, " (if no)\n");
1244 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1245 }
1246
1247 t = t->next;
1248 }
1249}
1250
1251/*
1252 * For debugging purposes. Dumps all treasures for a given monster.
1253 * Created originally by Raphael Quinet for debugging the alchemy code.
1254 */
1255void
1256dump_monster_treasure (const char *name)
1257{
1258 archetype *at;
1259 int found;
1260
1261 found = 0;
1262 fprintf (logfile, "\n");
1263
1264 for_all_archetypes (at)
1265 if (!strcasecmp (at->object::name, name) && at->title == NULL)
1266 {
1267 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1268 if (at->randomitems != NULL)
1269 dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1270 else
1271 fprintf (logfile, "(nothing)\n");
1272
1273 fprintf (logfile, "\n");
1274 found++;
1275 }
1276
1277 if (found == 0)
1278 fprintf (logfile, "No objects have the name %s!\n\n", name);
1279}
1280
1281/*
1282 * Builds up the lists of artifacts from the file in the libdir. 1167 * Builds up the lists of artifacts from the file in the libdir.
1283 */ 1168 */
1284void 1169void
1285init_artifacts (void) 1170init_artifacts (void)
1286{ 1171{

Diff Legend

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