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.71 by root, Tue Apr 15 03:16:02 2008 UTC vs.
Revision 1.78 by root, Sun Jul 20 16:56:34 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;
… …
144 coroapi::cede_to_tick (); 143 coroapi::cede_to_tick ();
145 144
146 switch (f.kw) 145 switch (f.kw)
147 { 146 {
148 case KW_arch: 147 case KW_arch:
149 t->item = archetype::get (f.get_str ()); 148 t->item = archetype::find (f.get_str ());
149
150 if (!t->item)
151 {
152 f.parse_warn ("treasure references unknown archetype");
153 t->item = archetype::empty;
154 }
155
150 break; 156 break;
151 157
152 case KW_list: f.get (t->name); break; 158 case KW_list: f.get (t->name); break;
153 case KW_change_name: f.get (t->change_arch.name); break; 159 case KW_change_name: f.get (t->change_arch.name); break;
154 case KW_change_title: f.get (t->change_arch.title); break; 160 case KW_change_title: f.get (t->change_arch.title); break;
… …
168 t->next = read_treasure (f); 174 t->next = read_treasure (f);
169 return t; 175 return t;
170 176
171 default: 177 default:
172 if (!f.parse_error ("treasurelist", t->name)) 178 if (!f.parse_error ("treasurelist", t->name))
173 return 0; 179 goto error;
174 180
175 return t; 181 return t;
176 } 182 }
177 183
178 f.next (); 184 f.next ();
179 } 185 }
186
187 // not reached
188
189error:
190 delete t;
191 return 0;
180} 192}
181 193
182/* 194/*
183 * Each treasure is parsed with the help of load_treasure(). 195 * Each treasure is parsed with the help of load_treasure().
184 */ 196 */
… …
243 return; 255 return;
244 } 256 }
245 257
246 op->expand_tail (); 258 op->expand_tail ();
247 259
248 if (op->blocked (creator->map, creator->x, creator->y)) 260 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
249 op->destroy (); 261 op->destroy ();
250 else 262 else
251 { 263 {
252 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 264 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
253 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 265 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
… …
257 { 269 {
258 op = creator->insert (op); 270 op = creator->insert (op);
259 271
260 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 272 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
261 monster_check_apply (creator, op); 273 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 } 274 }
267} 275}
268 276
269/* if there are change_xxx commands in the treasure, we include the changes 277/* if there are change_xxx commands in the treasure, we include the changes
270 * in the generated object 278 * in the generated object
… …
570 if (op->type == ARMOUR) 578 if (op->type == ARMOUR)
571 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100; 579 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
572 580
573 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 581 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
574 magic = (-magic); 582 magic = (-magic);
583
575 op->weight = (op->arch->weight * (100 - magic * 10)) / 100; 584 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
576 } 585 }
577 else 586 else
578 { 587 {
579 if (op->type == ARMOUR) 588 if (op->type == ARMOUR)
580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 589 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
590
581 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 591 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
582 magic = (-magic); 592 magic = (-magic);
593
583 op->weight = (op->weight * (100 - magic * 10)) / 100; 594 op->weight = (op->weight * (100 - magic * 10)) / 100;
584 } 595 }
585} 596}
586 597
587/* 598/*
… …
816 ARG_INT (flags))) 827 ARG_INT (flags)))
817 return; 828 return;
818 829
819 if (!(flags & GT_MINIMAL)) 830 if (!(flags & GT_MINIMAL))
820 { 831 {
821 if (op->arch == crown_arch) 832 if (IS_ARCH (op->arch, crown))
822 { 833 {
823 set_magic (difficulty, op, max_magic, flags); 834 set_magic (difficulty, op, max_magic, flags);
824 num_enchantments = calc_item_power (op, 1); 835 num_enchantments = calc_item_power (op, 1);
825 generate_artifact (op, difficulty); 836 generate_artifact (op, difficulty);
826 } 837 }
… …
831 842
832 num_enchantments = calc_item_power (op, 1); 843 num_enchantments = calc_item_power (op, 1);
833 844
834 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 845 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
835 || op->type == HORN 846 || op->type == HORN
836 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 847 || 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); 848 generate_artifact (op, difficulty);
839 } 849 }
840 850
841 /* Object was made an artifact. Calculate its item_power rating. 851 /* Object was made an artifact. Calculate its item_power rating.
842 * the item_power in the object is what the artfiact adds. 852 * the item_power in the object is what the artfiact adds.
… …
884 { 894 {
885 if (op->type == POTION) 895 if (op->type == POTION)
886 /* Handle healing and magic power potions */ 896 /* Handle healing and magic power potions */
887 if (op->stats.sp && !op->randomitems) 897 if (op->stats.sp && !op->randomitems)
888 { 898 {
889 object *tmp;
890
891 tmp = get_archetype (spell_mapping[op->stats.sp]); 899 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
892 insert_ob_in_ob (tmp, op); 900 insert_ob_in_ob (tmp, op);
893 op->stats.sp = 0; 901 op->stats.sp = 0;
894 } 902 }
895 } 903 }
896 else if (!op->title) /* Only modify object if not special */ 904 else if (!op->title) /* Only modify object if not special */
… …
954 SET_FLAG (op, FLAG_CURSED); 962 SET_FLAG (op, FLAG_CURSED);
955 break; 963 break;
956 } 964 }
957 965
958 case AMULET: 966 case AMULET:
959 if (op->arch == amulet_arch) 967 if (IS_ARCH (op->arch, amulet))
960 op->value *= 5; /* Since it's not just decoration */ 968 op->value *= 5; /* Since it's not just decoration */
961 969
962 case RING: 970 case RING:
963 if (op->arch == NULL) 971 if (!op->arch) // wtf? schmorp
964 { 972 {
965 op->destroy (); 973 op->destroy ();
966 op = 0; 974 op = 0;
967 break; 975 break;
968 } 976 }
969 977
970 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 978 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
971 break; 979 break;
972 980
973 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 981 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
974 SET_FLAG (op, FLAG_CURSED); 982 SET_FLAG (op, FLAG_CURSED);
975 983

Diff Legend

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