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.43 by root, Mon Apr 16 11:09:30 2007 UTC vs.
Revision 1.48 by root, Tue Apr 17 18:40:31 2007 UTC

… …
54> tl_map_t; 54> tl_map_t;
55 55
56static tl_map_t tl_map; 56static tl_map_t tl_map;
57 57
58/* 58/*
59 * Initialize global archtype pointers: 59 * Searches for the given treasurelist
60 */
61void
62init_archetype_pointers ()
63{
64 int prev_warn = warn_archetypes;
65
66 warn_archetypes = 1;
67
68 if (ring_arch == NULL)
69 ring_arch = archetype::find ("ring");
70 if (amulet_arch == NULL)
71 amulet_arch = archetype::find ("amulet");
72 if (staff_arch == NULL)
73 staff_arch = archetype::find ("staff");
74 if (crown_arch == NULL)
75 crown_arch = archetype::find ("crown");
76
77 warn_archetypes = prev_warn;
78}
79
80/*
81 * Searches for the given treasurelist in the globally linked list
82 * of treasurelists which has been built by load_treasures().
83 */ 60 */
84treasurelist * 61treasurelist *
85treasurelist::find (const char *name) 62treasurelist::find (const char *name)
86{ 63{
87 if (!name) 64 if (!name)
88 return 0; 65 return 0;
89 66
90 AUTODECL (i, tl_map.find (name)); 67 auto (i, tl_map.find (name));
91 68
92 if (i == tl_map.end ()) 69 if (i == tl_map.end ())
93 return 0; 70 return 0;
94 71
95 return i->second; 72 return i->second;
… …
125 if (tl->items) 102 if (tl->items)
126 { 103 {
127 free_treasurestruct (tl->items); 104 free_treasurestruct (tl->items);
128 tl->items = 0; 105 tl->items = 0;
129 } 106 }
107
108 tl->total_chance = 0;
130} 109}
110
111#ifdef TREASURE_DEBUG
112/* recursived checks the linked list. Treasurelist is passed only
113 * so that the treasure name can be printed out
114 */
115static void
116check_treasurelist (const treasure *t, const treasurelist * tl)
117{
118 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
119 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
120
121 if (t->next)
122 check_treasurelist (t->next, tl);
123
124 if (t->next_yes)
125 check_treasurelist (t->next_yes, tl);
126
127 if (t->next_no)
128 check_treasurelist (t->next_no, tl);
129}
130#endif
131 131
132/* 132/*
133 * Reads the lib/treasure file from disk, and parses the contents 133 * Reads the lib/treasure file from disk, and parses the contents
134 * into an internal treasure structure (very linked lists) 134 * into an internal treasure structure (very linked lists)
135 */ 135 */
136static treasure * 136static treasure *
137load_treasure (object_thawer &f) 137read_treasure (object_thawer &f)
138{ 138{
139 treasure *t = new treasure; 139 treasure *t = new treasure;
140 int value;
141 140
142 nroftreasures++; 141 f.next ();
143 142
144 for (;;) 143 for (;;)
145 { 144 {
146 coroapi::cede_every (10); 145 coroapi::cede_to_tick_every (10);
147
148 f.next ();
149 146
150 switch (f.kw) 147 switch (f.kw)
151 { 148 {
152 case KW_arch: 149 case KW_arch:
153 if (!(t->item = archetype::find (f.get_str ()))) 150 if (!(t->item = archetype::find (f.get_str ())))
… …
160 case KW_change_slaying: f.get (t->change_arch.slaying); break; 157 case KW_change_slaying: f.get (t->change_arch.slaying); break;
161 case KW_chance: f.get (t->chance); break; 158 case KW_chance: f.get (t->chance); break;
162 case KW_nrof: f.get (t->nrof); break; 159 case KW_nrof: f.get (t->nrof); break;
163 case KW_magic: f.get (t->magic); break; 160 case KW_magic: f.get (t->magic); break;
164 161
165 case KW_yes: t->next_yes = load_treasure (f); break; 162 case KW_yes: t->next_yes = read_treasure (f); continue;
166 case KW_no: t->next_no = load_treasure (f); break; 163 case KW_no: t->next_no = read_treasure (f); continue;
167 164
168 case KW_end: 165 case KW_end:
166 f.next ();
169 return t; 167 return t;
170 168
171 case KW_more: 169 case KW_more:
172 t->next = load_treasure (f); 170 t->next = read_treasure (f);
173 return t; 171 return t;
174 172
175 default: 173 default:
176 if (!f.parse_error ("treasure list")) 174 if (!f.parse_error ("treasurelist", t->name))
177 return t; // error 175 return 0;
178 176
179 return t; 177 return t;
180 } 178 }
181 }
182}
183 179
184#ifdef TREASURE_DEBUG 180 f.next ();
185/* recursived checks the linked list. Treasurelist is passed only 181 }
186 * so that the treasure name can be printed out
187 */
188static void
189check_treasurelist (const treasure *t, const treasurelist * tl)
190{
191 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
192 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
193
194 if (t->next)
195 check_treasurelist (t->next, tl);
196
197 if (t->next_yes)
198 check_treasurelist (t->next_yes, tl);
199
200 if (t->next_no)
201 check_treasurelist (t->next_no, tl);
202} 182}
203#endif
204 183
205/* 184/*
206 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
207 * Each treasure is parsed with the help of load_treasure(). 185 * Each treasure is parsed with the help of load_treasure().
208 */ 186 */
209bool 187treasurelist *
210load_treasure_file (const char *filename) 188treasurelist::read (object_thawer &f)
211{ 189{
212 treasure *t; 190 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
213 int comp, line = 0;
214 191
215 object_thawer f (filename); 192 bool one = f.kw == KW_treasureone;
216 193 treasurelist *tl = treasurelist::get (f.get_str ());
217 if (!f) 194 clear (tl);
218 { 195 tl->items = read_treasure (f);
219 LOG (llevError, "Can't open treasure file.\n"); 196 if (!tl->items)
220 return false; 197 return 0;
198
199 /* This is a one of the many items on the list should be generated.
200 * Add up the chance total, and check to make sure the yes & no
201 * fields of the treasures are not being used.
202 */
203 tl->total_chance = 0;
204
205 if (one)
221 } 206 {
222 207 for (treasure *t = tl->items; t; t = t->next)
223 f.next ();
224
225 for (;;)
226 {
227 switch (f.kw)
228 { 208 {
229 case KW_treasure: 209 if (t->next_yes || t->next_no)
230 case KW_treasureone:
231 { 210 {
232 bool one = f.kw == KW_treasureone;
233 treasurelist *tl = treasurelist::get (f.get_str ());
234
235 clear (tl);
236 tl->items = load_treasure (f);
237
238 if (!tl->items)
239 return false;
240
241 /* This is a one of the many items on the list should be generated.
242 * Add up the chance total, and check to make sure the yes & no
243 * fields of the treasures are not being used.
244 */
245 if (one)
246 {
247 for (t = tl->items; t; t = t->next)
248 {
249#ifdef TREASURE_DEBUG
250 if (t->next_yes || t->next_no)
251 {
252 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 211 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
253 LOG (llevError, " the next_yes or next_no field is set\n"); 212 LOG (llevError, " the next_yes or next_no field is set\n");
254 }
255#endif
256 tl->total_chance += t->chance;
257 }
258 }
259 } 213 }
260 break;
261 214
262 case KW_EOF: 215 tl->total_chance += t->chance;
263#ifdef TREASURE_DEBUG
264 /* Perform some checks on how valid the treasure data actually is.
265 * verify that list transitions work (ie, the list that it is supposed
266 * to transition to exists). Also, verify that at least the name
267 * or archetype is set for each treasure element.
268 */
269 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
270 check_treasurelist (tl->items, tl);
271#endif
272 return true;
273
274 default:
275 if (!f.parse_error ("treasure lists"))
276 return false;
277
278 break;
279 } 216 }
280
281 f.next ();
282 } 217 }
218
219 return tl;
283} 220}
284 221
285/* 222/*
286 * Generates the objects specified by the given treasure. 223 * Generates the objects specified by the given treasure.
287 * It goes recursively through the rest of the linked list. 224 * It goes recursively through the rest of the linked list.
… …
346 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) 283 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
347 { 284 {
348 if (t->name) 285 if (t->name)
349 { 286 {
350 if (difficulty >= t->magic) 287 if (difficulty >= t->magic)
288 if (treasurelist *tl = treasurelist::find (t->name))
351 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries); 289 create_treasure (tl, op, flag, difficulty, tries);
290 else
291 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
352 } 292 }
353 else 293 else
354 { 294 {
355 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 295 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
356 { 296 {
… …
1353 { 1293 {
1354 switch (f.kw) 1294 switch (f.kw)
1355 { 1295 {
1356 case KW_allowed: 1296 case KW_allowed:
1357 if (!art) 1297 if (!art)
1358 {
1359 art = get_empty_artifact (); 1298 art = get_empty_artifact ();
1360 nrofartifacts++;
1361 }
1362 1299
1363 { 1300 {
1364 if (!strcmp (f.get_str (), "all")) 1301 if (!strcmp (f.get_str (), "all"))
1365 break; 1302 break;
1366 1303
1367 char *next, *cp = f.get_str (); 1304 char *next, *cp = f.get_str ();
1368 1305
1369 do 1306 do
1370 { 1307 {
1371 nrofallowedstr++;
1372
1373 if ((next = strchr (cp, ','))) 1308 if ((next = strchr (cp, ',')))
1374 *next++ = '\0'; 1309 *next++ = '\0';
1375 1310
1376 linked_char *tmp = new linked_char; 1311 linked_char *tmp = new linked_char;
1377 1312
… …
1427 } 1362 }
1428 1363
1429done: 1364done:
1430 for (al = first_artifactlist; al; al = al->next) 1365 for (al = first_artifactlist; al; al = al->next)
1431 { 1366 {
1367 al->total_chance = 0;
1368
1432 for (art = al->items; art; art = art->next) 1369 for (art = al->items; art; art = art->next)
1433 { 1370 {
1434 if (!art->chance) 1371 if (!art->chance)
1435 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1372 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1436 else 1373 else
… …
1442 } 1379 }
1443 1380
1444 LOG (llevDebug, "done.\n"); 1381 LOG (llevDebug, "done.\n");
1445} 1382}
1446 1383
1447
1448/* 1384/*
1449 * Used in artifact generation. The bonuses of the first object 1385 * Used in artifact generation. The bonuses of the first object
1450 * is modified by the bonuses of the second object. 1386 * is modified by the bonuses of the second object.
1451 */ 1387 */
1452
1453void 1388void
1454add_abilities (object *op, object *change) 1389add_abilities (object *op, object *change)
1455{ 1390{
1456 int i, tmp; 1391 int i, tmp;
1457 1392
… …
1810 SET_FLAG (item, FLAG_NO_STEAL); 1745 SET_FLAG (item, FLAG_NO_STEAL);
1811 } 1746 }
1812} 1747}
1813 1748
1814/* special_potion() - so that old potion code is still done right. */ 1749/* special_potion() - so that old potion code is still done right. */
1815
1816int 1750int
1817special_potion (object *op) 1751special_potion (object *op)
1818{ 1752{
1819 if (op->attacktype) 1753 if (op->attacktype)
1820 return 1; 1754 return 1;

Diff Legend

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