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.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
… …
144 coroapi::cede_to_tick (); 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

Diff Legend

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