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.47 by root, Tue Apr 17 18:24:30 2007 UTC

… …
76 76
77 warn_archetypes = prev_warn; 77 warn_archetypes = prev_warn;
78} 78}
79 79
80/* 80/*
81 * Searches for the given treasurelist in the globally linked list 81 * Searches for the given treasurelist
82 * of treasurelists which has been built by load_treasures().
83 */ 82 */
84treasurelist * 83treasurelist *
85treasurelist::find (const char *name) 84treasurelist::find (const char *name)
86{ 85{
87 if (!name) 86 if (!name)
88 return 0; 87 return 0;
89 88
90 AUTODECL (i, tl_map.find (name)); 89 auto (i, tl_map.find (name));
91 90
92 if (i == tl_map.end ()) 91 if (i == tl_map.end ())
93 return 0; 92 return 0;
94 93
95 return i->second; 94 return i->second;
… …
125 if (tl->items) 124 if (tl->items)
126 { 125 {
127 free_treasurestruct (tl->items); 126 free_treasurestruct (tl->items);
128 tl->items = 0; 127 tl->items = 0;
129 } 128 }
129
130 tl->total_chance = 0;
130} 131}
132
133#ifdef TREASURE_DEBUG
134/* recursived checks the linked list. Treasurelist is passed only
135 * so that the treasure name can be printed out
136 */
137static void
138check_treasurelist (const treasure *t, const treasurelist * tl)
139{
140 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
141 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
142
143 if (t->next)
144 check_treasurelist (t->next, tl);
145
146 if (t->next_yes)
147 check_treasurelist (t->next_yes, tl);
148
149 if (t->next_no)
150 check_treasurelist (t->next_no, tl);
151}
152#endif
131 153
132/* 154/*
133 * Reads the lib/treasure file from disk, and parses the contents 155 * Reads the lib/treasure file from disk, and parses the contents
134 * into an internal treasure structure (very linked lists) 156 * into an internal treasure structure (very linked lists)
135 */ 157 */
136static treasure * 158static treasure *
137load_treasure (object_thawer &f) 159read_treasure (object_thawer &f)
138{ 160{
139 treasure *t = new treasure; 161 treasure *t = new treasure;
140 int value;
141 162
142 nroftreasures++; 163 f.next ();
143 164
144 for (;;) 165 for (;;)
145 { 166 {
146 coroapi::cede_every (10); 167 coroapi::cede_to_tick_every (10);
147
148 f.next ();
149 168
150 switch (f.kw) 169 switch (f.kw)
151 { 170 {
152 case KW_arch: 171 case KW_arch:
153 if (!(t->item = archetype::find (f.get_str ()))) 172 if (!(t->item = archetype::find (f.get_str ())))
… …
160 case KW_change_slaying: f.get (t->change_arch.slaying); break; 179 case KW_change_slaying: f.get (t->change_arch.slaying); break;
161 case KW_chance: f.get (t->chance); break; 180 case KW_chance: f.get (t->chance); break;
162 case KW_nrof: f.get (t->nrof); break; 181 case KW_nrof: f.get (t->nrof); break;
163 case KW_magic: f.get (t->magic); break; 182 case KW_magic: f.get (t->magic); break;
164 183
165 case KW_yes: t->next_yes = load_treasure (f); break; 184 case KW_yes: t->next_yes = read_treasure (f); continue;
166 case KW_no: t->next_no = load_treasure (f); break; 185 case KW_no: t->next_no = read_treasure (f); continue;
167 186
168 case KW_end: 187 case KW_end:
188 f.next ();
169 return t; 189 return t;
170 190
171 case KW_more: 191 case KW_more:
172 t->next = load_treasure (f); 192 t->next = read_treasure (f);
173 return t; 193 return t;
174 194
175 default: 195 default:
176 if (!f.parse_error ("treasure list")) 196 if (!f.parse_error ("treasurelist", t->name))
177 return t; // error 197 return 0;
178 198
179 return t; 199 return t;
180 } 200 }
181 }
182}
183 201
184#ifdef TREASURE_DEBUG 202 f.next ();
185/* recursived checks the linked list. Treasurelist is passed only 203 }
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} 204}
203#endif
204 205
205/* 206/*
206 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
207 * Each treasure is parsed with the help of load_treasure(). 207 * Each treasure is parsed with the help of load_treasure().
208 */ 208 */
209bool 209treasurelist *
210load_treasure_file (const char *filename) 210treasurelist::read (object_thawer &f)
211{ 211{
212 treasure *t; 212 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
213 int comp, line = 0;
214 213
215 object_thawer f (filename); 214 bool one = f.kw == KW_treasureone;
216 215 treasurelist *tl = treasurelist::get (f.get_str ());
217 if (!f) 216 clear (tl);
218 { 217 tl->items = read_treasure (f);
219 LOG (llevError, "Can't open treasure file.\n"); 218 if (!tl->items)
220 return false; 219 return 0;
220
221 /* This is a one of the many items on the list should be generated.
222 * Add up the chance total, and check to make sure the yes & no
223 * fields of the treasures are not being used.
224 */
225 tl->total_chance = 0;
226
227 if (one)
221 } 228 {
222 229 for (treasure *t = tl->items; t; t = t->next)
223 f.next ();
224
225 for (;;)
226 {
227 switch (f.kw)
228 { 230 {
229 case KW_treasure: 231 if (t->next_yes || t->next_no)
230 case KW_treasureone:
231 { 232 {
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); 233 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"); 234 LOG (llevError, " the next_yes or next_no field is set\n");
254 }
255#endif
256 tl->total_chance += t->chance;
257 }
258 }
259 } 235 }
260 break;
261 236
262 case KW_EOF: 237 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 } 238 }
280
281 f.next ();
282 } 239 }
240
241 return tl;
283} 242}
284 243
285/* 244/*
286 * Generates the objects specified by the given treasure. 245 * Generates the objects specified by the given treasure.
287 * It goes recursively through the rest of the linked list. 246 * It goes recursively through the rest of the linked list.
… …
346 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) 305 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
347 { 306 {
348 if (t->name) 307 if (t->name)
349 { 308 {
350 if (difficulty >= t->magic) 309 if (difficulty >= t->magic)
310 if (treasurelist *tl = treasurelist::find (t->name))
351 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries); 311 create_treasure (tl, op, flag, difficulty, tries);
312 else
313 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
352 } 314 }
353 else 315 else
354 { 316 {
355 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 317 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
356 { 318 {
… …
1353 { 1315 {
1354 switch (f.kw) 1316 switch (f.kw)
1355 { 1317 {
1356 case KW_allowed: 1318 case KW_allowed:
1357 if (!art) 1319 if (!art)
1358 {
1359 art = get_empty_artifact (); 1320 art = get_empty_artifact ();
1360 nrofartifacts++;
1361 }
1362 1321
1363 { 1322 {
1364 if (!strcmp (f.get_str (), "all")) 1323 if (!strcmp (f.get_str (), "all"))
1365 break; 1324 break;
1366 1325
1367 char *next, *cp = f.get_str (); 1326 char *next, *cp = f.get_str ();
1368 1327
1369 do 1328 do
1370 { 1329 {
1371 nrofallowedstr++;
1372
1373 if ((next = strchr (cp, ','))) 1330 if ((next = strchr (cp, ',')))
1374 *next++ = '\0'; 1331 *next++ = '\0';
1375 1332
1376 linked_char *tmp = new linked_char; 1333 linked_char *tmp = new linked_char;
1377 1334
… …
1427 } 1384 }
1428 1385
1429done: 1386done:
1430 for (al = first_artifactlist; al; al = al->next) 1387 for (al = first_artifactlist; al; al = al->next)
1431 { 1388 {
1389 al->total_chance = 0;
1390
1432 for (art = al->items; art; art = art->next) 1391 for (art = al->items; art; art = art->next)
1433 { 1392 {
1434 if (!art->chance) 1393 if (!art->chance)
1435 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1394 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1436 else 1395 else
… …
1442 } 1401 }
1443 1402
1444 LOG (llevDebug, "done.\n"); 1403 LOG (llevDebug, "done.\n");
1445} 1404}
1446 1405
1447
1448/* 1406/*
1449 * Used in artifact generation. The bonuses of the first object 1407 * Used in artifact generation. The bonuses of the first object
1450 * is modified by the bonuses of the second object. 1408 * is modified by the bonuses of the second object.
1451 */ 1409 */
1452
1453void 1410void
1454add_abilities (object *op, object *change) 1411add_abilities (object *op, object *change)
1455{ 1412{
1456 int i, tmp; 1413 int i, tmp;
1457 1414
… …
1810 SET_FLAG (item, FLAG_NO_STEAL); 1767 SET_FLAG (item, FLAG_NO_STEAL);
1811 } 1768 }
1812} 1769}
1813 1770
1814/* special_potion() - so that old potion code is still done right. */ 1771/* special_potion() - so that old potion code is still done right. */
1815
1816int 1772int
1817special_potion (object *op) 1773special_potion (object *op)
1818{ 1774{
1819 if (op->attacktype) 1775 if (op->attacktype)
1820 return 1; 1776 return 1;

Diff Legend

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