From ce5453f5fc11687506b3abf2f74c1fc3df91dba2 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 24 Jul 2013 12:48:02 -0700 Subject: Truncate item names to what the server actually sees This is far from optimal, but the server was already doing it silently, and the new server now rejects it. Also make magic.conf use an item name, since previously it was (correctly) rejecting the item name as nonexistent and was using an ID instead. --- world/map/conf/magic.conf.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'world/map/conf') diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template index 54f4a602..eb78a591 100644 --- a/world/map/conf/magic.conf.template +++ b/world/map/conf/magic.conf.template @@ -532,7 +532,7 @@ SPELL make-concentration-potion : "#T15" = => EFFECT CALL adjust_spellpower(school); CALL default_effect(); CALL create_item( if_then_else(random(2000 + experience) < experience, "ConcentrationPotion", "DarkConcentrationPotion"), 1, - if_then_else(random(2), 744, "DarkConcentrationPotion"), + if_then_else(random(2), "DilutedConcentrationPot", "DarkConcentrationPotion"), 2000); IF (success) THEN CALL set_var(MAGIC_FLAGS, 1, MFLAG_MADE_CONC_POTION_SHIFT, 1); @@ -544,10 +544,10 @@ SPELL merge-concentration-potions : "#T16" = IN (MANA 8, CASTTIME 5000, REQUIRE skill(caster, MAGIC) > level, REQUIRE skill(caster, school) > level, - COMPONENTS ["DarkConcentrationPotion", 744]) + COMPONENTS ["DarkConcentrationPotion", "DilutedConcentrationPot"]) => EFFECT CALL adjust_spellpower(school); CALL default_effect(); - CALL create_item("ConcentrationPotion", 1, 744, 1000); + CALL create_item("ConcentrationPotion", 1, "DilutedConcentrationPot", 1000); message (caster, "success = " + success); IF (success) THEN CALL set_var(MAGIC_FLAGS, 1, MFLAG_MADE_CONC_POTION_SHIFT, 1); -- cgit v1.2.3-70-g09d2