Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

init of old items fails with new hash function

This commit is contained in:
Enno Rehling 2006-02-04 17:28:19 +00:00
parent 88ac2f2496
commit 939773826b
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/kernel/item.c
View File

@ -760,11 +760,6 @@ static t_item itemdata[MAXITEMS] = {
{"Sphäre der Unsichtbarkeit", "Sphären der Unsichtbarkeit", "", ""}, {"Sphäre der Unsichtbarkeit", "Sphären der Unsichtbarkeit", "", ""},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, 0, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, 0, NULL
}, },
{ /* I_TOADSLIME 73 */
{"Tiegel mit Krötenschleim", "Tiegel mit Krötenschleim",
"", ""},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, 0, NULL
},
{ /* I_BAG_OF_HOLDING */ { /* I_BAG_OF_HOLDING */
{"Zauberbeutel", "Zauberbeutel", "Zauberbeutel", "Zauberbeutel"}, {"Zauberbeutel", "Zauberbeutel", "Zauberbeutel", "Zauberbeutel"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, FL_ITEM_NOTINBAG|FL_ITEM_NOTLOST, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, FL_ITEM_NOTINBAG|FL_ITEM_NOTLOST, NULL
@ -883,6 +878,7 @@ static translate_t translation[] = {
{ "Drachenblut", "dragonblood", "dragonblood_p", "dragonblood", "dragonblood_p" }, { "Drachenblut", "dragonblood", "dragonblood_p", "dragonblood", "dragonblood_p" },
{ "Feenstiefel", "fairyboot", "fairyboot_p", "fairyboot", "fairyboot_p" }, { "Feenstiefel", "fairyboot", "fairyboot_p", "fairyboot", "fairyboot_p" },
{ "Gürtel der Trollstärke", "trollbelt", "trollbelt_p", "trollbelt", "trollbelt_p" }, { "Gürtel der Trollstärke", "trollbelt", "trollbelt_p", "trollbelt", "trollbelt_p" },
{ "Tiegel mit Krötenschleim", "toadslime", "toadslime_p", "toadslime", "toadslime_p" },
{ "Mallorn", "mallorn", "mallorn_p", "mallorn", "mallorn_p" }, { "Mallorn", "mallorn", "mallorn_p", "mallorn", "mallorn_p" },
{ "Wagen", "cart", "cart_p", "cart", "cart_p" }, { "Wagen", "cart", "cart_p", "cart", "cart_p" },
{ "Plattenpanzer", "plate", "plate_p", "plate", "plate_p" }, { "Plattenpanzer", "plate", "plate_p", "plate", "plate_p" },

1
src/common/kernel/item.h
View File

@ -284,7 +284,6 @@ enum {
I_AURAKULUM, I_AURAKULUM,
I_SEASERPENTHEAD, I_SEASERPENTHEAD,
I_SPHERE_OF_INVISIBILITY, I_SPHERE_OF_INVISIBILITY,
I_TOADSLIME,
I_BAG_OF_HOLDING, I_BAG_OF_HOLDING,
I_SACK_OF_CONSERVATION, I_SACK_OF_CONSERVATION,
I_TACTICCRYSTAL, I_TACTICCRYSTAL,

7
src/common/kernel/magic.c
View File

@ -1318,7 +1318,12 @@ do_fumble(castorder *co)
* trigger and that's added to the triggerlit of the mage gone toad. * trigger and that's added to the triggerlit of the mage gone toad.
*/ */
trigger * trestore = trigger_changerace(u, u->race, u->irace); trigger * trestore = trigger_changerace(u, u->race, u->irace);
if (rand()%10>2) t_add(&trestore, trigger_giveitem(u, olditemtype[I_TOADSLIME], 1)); if (chance(0.7)) {
const item_type * it_toadslime = it_find("toadslime");
if (it_toadslime!=NULL) {
t_add(&trestore, trigger_giveitem(u, it_toadslime, 1));
}
}
add_trigger(&u->attribs, "timer", trigger_timeout(duration, trestore)); add_trigger(&u->attribs, "timer", trigger_timeout(duration, trestore));
} }
u->race = new_race[RC_TOAD]; u->race = new_race[RC_TOAD];

4
src/res/resources.xml
View File

@ -636,4 +636,8 @@
</item> </item>
</resource> </resource>
<resource name="toadslime" appearance="vial">
<item weight="100" score="0"/>
</resource>
</resources> </resources>