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.69 by root, Tue Jan 22 15:53:01 2008 UTC vs.
Revision 1.73 by root, Sun Apr 20 05:24: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
… …
139 139
140 f.next (); 140 f.next ();
141 141
142 for (;;) 142 for (;;)
143 { 143 {
144 coroapi::cede_to_tick_every (10); 144 coroapi::cede_to_tick ();
145 145
146 switch (f.kw) 146 switch (f.kw)
147 { 147 {
148 case KW_arch: 148 case KW_arch:
149 t->item = archetype::get (f.get_str ()); 149 t->item = archetype::find (f.get_str ());
150
151 if (!t->item)
152 {
153 f.parse_warn ("treasure references unknown archetype");
154 t->item = archetype::empty;
155 }
156
150 break; 157 break;
151 158
152 case KW_list: f.get (t->name); break; 159 case KW_list: f.get (t->name); break;
153 case KW_change_name: f.get (t->change_arch.name); break; 160 case KW_change_name: f.get (t->change_arch.name); break;
154 case KW_change_title: f.get (t->change_arch.title); break; 161 case KW_change_title: f.get (t->change_arch.title); break;
… …
168 t->next = read_treasure (f); 175 t->next = read_treasure (f);
169 return t; 176 return t;
170 177
171 default: 178 default:
172 if (!f.parse_error ("treasurelist", t->name)) 179 if (!f.parse_error ("treasurelist", t->name))
173 return 0; 180 goto error;
174 181
175 return t; 182 return t;
176 } 183 }
177 184
178 f.next (); 185 f.next ();
179 } 186 }
187
188 // not reached
189
190error:
191 delete t;
192 return 0;
180} 193}
181 194
182/* 195/*
183 * Each treasure is parsed with the help of load_treasure(). 196 * Each treasure is parsed with the help of load_treasure().
184 */ 197 */
… …
816 ARG_INT (flags))) 829 ARG_INT (flags)))
817 return; 830 return;
818 831
819 if (!(flags & GT_MINIMAL)) 832 if (!(flags & GT_MINIMAL))
820 { 833 {
821 if (op->arch == crown_arch) 834 if (IS_ARCH (op->arch, crown))
822 { 835 {
823 set_magic (difficulty, op, max_magic, flags); 836 set_magic (difficulty, op, max_magic, flags);
824 num_enchantments = calc_item_power (op, 1); 837 num_enchantments = calc_item_power (op, 1);
825 generate_artifact (op, difficulty); 838 generate_artifact (op, difficulty);
826 } 839 }
… …
831 844
832 num_enchantments = calc_item_power (op, 1); 845 num_enchantments = calc_item_power (op, 1);
833 846
834 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 847 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
835 || op->type == HORN 848 || op->type == HORN
836 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 849 || 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); 850 generate_artifact (op, difficulty);
839 } 851 }
840 852
841 /* Object was made an artifact. Calculate its item_power rating. 853 /* Object was made an artifact. Calculate its item_power rating.
842 * the item_power in the object is what the artfiact adds. 854 * the item_power in the object is what the artfiact adds.
… …
884 { 896 {
885 if (op->type == POTION) 897 if (op->type == POTION)
886 /* Handle healing and magic power potions */ 898 /* Handle healing and magic power potions */
887 if (op->stats.sp && !op->randomitems) 899 if (op->stats.sp && !op->randomitems)
888 { 900 {
889 object *tmp;
890
891 tmp = get_archetype (spell_mapping[op->stats.sp]); 901 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
892 insert_ob_in_ob (tmp, op); 902 insert_ob_in_ob (tmp, op);
893 op->stats.sp = 0; 903 op->stats.sp = 0;
894 } 904 }
895 } 905 }
896 else if (!op->title) /* Only modify object if not special */ 906 else if (!op->title) /* Only modify object if not special */
… …
954 SET_FLAG (op, FLAG_CURSED); 964 SET_FLAG (op, FLAG_CURSED);
955 break; 965 break;
956 } 966 }
957 967
958 case AMULET: 968 case AMULET:
959 if (op->arch == amulet_arch) 969 if (IS_ARCH (op->arch, amulet))
960 op->value *= 5; /* Since it's not just decoration */ 970 op->value *= 5; /* Since it's not just decoration */
961 971
962 case RING: 972 case RING:
963 if (op->arch == NULL) 973 if (!op->arch) // wtf? schmorp
964 { 974 {
965 op->destroy (); 975 op->destroy ();
966 op = 0; 976 op = 0;
967 break; 977 break;
968 } 978 }
969 979
970 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 980 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
971 break; 981 break;
972 982
973 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 983 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
974 SET_FLAG (op, FLAG_CURSED); 984 SET_FLAG (op, FLAG_CURSED);
975 985
… …
1155 1165
1156 return 0; 1166 return 0;
1157} 1167}
1158 1168
1159/* 1169/*
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. 1170 * Builds up the lists of artifacts from the file in the libdir.
1283 */ 1171 */
1284void 1172void
1285init_artifacts (void) 1173init_artifacts (void)
1286{ 1174{

Diff Legend

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