diff options
| -rw-r--r-- | world/map/db/item_db_chest.txt | 2 | ||||
| -rw-r--r-- | world/map/db/item_db_foot.txt | 2 | ||||
| -rw-r--r-- | world/map/db/item_db_hand.txt | 2 | ||||
| -rw-r--r-- | world/map/db/item_db_leg.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/052-2/chest.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/items/brawling_item.txt | 23 | ||||
| -rw-r--r-- | world/map/npc/scripts.conf | 1 |
7 files changed, 32 insertions, 8 deletions
diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt index 19375923..fd553110 100644 --- a/world/map/db/item_db_chest.txt +++ b/world/map/db/item_db_chest.txt @@ -19,7 +19,7 @@ 689, ShortTankTop, 5, 600, 300, 8, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, {}, {} 720, SilkRobe, 5, 8000, 4000, 5, 0, 5, 0, 0, 0, 2, 512, 0, 0, 0, {}, {} 726, GMRobe, 5, 8000, 4000, 40, 0, 5, 0, 0, 0, 2, 512, 0, 0, 0, {}, {callfunc "RestrictedItem";} -755, AssassinShirt, 5, 10000, 3000, 15, 0, 10, 0, -5, 0, 2, 512, 0, 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 10;} +755, AssassinShirt, 5, 10000, 3000, 15, 0, 15, 0, -5, 0, 2, 512, 0, 90, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 15;bonus bSpeedAddRate, 10;} 767, TerraniteChestArmor, 5, 100000, 3000, 800, 0, 20, 0, -70, 0, 2, 512, 0, 0, 0, {}, {bonus bDex, 1;bonus bMdef, 10;} 782, ForestArmor, 5, 3000, 1500, 40, 0, 10, 0, -20, 0, 2, 512, 0, 0, 0, {}, {bonus bDex, 3;} 783, PlatynaRedDress, 5, 100000, 50000, 35, 0, 15, 0, 3, 0, 2, 512, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_foot.txt b/world/map/db/item_db_foot.txt index 04f8e70b..2b744c3b 100644 --- a/world/map/db/item_db_foot.txt +++ b/world/map/db/item_db_foot.txt @@ -4,7 +4,7 @@ 655, FurBoots, 5, 5000, 600, 50, 0, 3, 0, -3, 0, 2, 64, 0, 0, 0, {}, {} 734, BlackBoots, 5, 20000, 3000, 25, 0, 3, 0, -10, 0, 2, 64, 0, 0, 0, {}, {} 735, CottonBoots, 5, 2000, 500, 10, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, {}, {} -757, AssassinBoots, 5, 7000, 2000, 10, 0, 5, 0, -3, 0, 2, 64, 0, 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 5;} +757, AssassinBoots, 5, 7000, 2000, 10, 0, 3, 0, -3, 0, 2, 64, 0, 0, 0, {}, {callfunc "BrawlingItem";bonus bAgi, 4;} 792, BromenalBoots, 5, 8000, 500, 30, 0, 1, 0, -2, 0, 2, 64, 0, 0, 0, {}, {} 876, WarlordBoots, 5, 19000, 2000, 550, 0, 5, 0, -22, 0, 2, 64, 0, 0, 0, {}, {} 2150, RedCottonBoots, 5, 2000, 500, 30, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_hand.txt b/world/map/db/item_db_hand.txt index 2776927e..8765af1e 100644 --- a/world/map/db/item_db_hand.txt +++ b/world/map/db/item_db_hand.txt @@ -4,7 +4,7 @@ 532, LeatherGloves, 5, 6000, 2000, 20, 0, 4, 0, -20, 0, 2, 4, 0, 0, 0, {}, {} 563, WinterGloves, 5, 6000, 3000, 20, 0, 3, 0, -15, 0, 2, 4, 0, 0, 0, {}, {} 741, CottonGloves, 5, 2000, 500, 10, 0, 1, 0, -10, 0, 2, 4, 0, 0, 0, {}, {} -756, AssassinGloves, 5, 7000, 2000, 9, 0, 5, 0, -3, 0, 2, 4, 0, 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 5;} +756, AssassinGloves, 5, 7000, 2000, 9, 0, 3, 0, -3, 0, 2, 4, 0, 0, 0, {}, {callfunc "BrawlingItem";bonus bAgi, 4;} 794, BromenalGloves, 5, 6000, 2000, 40, 0, 4, 0, -20, 0, 2, 4, 0, 0, 0, {}, {} 868, SilkGloves, 5, 5000, 2500, 4, 0, 1, 0, 0, 0, 2, 4, 0, 0, 0, {}, {} 2160, RedCottonGloves, 5, 2000, 500, 20, 0, 1, 0, -10, 0, 2, 4, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_leg.txt b/world/map/db/item_db_leg.txt index eb3e7807..455550f7 100644 --- a/world/map/db/item_db_leg.txt +++ b/world/map/db/item_db_leg.txt @@ -5,7 +5,7 @@ 632, CottonSkirt, 5, 1000, 500, 10, 0, 4, 0, -8, 0, 2, 1, 0, 1, 0, {}, {} 642, JeansChaps, 5, 2000, 1000, 60, 0, 6, 0, -12, 0, 2, 1, 0, 0, 0, {}, {} 648, CottonTrousers, 5, 1500, 750, 25, 0, 4, 0, -6, 0, 2, 1, 0, 1, 0, {}, {} -731, AssassinPants, 5, 10000, 3000, 20, 0, 5, 0, -5, 0, 2, 1, 0, 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 8;} +731, AssassinPants, 5, 10000, 3000, 20, 0, 4, 0, -5, 0, 2, 1, 0, 0, 0, {}, {callfunc "BrawlingItem";bonus bAgi, 5;} 768, TerraniteLegs, 5, 10000, 3000, 30, 0, 5, 0, -8, 0, 2, 1, 0, 0, 0, {}, {bonus bAgi, 1;bonus bMdef, 5;} 771, Miniskirt, 5, 1000, 500, 8, 0, 4, 0, -8, 0, 2, 1, 0, 1, 0, {}, {} 796, BromenalLegs, 5, 2000, 1000, 150, 0, 6, 0, -12, 0, 2, 1, 0, 0, 0, {}, {} diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 3c3cc960..cabd3943 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -30,10 +30,10 @@ L_ShouldNotBeHere: end; OnInit: - setarray $@illia_common_rewards$, "SteelShield", "WarlordHelmet", "KnightsHelmet", "InfantryHelmet", "CrusadeHelmet", "ChainmailShirt", "LightPlatemail", "WarlordPlate", "Setzer", "RockKnife", "WarlordBoots", "ForestArmor", "ForestBow", "WoodenStaff", "WizardHat", "WoodenShield", "ShortSword", "SilkRobe", "LeatherGloves", "BoneKnife", "JeansChaps", "PointyWitchHat"; - setarray $@illia_common_rewards_n$, "Steel Shield", "Warlord Helmet", "Knights Helmet", "Infantry Helmet", "Crusade Helmet", "Chainmail Shirt", "Light Platemail", "Warlord Plate", "Setzer", "Rock Knife", "Warlord Boots", "Forest Armor", "Forest Bow", "Wooden Staff", "Wizard Hat", "Wooden Shield", "Short Sword", "Silk Robe", "Leather Gloves", "Bone Knife", "Jeans Chaps", "Pointy Witch Hat"; - setarray $@illia_unique_rewards$, "BullHelmet", "BansheeBow", "HeartOfIsis", "LazuriteRobe"; - setarray $@illia_unique_rewards_n$, "Bull Helmet", "Banshee Bow", "Heart of Isis", "Lazurite Robe"; + setarray $@illia_common_rewards$, "SteelShield", "WarlordHelmet", "KnightsHelmet", "InfantryHelmet", "CrusadeHelmet", "ChainmailShirt", "LightPlatemail", "WarlordPlate", "Setzer", "RockKnife", "WarlordBoots", "ForestArmor", "ForestBow", "WoodenStaff", "WizardHat", "WoodenShield", "ShortSword", "SilkRobe", "LeatherGloves", "BoneKnife", "JeansChaps", "PointyWitchHat", "AssassinPants", "AssassinGloves", "AssassinBoots"; + setarray $@illia_common_rewards_n$, "Steel Shield", "Warlord Helmet", "Knights Helmet", "Infantry Helmet", "Crusade Helmet", "Chainmail Shirt", "Light Platemail", "Warlord Plate", "Setzer", "Rock Knife", "Warlord Boots", "Forest Armor", "Forest Bow", "Wooden Staff", "Wizard Hat", "Wooden Shield", "Short Sword", "Silk Robe", "Leather Gloves", "Bone Knife", "Jeans Chaps", "Pointy Witch Hat", "Assassin Pants", "Assassin Gloves", "Assassin Boots"; + setarray $@illia_unique_rewards$, "BullHelmet", "BansheeBow", "HeartOfIsis", "LazuriteRobe", "AssassinShirt"; + setarray $@illia_unique_rewards_n$, "Bull Helmet", "Banshee Bow", "Heart of Isis", "Lazurite Robe", "Assassin Shirt"; end; L_ResumePick: diff --git a/world/map/npc/items/brawling_item.txt b/world/map/npc/items/brawling_item.txt new file mode 100644 index 00000000..097de378 --- /dev/null +++ b/world/map/npc/items/brawling_item.txt @@ -0,0 +1,23 @@ +// Items which can only be used while unarmed +// Variables passed to this script: +// @slotId The slot in which the item would have been equipped in. This is passed automagically when called in an equip script. + +function|script|BrawlingItem +{ + if (getequipid(equip_hand1) == -1) + goto L_Return; + + message strcharinfo(0), "This item's curse does not allow it to be used with weapons equipped."; + + // This is for debug + if (getgmlevel() >= 60) + bonus bAgi, -7; + if (getgmlevel() >= 60) + goto L_Return; + + callfunc "UnequipLater"; + goto L_Return; + +L_Return: + return; +} diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf index ee63f684..b02f224e 100644 --- a/world/map/npc/scripts.conf +++ b/world/map/npc/scripts.conf @@ -49,6 +49,7 @@ npc: npc/items/mirror.txt npc: npc/items/rubber_bat.txt npc: npc/items/scentedcandle.txt npc: npc/items/tmwgift.txt +npc: npc/items/brawling_item.txt import: npc/_import.txt // magic |