From d920babe815dfaeb772a36cf445d82816768c7f7 Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Fri, 6 Mar 2020 18:35:10 +0200 Subject: [PATCH] finish 7.92 items --- data/actions/actions.xml | 16 ++++++ data/actions/scripts/misc/ceremonial_ankh.lua | 18 +++++++ .../misc/concentrated_demonic_blood.lua | 5 ++ data/actions/scripts/misc/dolls.lua | 21 ++++++++ .../actions/scripts/misc/fireworks_rocket.lua | 17 ++++++ data/actions/scripts/misc/food.lua | 7 +++ data/actions/scripts/misc/instruments.lua | 5 ++ data/actions/scripts/misc/party_hat.lua | 9 ++++ data/items792/items.srv | 53 ++++++++++--------- data/npc/gorn.npc | 2 + data/npc/perod.npc | 2 + data/npc/pydar.npc | 4 +- data/npc/shiantis.npc | 2 + data/npc/thomas.npc | 2 + src/const.h | 5 ++ src/luascript.cpp | 5 ++ src/tools.cpp | 5 ++ 17 files changed, 151 insertions(+), 27 deletions(-) create mode 100644 data/actions/scripts/misc/ceremonial_ankh.lua create mode 100644 data/actions/scripts/misc/concentrated_demonic_blood.lua create mode 100644 data/actions/scripts/misc/fireworks_rocket.lua create mode 100644 data/actions/scripts/misc/party_hat.lua diff --git a/data/actions/actions.xml b/data/actions/actions.xml index 64c4096..8a33376 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -105,6 +105,7 @@ + @@ -157,6 +158,9 @@ + + + @@ -165,11 +169,16 @@ + + + + + @@ -310,6 +319,13 @@ + + + + + + + diff --git a/data/actions/scripts/misc/ceremonial_ankh.lua b/data/actions/scripts/misc/ceremonial_ankh.lua new file mode 100644 index 0000000..9d3ef92 --- /dev/null +++ b/data/actions/scripts/misc/ceremonial_ankh.lua @@ -0,0 +1,18 @@ +local blessings = { + {key = 101, value = 1, name = 'Wisdom of Solitude'}, + {key = 102, value = 1, name = 'Spark of the Phoenix'}, + {key = 103, value = 3, name = 'Fire of the Suns'}, + {key = 104, value = 1, name = 'Spiritual Shielding'}, + {key = 105, value = 1, name = 'Embrace of Tibia'} +} + +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + local result, bless = 'Received blessings:' + for i = 1, #blessings do + bless = blessings[i] + result = (player:getStorageValue(bless.key) == bless.value) and result .. '\n' .. bless.name or result + end + + player:sendTextMessage(MESSAGE_EVENT_ADVANCE, 20 > result:len() and 'No blessings received.' or result) + return true +end diff --git a/data/actions/scripts/misc/concentrated_demonic_blood.lua b/data/actions/scripts/misc/concentrated_demonic_blood.lua new file mode 100644 index 0000000..7319f95 --- /dev/null +++ b/data/actions/scripts/misc/concentrated_demonic_blood.lua @@ -0,0 +1,5 @@ +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + item:getPosition():sendMagicEffect(CONST_ME_DRAWBLOOD) + item:transform(2874, math.random(10, 11)) + return true +end diff --git a/data/actions/scripts/misc/dolls.lua b/data/actions/scripts/misc/dolls.lua index 2219349..a5487d3 100644 --- a/data/actions/scripts/misc/dolls.lua +++ b/data/actions/scripts/misc/dolls.lua @@ -18,6 +18,14 @@ local dolls = { "Grooaaaaar*cough*", "Aaa... CHOO!", "You... will.... burn!!" + }, + [6511] = { + "Ho ho ho", + "Jingle bells, jingle bells...", + "Have you been naughty?", + "Have you been nice?", + "Merry Christmas!", + "Can you stop squeezing me now... I'm starting to feel a little sick." } } @@ -41,10 +49,23 @@ function onUse(player, item, fromPosition, target, toPosition, isHotkey) elseif random == 5 then doTargetCombatHealth(0, player, COMBAT_PHYSICALDAMAGE, -1, -1, CONST_ME_EXPLOSIONHIT) end + + if configManager.getNumber(configKeys.CLIENT_VERSION) >= 790 then + item:transform(6566) + item:decay() + end elseif item.itemid == 5668 then fromPosition:sendMagicEffect(CONST_ME_MAGIC_RED) item:transform(item.itemid + 1) item:decay() + elseif item.itemid == 5080 then + if configManager.getNumber(configKeys.CLIENT_VERSION) >= 790 then + item:transform(6568) + item:decay() + end + elseif item.itemid == 6511 then + item:transform(6567) + item:decay() end sound = sound:gsub('|PLAYERNAME|', player:getName()) diff --git a/data/actions/scripts/misc/fireworks_rocket.lua b/data/actions/scripts/misc/fireworks_rocket.lua new file mode 100644 index 0000000..8f59c8e --- /dev/null +++ b/data/actions/scripts/misc/fireworks_rocket.lua @@ -0,0 +1,17 @@ +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + if fromPosition.x ~= CONTAINER_POSITION then + fromPosition:sendMagicEffect(math.random(CONST_ME_FIREWORK_YELLOW, CONST_ME_FIREWORK_BLUE)) + else + local pos = player:getPosition() + pos:sendMagicEffect(CONST_ME_HITBYFIRE) + pos:sendMagicEffect(CONST_ME_EXPLOSIONAREA) + player:say("Ouch! Rather place it on the ground next time.", TALKTYPE_MONSTER_SAY) + if (player:getHealth() > 10) then + player:addHealth(-10) + end + end + + item:remove() + + return true +end diff --git a/data/actions/scripts/misc/food.lua b/data/actions/scripts/misc/food.lua index 94f48b2..e176edd 100644 --- a/data/actions/scripts/misc/food.lua +++ b/data/actions/scripts/misc/food.lua @@ -46,6 +46,13 @@ local foods = { [6392] = "Mmmm.", -- valentine's cake [6393] = "Mmmm.", -- cream cake [6500] = "Mmmm.", -- gingerbreadman + [6541] = "Gulp.", -- coloured egg + [6542] = "Gulp.", -- coloured egg + [6543] = "Gulp.", -- coloured egg + [6544] = "Gulp.", -- coloured egg + [6545] = "Gulp.", -- coloured egg + [6569] = "Mmmm.", -- candy + [6574] = "Mmmm.", -- bar of chocolate } function onUse(player, item, fromPosition, target, toPosition) diff --git a/data/actions/scripts/misc/instruments.lua b/data/actions/scripts/misc/instruments.lua index 2a69514..8c71a80 100644 --- a/data/actions/scripts/misc/instruments.lua +++ b/data/actions/scripts/misc/instruments.lua @@ -17,6 +17,11 @@ function onUse(player, item, fromPosition, target, toPosition) else item:getPosition():sendMagicEffect(CONST_ME_SOUND_YELLOW) end + elseif item:getId() == 6572 then + item:getPosition():sendMagicEffect(CONST_ME_SOUND_GREEN) + item:getPosition():sendMonsterSay("TOOOOOOT") + item:transform(6573) + item:decay() end return true diff --git a/data/actions/scripts/misc/party_hat.lua b/data/actions/scripts/misc/party_hat.lua new file mode 100644 index 0000000..bf5a485 --- /dev/null +++ b/data/actions/scripts/misc/party_hat.lua @@ -0,0 +1,9 @@ +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + local slot = player:getSlotItem(CONST_SLOT_HEAD) + if slot and item.uid == slot.uid then + player:getPosition():sendMagicEffect(CONST_ME_GIFT_WRAPS) + return true + end + + return false +end diff --git a/data/items792/items.srv b/data/items792/items.srv index 99eeb21..62b0cef 100644 --- a/data/items792/items.srv +++ b/data/items792/items.srv @@ -29639,8 +29639,6 @@ Name = "a santa hat" Flags = {Take,Armor} Attributes = {Weight=750,SlotType=HEAD,ArmorValue=1} -# TODO: Pradeti nuo cia - TypeID = 6532 Name = "a dead defiler" Flags = {Container,Unmove,Corpse,Expire} @@ -29673,8 +29671,8 @@ Attributes = {Weight=2500} TypeID = 6538 Name = "a valentine's card" -Flags = {Take} -Attributes = {Weight=100} +Flags = {Text,WriteOnce,Take} +Attributes = {maxLength=1024,Weight=100} TypeID = 6539 Name = "the Handmaiden's protector" @@ -29689,27 +29687,27 @@ Attributes = {Weight=6500} TypeID = 6541 Name = "a coloured egg" Flags = {Cumulative,Take} -Attributes = {Weight=30} +Attributes = {Nutrition=6,Weight=30} TypeID = 6542 Name = "a coloured egg" Flags = {Cumulative,Take} -Attributes = {Weight=30} +Attributes = {Nutrition=6,Weight=30} TypeID = 6543 Name = "a coloured egg" Flags = {Cumulative,Take} -Attributes = {Weight=30} +Attributes = {Nutrition=6,Weight=30} TypeID = 6544 Name = "a coloured egg" Flags = {Cumulative,Take} -Attributes = {Weight=30} +Attributes = {Nutrition=6,Weight=30} TypeID = 6545 Name = "a coloured egg" Flags = {Cumulative,Take} -Attributes = {Weight=30} +Attributes = {Nutrition=6,Weight=30} TypeID = 6546 Name = "Dracola's eye" @@ -29717,7 +29715,7 @@ Flags = {Take} Attributes = {Weight=1500} TypeID = 6547 -Name = "yellow powder" +Name = "a yellow powder" Flags = {Cumulative,Take} Attributes = {Weight=50} @@ -29750,14 +29748,14 @@ Attributes = {FluidSource=SLIME,ExpireTarget=0,TotalExpireTime=360} TypeID = 6553 Name = "a ruthless axe" -Flags = {Take} -Attributes = {Weight=5800} +Flags = {MultiUse,Take,Weapon} +Attributes = {Weight=5800,SlotType=TWOHANDED,WeaponType=AXE,Attack=49,Defense=15} TypeID = 6554 -Name = "" +Name = "" # this is nothing in client TypeID = 6555 -Name = "" +Name = "" # this is nothing in client TypeID = 6556 Name = "a tic-tac-toe token" @@ -29778,7 +29776,7 @@ Flags = {Take} Attributes = {Weight=200} TypeID = 6559 -Name = "" +Name = "" # this is nothing in client TypeID = 6560 Name = "a dead human" @@ -29792,11 +29790,11 @@ Attributes = {Weight=500} TypeID = 6562 Name = "a flat roof" -Flags = {Clip,Unpass,Unmove} +Flags = {Clip,Unpass,Unmove,Unlay} TypeID = 6563 Name = "a flat roof" -Flags = {Clip,Unpass,Unmove} +Flags = {Clip,Unpass,Unmove,Unlay} TypeID = 6564 Name = "a flat roof" @@ -29824,7 +29822,7 @@ Attributes = {Weight=600,ExpireTarget=5080,TotalExpireTime=3} TypeID = 6569 Name = "a candy" Flags = {Cumulative,Take} -Attributes = {Weight=5} +Attributes = {Nutrition=1,Weight=5} TypeID = 6570 Name = "a surprise bag" @@ -29838,34 +29836,39 @@ Attributes = {Weight=1000} TypeID = 6572 Name = "a party trumpet" -Flags = {Take} +Flags = {UseEvent,Take} Attributes = {Weight=50} +TypeID = 6573 +Name = "a party trumpet" +Flags = {Take,Expire} +Attributes = {Weight=50,ExpireTarget=6572,TotalExpireTime=3} + TypeID = 6574 Name = "a bar of chocolate" Flags = {Take} -Attributes = {Weight=10} +Attributes = {Nutrition=5,Weight=10} TypeID = 6575 Name = "red balloons" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=10} TypeID = 6576 Name = "a fireworks rocket" Description = "Do not use in your backpack or while asleep. Keep away from animals or children" -Flags = {Take} +Flags = {UseEvent,Take} Attributes = {Weight=100} TypeID = 6577 Name = "green balloons" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=10} TypeID = 6578 Name = "a party hat" -Flags = {Take} -Attributes = {Weight=750} +Flags = {Take,Armor} +Attributes = {Weight=750,SlotType=HEAD,ArmorValue=1} TypeID = 6579 Name = "a doll" diff --git a/data/npc/gorn.npc b/data/npc/gorn.npc index e7c8f9e..e362735 100644 --- a/data/npc/gorn.npc +++ b/data/npc/gorn.npc @@ -92,6 +92,7 @@ VANISH,! -> "Good bye." "shovel" -> Type=3457, Amount=1, Price=50, "Do you want to buy a shovel for %P gold?", Topic=1 "rod" -> Type=3483, Amount=1, Price=150, "Do you want to buy a fishing rod for %P gold?", Topic=1 "greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 +"valentine","card",ClientVersion>=790 -> Type=6538, Amount=1, Price=30, "Do you want to buy a valentine's card for %P gold?", Topic=1 %1,1<%1,"torch" -> Type=2920, Amount=%1, Price=2*%1, "Do you want to buy %A torches for %P gold?", Topic=1 %1,1<%1,"bag" -> Type=2853, Amount=%1, Price=5*%1, "Do you want to buy %A bags for %P gold?", Topic=1 @@ -118,6 +119,7 @@ VANISH,! -> "Good bye." %1,1<%1,"shovel" -> Type=3457, Amount=%1, Price=50*%1, "Do you want to buy %A shovels for %P gold?", Topic=1 %1,1<%1,"rod" -> Type=3483, Amount=%1, Price=150*%1, "Do you want to buy %A fishing rods for %P gold?", Topic=1 %1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 +%1,1<%1,"valentine","card",ClientVersion>=790 -> Type=6538, Amount=%1, Price=30*%1, "Do you want to buy %A valentine's cards for %P gold?", Topic=1 "worm" -> "I sell worms only in sixpacks for 5 gold each, how many sixpacks of worms do you want to buy?" "worms" -> * diff --git a/data/npc/perod.npc b/data/npc/perod.npc index 90af9fa..853b8b6 100644 --- a/data/npc/perod.npc +++ b/data/npc/perod.npc @@ -83,6 +83,7 @@ VANISH,! -> "Good bye." "shovel" -> Type=3457, Amount=1, Price=50, "Do you want to buy a shovel for %P gold?", Topic=1 "rod" -> Type=3483, Amount=1, Price=150, "Do you want to buy a fishing rod for %P gold?", Topic=1 "greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 +"valentine","card",ClientVersion>=790 -> Type=6538, Amount=1, Price=30, "Do you want to buy a valentine's card for %P gold?", Topic=1 %1,1<%1,"torch" -> Type=2920, Amount=%1, Price=2*%1, "Do you want to buy %A torches for %P gold?", Topic=1 %1,1<%1,"bag" -> Type=2864, Amount=%1, Price=5*%1, "Do you want to buy %A bags for %P gold?", Topic=1 @@ -109,6 +110,7 @@ VANISH,! -> "Good bye." %1,1<%1,"shovel" -> Type=3457, Amount=%1, Price=50*%1, "Do you want to buy %A shovels for %P gold?", Topic=1 %1,1<%1,"rod" -> Type=3483, Amount=%1, Price=150*%1, "Do you want to buy %A fishing rods for %P gold?", Topic=1 %1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 +%1,1<%1,"valentine","card",ClientVersion>=790 -> Type=6538, Amount=%1, Price=30*%1, "Do you want to buy %A valentine's cards for %P gold?", Topic=1 "worm" -> "I sell worms only in sixpacks for 5 gold each, how many sixpacks of worms would you like to buy?" "worms" -> * diff --git a/data/npc/pydar.npc b/data/npc/pydar.npc index 21fde8c..7205e98 100644 --- a/data/npc/pydar.npc +++ b/data/npc/pydar.npc @@ -111,7 +111,7 @@ VANISH,! -> "May the fire in your heart never die." Topic=6,"yes", QuestValue(102) > 0,! -> "You already possess this blessing." Topic=6,"yes", QuestValue(199) < 1,! -> "You need the blessing of the great geomancer first." Topic=6,"yes",Count(3215)>0,CountMoney "Oh. You do not have enough money." -Topic=6,"yes",Count(3215)>0,! -> "So receive the mark of the flame and be blessed by the phoenix, pilgrim", DeleteMoney, EffectOpp(13),SetQuestValue(102,1),SetQuestValue(199,0) +Topic=6,"yes",Count(3215)>0,! -> "So receive the mark of the flame and be blessed by the phoenix, pilgrim", DeleteMoney, EffectOpp(13),SetQuestValue(102,1),SetQuestValue(199,0),Bless(5) Topic=6,! -> "Perhaps another time." "spark",QuestValue(44)=1,Count(3215)<1 -> "Since the phoenix smiles upon you, could have received this blessing cheaper if you had a phoenix egg with you. But because you don't have it with you, its still 10.000 gold. Is that ok?",Price=10000, topic=7 @@ -119,7 +119,7 @@ Topic=6,! -> "Perhaps another time." Topic=7,"yes", QuestValue(102) > 0,! -> "You already possess this blessing." Topic=7,"yes", QuestValue(199) < 1,! -> "You need the blessing of the great geomancer first." Topic=7,"yes",CountMoney "Oh. You do not have enough money." -Topic=7,"yes",! -> "So receive the mark of the flame and be blessed by the phoenix, pilgrim", DeleteMoney, EffectOpp(13),SetQuestValue(102,1),SetQuestValue(199,0) +Topic=7,"yes",! -> "So receive the mark of the flame and be blessed by the phoenix, pilgrim", DeleteMoney, EffectOpp(13),SetQuestValue(102,1),SetQuestValue(199,0),Bless(5) Topic=7,! -> "Perhaps another time." diff --git a/data/npc/shiantis.npc b/data/npc/shiantis.npc index 2f2e537..c6c75a7 100644 --- a/data/npc/shiantis.npc +++ b/data/npc/shiantis.npc @@ -57,6 +57,7 @@ VANISH,! -> "Good bye." "watch" -> Type=2906, Amount=1, Price=20, "Do you want to buy one of my high quality watches for %P gold?", Topic=1 "football" -> Type=2990, Amount=1, Price=111, "Do you want to buy a football for %P gold?", Topic=1 "greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 +"valentine","card",ClientVersion>=790 -> Type=6538, Amount=1, Price=30, "Do you want to buy a valentine's card for %P gold?", Topic=1 %1,1<%1,"torch" -> Type=2920, Amount=%1, Price=2*%1, "Do you wanna buy %A torches for %P gold?", Topic=1 %1,1<%1,"candelabr" -> Type=2911, Amount=%1, Price=8*%1, "Do you wanna buy %A candelabra for %P gold?", Topic=1 @@ -75,6 +76,7 @@ VANISH,! -> "Good bye." %1,1<%1,"watch" -> Type=2906, Amount=%1, Price=20*%1, "Do you want to buy %A of my high quality watches for %P gold?", Topic=1 %1,1<%1,"football" -> Type=2990, Amount=%1, Price=111*%1, "Do you want to buy %A footballs for %P gold?", Topic=1 %1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 +%1,1<%1,"valentine","card",ClientVersion>=790 -> Type=6538, Amount=%1, Price=30*%1, "Do you want to buy %A valentine's cards for %P gold?", Topic=1 Topic=1,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type) Topic=1,"yes" -> "Come back, when you have enough money." diff --git a/data/npc/thomas.npc b/data/npc/thomas.npc index 489c69d..3392a60 100644 --- a/data/npc/thomas.npc +++ b/data/npc/thomas.npc @@ -46,6 +46,7 @@ VANISH,! -> "Bye." "small","book" -> Type=2839, Amount=1, Price=15, "Do you want to buy a small book for %P gold?", Topic=1 "inkwell" -> Type=3509, Amount=1, Price=8, "Do you want to buy an inkwell for %P gold?", Topic=1 "greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 +"valentine","card",ClientVersion>=790 -> Type=6538, Amount=1, Price=30, "Do you want to buy a valentine's card for %P gold?", Topic=1 %1,1<%1,"scroll" -> Type=2815, Amount=%1, Price=5*%1, "Do you want to buy %A scrolls for %P gold?", Topic=1 %1,1<%1,"document" -> Type=2834, Amount=%1, Price=12*%1, "Do you want to buy %A documents for %P gold?", Topic=1 @@ -56,6 +57,7 @@ VANISH,! -> "Bye." %1,1<%1,"small","book" -> Type=2839, Amount=%1, Price=15*%1, "Do you want to buy %A small books for %P gold?", Topic=1 %1,1<%1,"inkwell" -> Type=3509, Amount=%1, Price=8*%1, "Do you want to buy %A inkwells for %P gold?", Topic=1 %1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 +%1,1<%1,"valentine","card",ClientVersion>=790 -> Type=6538, Amount=%1, Price=30*%1, "Do you want to buy %A valentine's cards for %P gold?", Topic=1 Topic=1,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type) Topic=1,"yes" -> "Come back, when you have enough money." diff --git a/src/const.h b/src/const.h index 4e695e8..031c372 100644 --- a/src/const.h +++ b/src/const.h @@ -52,6 +52,10 @@ enum MagicEffectClasses : uint8_t { CONST_ME_SOUND_WHITE = 25, CONST_ME_BUBBLES = 26, CONST_ME_CRAPS = 27, + CONST_ME_GIFT_WRAPS = 28, + CONST_ME_FIREWORK_YELLOW = 29, + CONST_ME_FIREWORK_RED = 30, + CONST_ME_FIREWORK_BLUE = 31, }; enum ShootType_t : uint8_t { @@ -72,6 +76,7 @@ enum ShootType_t : uint8_t { CONST_ANI_SNOWBALL = 13, CONST_ANI_POWERBOLT = 14, CONST_ANI_POISON = 15, + CONST_ANI_INFERNALBOLT = 16, }; enum SpeakClasses : uint8_t { diff --git a/src/luascript.cpp b/src/luascript.cpp index d7cf15b..69620b7 100644 --- a/src/luascript.cpp +++ b/src/luascript.cpp @@ -1194,6 +1194,10 @@ void LuaScriptInterface::registerFunctions() registerEnum(CONST_ME_SOUND_WHITE) registerEnum(CONST_ME_BUBBLES) registerEnum(CONST_ME_CRAPS) + registerEnum(CONST_ME_GIFT_WRAPS) + registerEnum(CONST_ME_FIREWORK_YELLOW) + registerEnum(CONST_ME_FIREWORK_RED) + registerEnum(CONST_ME_FIREWORK_BLUE) registerEnum(CONST_ANI_NONE) registerEnum(CONST_ANI_SPEAR) registerEnum(CONST_ANI_BOLT) @@ -1210,6 +1214,7 @@ void LuaScriptInterface::registerFunctions() registerEnum(CONST_ANI_SNOWBALL) registerEnum(CONST_ANI_POWERBOLT) registerEnum(CONST_ANI_POISON) + registerEnum(CONST_ANI_INFERNALBOLT) registerEnum(CONST_PROP_BLOCKSOLID) registerEnum(CONST_PROP_HASHEIGHT) diff --git a/src/tools.cpp b/src/tools.cpp index f970fe7..7846671 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -670,6 +670,10 @@ MagicEffectNames magicEffectNames[] = { {"whitenote", CONST_ME_SOUND_WHITE}, {"bubbles", CONST_ME_BUBBLES}, {"dice", CONST_ME_CRAPS}, + {"giftwraps", CONST_ME_GIFT_WRAPS}, + {"yellowfirework", CONST_ME_FIREWORK_YELLOW}, + {"redfirework", CONST_ME_FIREWORK_RED}, + {"bluefirework", CONST_ME_FIREWORK_BLUE}, }; ShootTypeNames shootTypeNames[] = { @@ -688,6 +692,7 @@ ShootTypeNames shootTypeNames[] = { {"snowball", CONST_ANI_SNOWBALL}, {"powerbolt", CONST_ANI_POWERBOLT}, {"poison", CONST_ANI_POISON}, + {"infernalbolt", CONST_ANI_INFERNALBOLT}, }; CombatTypeNames combatTypeNames[] = {