mirror of
https://github.com/ErikasKontenis/SabrehavenServer.git
synced 2025-04-30 01:29:21 +02:00
finish barbarian quest and add mead to fluids
This commit is contained in:
ErikasKontenis
parent
c62f7b93e2
commit
a44efd508f
@ -584,4 +584,21 @@
|
||||
<missionstate id="4" description="You have completed The Inquisition Quest! You can now buy the Blessing of the Inquisition!" />
|
||||
</mission>
|
||||
</quest>
|
||||
<quest name="Barbarian Test Quest" startstorageid="12190" startstoragevalue="1">
|
||||
<mission name="Barbarian Test 1: Barbarian Booze" storageid="12191" startvalue="1" endvalue="3">
|
||||
<missionstate id="1" description="Talk to Sven about mead and give him a honeycomb. For each honeycomb you will be allowed 20 sips." />
|
||||
<missionstate id="2" description="Now drink from the bucket until you drink 10 sips in a row without passing out" />
|
||||
<missionstate id="3" description="You have completed this Test! Talk to Sven about the mead." />
|
||||
</mission>
|
||||
<mission name="Barbarian Test 2: The Bear Hugging" storageid="12192" startvalue="1" endvalue="3">
|
||||
<missionstate id="1" description="Sven gave you a Mead Horn. Fill it with mead from the bucket behind Sven (brown contents) and then proceed to the sleeping bear. The bear is inside a small ice cave in the north. Use the full mead horn on the bear so it becomes unconscious, then use the bear to hug it." />
|
||||
<missionstate id="2" description="You hugging the bear! Go tell Sven that you hugged the bear!" />
|
||||
<missionstate id="3" description="You have completed this Test!" />
|
||||
</mission>
|
||||
<mission name="Barbarian Test 3: The Mammoth Pushing" storageid="12193" startvalue="1" endvalue="3">
|
||||
<missionstate id="1" description="Go to the north-west of Svargrond and find the Mammoth. Drink your three mugs of mead, stand in front of the Mammoth and push it. Just use it..." />
|
||||
<missionstate id="2" description="You pushed the Mammoth! Go tell Sven that you pushed the Mammoth!" />
|
||||
<missionstate id="3" description="You have completed this Test! You can now be a citizen of Svargrond!" />
|
||||
</mission>
|
||||
</quest>
|
||||
</quests>
|
||||
|
||||
@ -89,6 +89,11 @@
|
||||
<action itemid="133" script="inquisition/holyWater.lua" />
|
||||
<action actionid="2002" script="inquisition/vampireHunt.lua" />
|
||||
|
||||
<!-- Barbarian Test -->
|
||||
<action fromid="7174" toid="7176" script="barbarian_test/horn.lua" />
|
||||
<action fromid="7140" toid="7141" script="barbarian_test/horn.lua" />
|
||||
<action actionid="3110" script="barbarian_test/mead.lua" />
|
||||
|
||||
<!-- Pits of Inferno -->
|
||||
<action actionid="17642" script="pits_of_inferno/oil.lua" />
|
||||
<action fromaid="17653" toaid="17656" script="pits_of_inferno/hall_of_the_four_ways.lua" />
|
||||
|
||||
45
data/actions/scripts/barbarian_test/horn.lua
Normal file
45
data/actions/scripts/barbarian_test/horn.lua
Normal file
@ -0,0 +1,45 @@
|
||||
local function sendSleepEffect(position)
|
||||
position:sendMagicEffect(CONST_ME_SLEEP)
|
||||
end
|
||||
|
||||
function onUse(player, item, fromPosition, target, toPosition, isHotkey)
|
||||
if target.actionid == 3110 and item.itemid == 7140 then
|
||||
player:say('You fill your horn with ale.', TALKTYPE_MONSTER_SAY)
|
||||
item:transform(7141)
|
||||
toPosition:sendMagicEffect(CONST_ME_MAGIC_BLUE)
|
||||
elseif target.itemid == 7174 and item.itemid == 7141 then
|
||||
player:say('The bear is now unconcious.', TALKTYPE_MONSTER_SAY)
|
||||
item:transform(7140)
|
||||
target:transform(7175)
|
||||
toPosition:sendMagicEffect(CONST_ME_STUN)
|
||||
elseif item.itemid == 7175 then
|
||||
if player:getStorageValue(12190) == 4 then
|
||||
player:say('You hug the unconcious bear.', TALKTYPE_MONSTER_SAY)
|
||||
player:setStorageValue(12190, 5)
|
||||
player:setStorageValue(12192, 2) -- Questlog Barbarian Test Quest Barbarian Test 2: The Bear Hugging
|
||||
item:transform(7174)
|
||||
toPosition:sendMagicEffect(CONST_ME_SLEEP)
|
||||
else
|
||||
player:say('You don\'t feel like hugging an unconcious bear.', TALKTYPE_MONSTER_SAY)
|
||||
end
|
||||
elseif item.itemid == 7174 then
|
||||
player:say('Grr.', TALKTYPE_MONSTER_SAY)
|
||||
player:say('The bear is not amused by the disturbance.', TALKTYPE_MONSTER_SAY)
|
||||
doAreaCombatHealth(player, COMBAT_PHYSICALDAMAGE, player:getPosition(), 0, -10, -30, CONST_ME_POFF)
|
||||
elseif item.itemid == 7176 then
|
||||
if player:getStorageValue(12190) == 6 then
|
||||
if player:getCondition(CONDITION_DRUNK) then
|
||||
player:say('You hustle the mammoth. What a fun. *hicks*.', TALKTYPE_MONSTER_SAY)
|
||||
player:setStorageValue(12190, 7)
|
||||
player:setStorageValue(12193, 2) -- Questlog Barbarian Test Quest Barbarian Test 3: The Mammoth Pushing
|
||||
item:transform(7177)
|
||||
item:decay()
|
||||
addEvent(sendSleepEffect, 60 * 1000, toPosition)
|
||||
toPosition:sendMagicEffect(CONST_ME_SLEEP)
|
||||
else
|
||||
player:say('You are not drunk enough to hustle a mammoth.', TALKTYPE_MONSTER_SAY)
|
||||
end
|
||||
end
|
||||
end
|
||||
return true
|
||||
end
|
||||
25
data/actions/scripts/barbarian_test/mead.lua
Normal file
25
data/actions/scripts/barbarian_test/mead.lua
Normal file
@ -0,0 +1,25 @@
|
||||
function onUse(player, item, fromPosition, target, toPosition, isHotkey)
|
||||
if player:getStorageValue(12190) == 2 and player:getStorageValue(12194) <= 20 then
|
||||
if math.random(5) > 1 then
|
||||
player:say('The world seems to spin but you manage to stay on your feet.', TALKTYPE_MONSTER_SAY)
|
||||
player:setStorageValue(12195, player:getStorageValue(12195) + 1)
|
||||
if player:getStorageValue(12195) == 9 then -- 9 sips here cause local player at start
|
||||
player:say('10 sips in a row. Yeah!', TALKTYPE_MONSTER_SAY)
|
||||
player:setStorageValue(12190, 3)
|
||||
player:setStorageValue(12191, 3) -- Questlog Barbarian Test Quest Barbarian Test 1: Barbarian Booze
|
||||
return true
|
||||
end
|
||||
else
|
||||
player:say('The mead was too strong. You passed out for a moment.', TALKTYPE_MONSTER_SAY)
|
||||
player:setStorageValue(12195, 0)
|
||||
end
|
||||
player:setStorageValue(12194, player:getStorageValue(12194) + 1)
|
||||
elseif player:getStorageValue(12194) > 20 then
|
||||
player:say('Ask Sven for another round.', TALKTYPE_MONSTER_SAY)
|
||||
player:setStorageValue(12190, 1)
|
||||
player:setStorageValue(12191, 1) -- Questlog Barbarian Test Quest Barbarian Test 1: Barbarian Booze
|
||||
elseif player:getStorageValue(12190) >= 3 then
|
||||
player:say('You already passed the test, no need to torture yourself anymore.', TALKTYPE_MONSTER_SAY)
|
||||
end
|
||||
return true
|
||||
end
|
||||
@ -19,7 +19,8 @@ local messages = {
|
||||
[FLUID_LEMONADE] = "Mmmh.",
|
||||
[FLUID_RUM] = "Aah...",
|
||||
[FLUID_COCONUTMILK] = "Mmmh.",
|
||||
[FLUID_FRUITJUICE] = "Mmmh."
|
||||
[FLUID_FRUITJUICE] = "Mmmh.",
|
||||
[FLUID_MEAD] = "Aah...",
|
||||
}
|
||||
|
||||
function onUse(player, item, fromPosition, target, toPosition)
|
||||
@ -35,24 +36,12 @@ function onUse(player, item, fromPosition, target, toPosition)
|
||||
end
|
||||
end
|
||||
|
||||
if (configManager.getBoolean(configKeys.UH_TRAP)) then
|
||||
local tile = Tile(toPosition)
|
||||
local creature = tile:getBottomCreature()
|
||||
if creature and creature:isPlayer() then
|
||||
target = creature
|
||||
end
|
||||
else
|
||||
-- monsters do not use mana also I do not know if you can use life fluid on monsters
|
||||
-- if you can just want to use life fluids on monster then change isPlayer to isCreature
|
||||
target = target:isPlayer() and target
|
||||
end
|
||||
|
||||
if target:isCreature() and target:getPlayer() ~= nil then
|
||||
if item:getFluidType() == FLUID_NONE then
|
||||
player:sendCancelMessage("It is empty.")
|
||||
else
|
||||
local self = target == player
|
||||
if self and item:getFluidType() == FLUID_BEER or item:getFluidType() == FLUID_WINE or item:getFluidType() == FLUID_RUM then
|
||||
if self and item:getFluidType() == FLUID_BEER or item:getFluidType() == FLUID_WINE or item:getFluidType() == FLUID_RUM or item:getFluidType() == FLUID_MEAD then
|
||||
player:addCondition(drunk)
|
||||
elseif self and item:getFluidType() == FLUID_SLIME then
|
||||
player:addCondition(poison)
|
||||
|
||||
@ -46,6 +46,9 @@ Name = "coconut milk"
|
||||
TypeID = 15
|
||||
Name = "fruit juice"
|
||||
|
||||
TypeID = 16
|
||||
Name = "mead"
|
||||
|
||||
# --- end of server specific object types ---
|
||||
|
||||
TypeID = 100
|
||||
|
||||
91
data/npc/sven.npc
Normal file
91
data/npc/sven.npc
Normal file
@ -0,0 +1,91 @@
|
||||
# GIMUD - Graphical Interface Multi User Dungeon
|
||||
# Henricus.npc: Datenbank für den Waffenhändler Henricus
|
||||
|
||||
Name = "Sven"
|
||||
Outfit = (143,76-57-115-40-3)
|
||||
Home = [32202,31153,7]
|
||||
Radius = 2
|
||||
|
||||
Behaviour = {
|
||||
ADDRESS,"hello$",! -> "Be greeted, %N! What brings you here?"
|
||||
ADDRESS,"hi$",! -> *
|
||||
ADDRESS,! -> Idle
|
||||
BUSY,"hello$",! -> "I will have finished soon %N.", Queue
|
||||
BUSY,"hi$",! -> *
|
||||
BUSY,! -> NOP
|
||||
VANISH,! -> "This ungraceful haste!", Idle
|
||||
|
||||
"bye" -> "May wind and weather be with you, %N.", Idle
|
||||
"name" -> "I am Sven the Younger. My father, Sven the Elder has been missing in the ice waste since I was young. But unless one of our people is buried properly, we assume that he is still in the realm of the living ...", "Therefore, I am still known as 'the Younger', even though I have grown old."
|
||||
"here" -> "I am the jarl of my people. It's an honour and I am very proud of it."
|
||||
"job" -> *
|
||||
"people" -> "Our people are simple and honest. We don't like the scheming ways of the city dwellers that live on the main continent."
|
||||
"jarl" -> "I am more than just the spokesman and highest judge among my people. I don't raise taxes, and when the clans feel that it is necessary, I will be replaced by another jarl."
|
||||
"leader" -> *
|
||||
"king" -> "We don't need any kings and queens here. Being the jarl of my people, I see that the laws are followed."
|
||||
"queen" -> *
|
||||
"Ferumbras" -> "Even here we heard about this powerful man. Travellers from the south only dare to whisper his name."
|
||||
"Excalibug" -> "On the campfire, there are numerous tales about this weapon. It's told that it has been missing since ages ...", "In my opinion, the power and fame of a weapon shouldn't exceed the power and fame of it's wielder. And I have not heard of any hero whose fame would surpass that of excalibug."
|
||||
"barbarian" -> "A true barbarian is something special among our people. Everyone who wants to become a barbarian will have to pass the barbarian test."
|
||||
"join" -> "You might become an honorary barbarian if you manage to pass the barbarian test."
|
||||
"honourary","barbarian" -> "An honourary barbarian earns the right to become a citizen here. But to prove yourself worthy, you have to pass the barbarian test."
|
||||
"news" -> "There is something evil going on. I have it in my bones."
|
||||
"how","are","you" -> "There is something in the air that worries me. A great evil is threatening all of us ...", "I might not have the gift of dreams that foresee the future like my mother did, but I seem to have inherited some of her gift nonetheless. Sometimes I just feel that something is about to happen ...","And this time it's something sinister and evil that threatens us all."
|
||||
"bones" -> *
|
||||
"mother" -> "My mother was that what my people call a witch. This is someone who has special magical abilities without any training on Nibelor ...","She used her powers more instinctively to amplify her healing skills when herbs would not suffice. She also had the gift to foretell the future ...","At first, the druids of Nibelor scorned her, but later they accepted her for her abilities and good intentions."
|
||||
"rumours" -> "It's an old tale but it persists in the minds of the Svargrondar. It is about my father. There are rumours that he is still alive. ...","People regularly report about seeing him on top of the cliff right next to Svargrond. I myself would be glad if finally his corpse were found. Then I would be jarl 'Sven the Elder' ..... sounds much better."
|
||||
"guards" -> "We don't have an army and we don't need one. Even if the raiders call us weak, everyone of us knows how to fight ...","All adults serve as guards for some days each month as a service for the community."
|
||||
"monsters" -> "There are many dangerous creatures that roam our isles. But having seen what men can do to each other, I wouldn't call any of them a monster."
|
||||
"Santa","Claus" -> "We heard that this mythical dwarf lives somewhere on the southern Ice Islands."
|
||||
"city" -> "Our people lived as nomads some generations ago. The contact with Carlin taught us another way of living ...","We did not like everything about it but we are not stupid. We have seen the many advantages ...","If you cannot adapt to this land, you are dead and so we adapted to it and built this city. When the contact to Carlin got lost during the years of the serpents, we kept this city alive ...","And we survived, even though the raiders did their best to make us fail."
|
||||
"years","of","serpents" -> "For more than two generations no ship had reached our shores because the giant sea serpents attacked and sank most ships that tried to travel here ...","Not long ago the sea serpents disappeared as suddenly as they had come. Now ships visit us again on a regular base."
|
||||
"raiders" -> "In the past, all barbarian tribes roamed the lands of Chyll as nomads. When the Carliners came here and the trade flourished, we used the resources to build this permanent settlement ...","Some of our people claimed that it was wrong to settle down and to abandon the ancient ways. A female shaman rose in the ranks of those who opposed the erection of a settlement ...","She gathered all those who were not content, who did not want any foreign influence and who refused to learn ...","They tried to destroy everything our ancestors had built, but with the help of the Carliners they were stopped and driven away. Now they still roam the land and attack everyone they see ...","They became the raiders, our worst enemy. Nowadays, there are three larger tribes that often build camps in the South of our land ...","And after all those years, surviving several generations, this female shaman is still their leader."
|
||||
"camps" -> "The raiders' camps are mainly located in the south-western part of the isle. The camps are named after the major clans of the raiders: Ragnir, Bittermor and Grimhorn."
|
||||
"mines" -> "A long time ago when the trade with Carlin was flourishing, people actually worked in the mines. ...","During the years of the serpents, the mines had been abandoned. Later, the raiders took shelter there, although they blame us for living in a fortified city ...","Now, the traders of Carlin are back but some other foreigners seem to have claimed the mines from the raiders ...","It's neither our business nor would we have the manpower to help them to recapture the mines. Also, if they do not have the strength to get the mines back on their own, they don't deserve them anyway."
|
||||
"gods" -> "We know of father Chyll and his freezing breath. We care little for other gods. It is foolish to meddle with beings that are so powerful ...","We leave it to the druids and shamans to handle such affairs."
|
||||
"Chyll" -> "Father north wind is called Chyll by our people. He is an unforgiving hunter. He knows no mercy with the weak ...","Chyll is a harsh god and the best you can do is to avoid his attention. Only the shamans and druids deal with him."
|
||||
"druid" -> "Most shaman and druids of our people live on the sacred isle Nibelor. There, they divine the future, calm the wrath of father Chyll and prepare the dead for their last travel to the lands of Everspring."
|
||||
"shaman" -> *
|
||||
"Nibelor" -> "Nibelor has always been a sacred place for our people. The druids and shamans live there."
|
||||
"Everspring" -> "Everspring is the realm of the dead. It is a place of peace and harmony where those who boldly braved the challenges of life dwell for eternity and share stories at the campfires after a hunt ...","Every true barbarian that is properly brought into afterlife will join the great hunt in Everspring where the animals are fat and have the thickest furs."
|
||||
"cults" -> "I don't care what people who come here believe in. If they provoke father Chyll, he will take care of them on his own. If their gods prove to be more powerful than Chyll, they might deserve to live."
|
||||
"Carlin" -> "We are friends of the Carliners. Still we don't allow their politics to influence our way to handle things here."
|
||||
"Edron" -> "We have heard only little about this far away place."
|
||||
"Thais" -> "We understand that our friends from Carlin are wary with the realm ruled by Thais but this is not of our concern."
|
||||
"Venore" -> "We did not allow them to stay here. This had nothing to do with our friendship with Carlin but for the way they handled things and their harmful approach to go hunting."
|
||||
"Port","Hope" -> "We have heard only little about this far away place."
|
||||
"enemies" -> "Our enemies are numerous. Those of our people that we call the raiders are full of hate towards us. Then there are the voracious chakoyas that leave their icy homes to kill and slaughter from time to time ...","Sometimes, the great ice dragons find their way here to wreak havoc, and there are many more hungry beasts of all kinds."
|
||||
"chakoyas" -> "The chakoyas are neither beast nor man. Yet, they share the worst and more dangerous traits of both of them. Their small and furry appearance can be very misleading at first glance ...","But as soon as you've seen a pack of chakoyas literally shredding a mammoth into pieces with their claws and teeth, all misconceptions will be gone."
|
||||
"ice","dragons" -> "The dragons on our isles have adapted to the climate as every creature here. Instead of being aligned to fire, they became creatures of the cold ...","They are fierce and dangerous but, luckily, they only prey on beasts of the sea or those that wander the ice near their lairs."
|
||||
"yeti" -> "The yetis are mythical beasts. Only few that encountered those creatures lived to tell the tale. The chakoyas worship them as divine beings, although they have no real relations to them as far as we can tell."
|
||||
"dwarfs" -> "I met some of those little people in the past. Considering our experience with the chakoyas, we don't underestimate someone just for its look. And those dwarfs proved indeed to be powerful, courageous and enduring."
|
||||
"elfs" -> "Some time ago, a few elves came here but they could not stand the cold and so they left pretty soon. Most likely it was Nibelor in which they have been interested."
|
||||
|
||||
"test",QuestValue(12190)<1 -> "All of our juveniles have to take the barbarian test to become a true member of our community. Foreigners who manage to master the test are granted the title of an honorary barbarian and the respect of our people ...","Are you willing to take the barbarian test?", topic=1
|
||||
"mission",QuestValue(12190)<1 -> *
|
||||
topic=1,"no" -> "I expected better from you."
|
||||
topic=1,"yes" -> "That's the spirit! The barbarian test consists of a few tasks you will have to fulfill. All are rather simple - for a barbarian that is...","Your first task is to drink some barbarian mead. But be warned, it's a strong brew that could even knock out a bear. You need to make at least ten sips of mead in a row without passing out to pass the test ...","Do you think you can do this?",topic=2
|
||||
topic=1 -> "Uh? Whatever."
|
||||
topic=2,"no" -> "I expected better from you."
|
||||
topic=2,"yes" -> "Good, but to make barbarian mead we need some honey which is rare here. I'd hate to waste mead just to learn you're not worth it ...","Therefore, you have to get your own honey. You'll probably need more than one try so better get some extra honeycombs. Then talk to me again about barbarian mead.",SetQuestValue(12190,1),SetQuestValue(12191,1)
|
||||
topic=2 -> "Uh? Whatever."
|
||||
|
||||
"mission",QuestValue(12190)=1 -> Type=5902,Amount=1,"Do you have some honey with you?", topic=3
|
||||
"mead",QuestValue(12190)=1 -> *
|
||||
"no", topic=3 -> "I expected better from you."
|
||||
"yes", topic=3,Count(Type)<Amount -> "Go get your honeycomb first."
|
||||
"yes", topic=3,Count(Type)>=Amount -> "Good, for this honeycomb I allow you 20 sips from the mead bucket over there. Talk to me again about barbarian mead if you have passed the test.",Delete(Type),SetQuestValue(12190,2),SetQuestValue(12191,2),SetQuestValue(12194,0)
|
||||
|
||||
"mission",QuestValue(12190)=3 -> Type=7140, Amount=1, "An impressive start. Here, take your own mead horn to fill it at the mead bucket as often as you like ...","But there is much left to be done. Your next test will be to hug a bear ...","You will find one in a cave north of the town. If you are lucky, it's still sleeping. If not ... well that might hurt ...","Unless you feel that you hugged the bear, the test is not passed. Once you are done, talk to me about the bear hugging.",Create(Type),SetQuestValue(12190,4),SetQuestValue(12192,1)
|
||||
"mead",QuestValue(12190)=3 -> *
|
||||
|
||||
"mission",QuestValue(12190)=5 -> "Amazing. That was as clever and brave as a barbarian is supposed to be. But a barbarian also has to be strong and fearless. To prove that you will have to knock over a mammoth ...","Did your face just turn into the color of fresh snow? However, you will find a lonely mammoth north west of the town in the wilderness. Knock it over to prove to be a true barbarian ...","Return to me and talk about the mammoth pushing when you are done.",SetQuestValue(12190,6),SetQuestValue(12192,3),SetQuestValue(12193,1)
|
||||
"hug",QuestValue(12190)=5 -> *
|
||||
|
||||
"mission",QuestValue(12190)=7 -> "As you have passed all three tests, I welcome you in our town as an honorary barbarian. You can now become a citizen. Don't forget to talk to the people here. Some of them might need some help ...","We usually solve our problems on our own but some of the people might have a mission for you. Old Iskan, on the ice in the northern part of the town had some trouble with his dogs lately.",SetQuestValue(12190,8),SetQuestValue(12193,3)
|
||||
"mammoth",QuestValue(12190)=7 -> *
|
||||
|
||||
"mission",QuestValue(12190)=8 -> "You have braved all three tests and are now an honorary barbarian."
|
||||
"mammoth",QuestValue(12190)=8 -> *
|
||||
"test",QuestValue(12190)=8 -> *
|
||||
}
|
||||
@ -958,64 +958,64 @@
|
||||
<house name="Unnamed House #2410" houseid="2410" entryx="32327" entryy="32213" entryz="7" rent="0" townid="1" size="28" />
|
||||
<house name="Unnamed House #2411" houseid="2411" entryx="32327" entryy="32208" entryz="7" rent="0" townid="1" size="16" />
|
||||
<house name="Unnamed House #2412" houseid="2412" entryx="32403" entryy="32218" entryz="6" rent="0" townid="1" size="39" />
|
||||
<house name="Corner Shop (Shop)" houseid="2413" entryx="32311" entryy="31136" entryz="7" rent="2215" townid="13" size="36"/>
|
||||
<house name="Tusk Flats 1" houseid="2414" entryx="32300" entryy="31124" entryz="7" rent="765" townid="13" size="14"/>
|
||||
<house name="Tusk Flats 2" houseid="2415" entryx="32301" entryy="31117" entryz="7" rent="835" townid="13" size="16"/>
|
||||
<house name="Tusk Flats 3" houseid="2416" entryx="32308" entryy="31111" entryz="7" rent="660" townid="13" size="11"/>
|
||||
<house name="Tusk Flats 4" houseid="2417" entryx="32307" entryy="31105" entryz="7" rent="315" townid="13" size="6"/>
|
||||
<house name="Tusk Flats 6" houseid="2418" entryx="32308" entryy="31099" entryz="7" rent="660" townid="13" size="12"/>
|
||||
<house name="Tusk Flats 5" houseid="2419" entryx="32320" entryy="31108" entryz="7" rent="455" townid="13" size="11"/>
|
||||
<house name="Shady Rocks 5" houseid="2420" entryx="32288" entryy="31125" entryz="7" rent="2890" townid="13" size="57"/>
|
||||
<house name="Shady Rocks 4 (Shop)" houseid="2421" entryx="32279" entryy="31118" entryz="7" rent="2710" townid="13" size="50"/>
|
||||
<house name="Shady Rocks 3" houseid="2422" entryx="32277" entryy="31121" entryz="7" rent="4115" townid="13" size="77"/>
|
||||
<house name="Shady Rocks 2" houseid="2423" entryx="32259" entryy="31119" entryz="7" rent="2010" townid="13" size="29"/>
|
||||
<house name="Shady Rocks 1" houseid="2424" entryx="32259" entryy="31110" entryz="7" rent="3630" townid="13" size="65"/>
|
||||
<house name="Crystal Glance" houseid="2425" entryx="32246" entryy="31118" entryz="7" rent="19625" townid="13" size="237"/>
|
||||
<house name="Arena Walk 3" houseid="2426" entryx="32235" entryy="31118" entryz="7" rent="3550" townid="13" size="59"/>
|
||||
<house name="Arena Walk 2" houseid="2427" entryx="32239" entryy="31126" entryz="7" rent="1400" townid="13" size="21"/>
|
||||
<house name="Arena Walk 1" houseid="2428" entryx="32238" entryy="31134" entryz="7" rent="3250" townid="13" size="55"/>
|
||||
<house name="Bears Paw 2" houseid="2429" entryx="32241" entryy="31133" entryz="7" rent="2305" townid="13" size="44"/>
|
||||
<house name="Bears Paw 1" houseid="2430" entryx="32264" entryy="31132" entryz="7" rent="1810" townid="13" size="33"/>
|
||||
<house name="Spirit Homes 5" houseid="2431" entryx="32223" entryy="31142" entryz="7" rent="1450" townid="13" size="21"/>
|
||||
<house name="Glacier Side 3" houseid="2432" entryx="32206" entryy="31140" entryz="7" rent="1950" townid="13" size="30"/>
|
||||
<house name="Glacier Side 2" houseid="2433" entryx="32203" entryy="31132" entryz="7" rent="4750" townid="13" size="83"/>
|
||||
<house name="Glacier Side 1" houseid="2434" entryx="32206" entryy="31126" entryz="7" rent="1600" townid="13" size="26"/>
|
||||
<house name="Spirit Homes 1" houseid="2435" entryx="32210" entryy="31124" entryz="7" rent="1700" townid="13" size="27"/>
|
||||
<house name="Spirit Homes 2" houseid="2436" entryx="32219" entryy="31124" entryz="7" rent="1900" townid="13" size="31"/>
|
||||
<house name="Spirit Homes 3" houseid="2437" entryx="32216" entryy="31124" entryz="6" rent="4250" townid="13" size="75"/>
|
||||
<house name="Spirit Homes 4" houseid="2438" entryx="32220" entryy="31129" entryz="7" rent="1100" townid="13" size="19"/>
|
||||
<house name="Glacier Side 4" houseid="2439" entryx="32204" entryy="31147" entryz="6" rent="2050" townid="13" size="38"/>
|
||||
<house name="Shelf Site" houseid="2440" entryx="32197" entryy="31150" entryz="6" rent="4800" townid="13" size="83"/>
|
||||
<house name="Raven Corner 1" houseid="2441" entryx="32234" entryy="31154" entryz="7" rent="855" townid="13" size="15"/>
|
||||
<house name="Raven Corner 2" houseid="2442" entryx="32233" entryy="31156" entryz="7" rent="1685" townid="13" size="25"/>
|
||||
<house name="Raven Corner 3" houseid="2443" entryx="32234" entryy="31157" entryz="7" rent="855" townid="13" size="15"/>
|
||||
<house name="Bears Paw 3" houseid="2444" entryx="32248" entryy="31157" entryz="7" rent="2090" townid="13" size="35"/>
|
||||
<house name="Bears Paw 4" houseid="2445" entryx="32256" entryy="31158" entryz="7" rent="5205" townid="13" size="99"/>
|
||||
<house name="Bears Paw 5" houseid="2446" entryx="32272" entryy="31157" entryz="7" rent="2045" townid="13" size="34"/>
|
||||
<house name="Trout Plaza 5 (Shop)" houseid="2447" entryx="32268" entryy="31174" entryz="7" rent="3880" townid="13" size="73"/>
|
||||
<house name="Pilchard Bin 1" houseid="2448" entryx="32280" entryy="31164" entryz="7" rent="685" townid="13" size="8"/>
|
||||
<house name="Pilchard Bin 2" houseid="2449" entryx="32280" entryy="31160" entryz="7" rent="685" townid="13" size="8"/>
|
||||
<house name="Pilchard Bin 3" houseid="2450" entryx="32280" entryy="31156" entryz="7" rent="585" townid="13" size="10"/>
|
||||
<house name="Pilchard Bin 4" houseid="2451" entryx="32280" entryy="31152" entryz="7" rent="585" townid="13" size="10"/>
|
||||
<house name="Pilchard Bin 5" houseid="2452" entryx="32280" entryy="31148" entryz="7" rent="685" townid="13" size="8"/>
|
||||
<house name="Pilchard Bin 10" houseid="2453" entryx="32281" entryy="31148" entryz="6" rent="450" townid="13" size="7"/>
|
||||
<house name="Pilchard Bin 9" houseid="2454" entryx="32281" entryy="31152" entryz="6" rent="450" townid="13" size="7"/>
|
||||
<house name="Pilchard Bin 8" houseid="2455" entryx="32281" entryy="31156" entryz="6" rent="450" townid="13" size="6"/>
|
||||
<house name="Pilchard Bin 7" houseid="2456" entryx="32281" entryy="31160" entryz="6" rent="450" townid="13" size="7"/>
|
||||
<house name="Pilchard Bin 6" houseid="2457" entryx="32281" entryy="31164" entryz="6" rent="450" townid="13" size="7"/>
|
||||
<house name="Trout Plaza 1" houseid="2458" entryx="32248" entryy="31166" entryz="7" rent="2395" townid="13" size="43"/>
|
||||
<house name="Trout Plaza 2" houseid="2459" entryx="32260" entryy="31161" entryz="7" rent="1540" townid="13" size="26"/>
|
||||
<house name="Trout Plaza 3" houseid="2460" entryx="32255" entryy="31173" entryz="7" rent="900" townid="13" size="18"/>
|
||||
<house name="Trout Plaza 4" houseid="2461" entryx="32255" entryy="31177" entryz="7" rent="900" townid="13" size="18"/>
|
||||
<house name="Skiffs End 1" houseid="2462" entryx="32250" entryy="31187" entryz="7" rent="1540" townid="13" size="28"/>
|
||||
<house name="Skiffs End 2" houseid="2463" entryx="32257" entryy="31189" entryz="7" rent="910" townid="13" size="13"/>
|
||||
<house name="Furrier Quarter 3" houseid="2464" entryx="32232" entryy="31191" entryz="7" rent="1010" townid="13" size="20"/>
|
||||
<house name="Mammoth Belly" houseid="2465" entryx="32241" entryy="31174" entryz="7" rent="22810" townid="13" size="278"/>
|
||||
<house name="Furrier Quarter 2" houseid="2466" entryx="32225" entryy="31177" entryz="7" rent="1045" townid="13" size="21"/>
|
||||
<house name="Furrier Quarter 1" houseid="2467" entryx="32221" entryy="31176" entryz="7" rent="1635" townid="13" size="34"/>
|
||||
<house name="Fimbul Shelf 3" houseid="2468" entryx="32215" entryy="31177" entryz="7" rent="1255" townid="13" size="28"/>
|
||||
<house name="Fimbul Shelf 4" houseid="2469" entryx="32218" entryy="31191" entryz="7" rent="1045" townid="13" size="22"/>
|
||||
<house name="Fimbul Shelf 2" houseid="2470" entryx="32209" entryy="31175" entryz="7" rent="1045" townid="13" size="21"/>
|
||||
<house name="Fimbul Shelf 1" houseid="2471" entryx="32204" entryy="31169" entryz="7" rent="975" townid="13" size="20"/>
|
||||
<house name="Frost Manor" houseid="2472" entryx="32287" entryy="31106" entryz="5" rent="26370" townid="13" size="382"/>
|
||||
<house name="Corner Shop (Shop)" houseid="2413" entryx="32311" entryy="31136" entryz="7" rent="2215" townid="13" size="40" />
|
||||
<house name="Tusk Flats 1" houseid="2414" entryx="32300" entryy="31124" entryz="7" rent="765" townid="13" size="14" />
|
||||
<house name="Tusk Flats 2" houseid="2415" entryx="32301" entryy="31117" entryz="7" rent="835" townid="13" size="16" />
|
||||
<house name="Tusk Flats 3" houseid="2416" entryx="32308" entryy="31111" entryz="7" rent="660" townid="13" size="11" />
|
||||
<house name="Tusk Flats 4" houseid="2417" entryx="32307" entryy="31105" entryz="7" rent="315" townid="13" size="6" />
|
||||
<house name="Tusk Flats 6" houseid="2418" entryx="32308" entryy="31099" entryz="7" rent="660" townid="13" size="12" />
|
||||
<house name="Tusk Flats 5" houseid="2419" entryx="32320" entryy="31108" entryz="7" rent="455" townid="13" size="11" />
|
||||
<house name="Shady Rocks 5" houseid="2420" entryx="32288" entryy="31125" entryz="7" rent="2890" townid="13" size="57" />
|
||||
<house name="Shady Rocks 4 (Shop)" houseid="2421" entryx="32279" entryy="31118" entryz="7" rent="2710" townid="13" size="50" />
|
||||
<house name="Shady Rocks 3" houseid="2422" entryx="32277" entryy="31121" entryz="7" rent="4115" townid="13" size="76" />
|
||||
<house name="Shady Rocks 2" houseid="2423" entryx="32259" entryy="31119" entryz="7" rent="2010" townid="13" size="29" />
|
||||
<house name="Shady Rocks 1" houseid="2424" entryx="32259" entryy="31110" entryz="7" rent="3630" townid="13" size="65" />
|
||||
<house name="Crystal Glance" houseid="2425" entryx="32246" entryy="31118" entryz="7" rent="19625" townid="13" size="235" />
|
||||
<house name="Arena Walk 3" houseid="2426" entryx="32235" entryy="31118" entryz="7" rent="3550" townid="13" size="59" />
|
||||
<house name="Arena Walk 2" houseid="2427" entryx="32239" entryy="31126" entryz="7" rent="1400" townid="13" size="21" />
|
||||
<house name="Arena Walk 1" houseid="2428" entryx="32238" entryy="31134" entryz="7" rent="3250" townid="13" size="55" />
|
||||
<house name="Bears Paw 2" houseid="2429" entryx="32241" entryy="31133" entryz="7" rent="2305" townid="13" size="44" />
|
||||
<house name="Bears Paw 1" houseid="2430" entryx="32264" entryy="31132" entryz="7" rent="1810" townid="13" size="33" />
|
||||
<house name="Spirit Homes 5" houseid="2431" entryx="32223" entryy="31142" entryz="7" rent="1450" townid="13" size="21" />
|
||||
<house name="Glacier Side 3" houseid="2432" entryx="32206" entryy="31140" entryz="7" rent="1950" townid="13" size="30" />
|
||||
<house name="Glacier Side 2" houseid="2433" entryx="32203" entryy="31132" entryz="7" rent="4750" townid="13" size="83" />
|
||||
<house name="Glacier Side 1" houseid="2434" entryx="32206" entryy="31126" entryz="7" rent="1600" townid="13" size="26" />
|
||||
<house name="Spirit Homes 1" houseid="2435" entryx="32210" entryy="31124" entryz="7" rent="1700" townid="13" size="27" />
|
||||
<house name="Spirit Homes 2" houseid="2436" entryx="32219" entryy="31124" entryz="7" rent="1900" townid="13" size="31" />
|
||||
<house name="Spirit Homes 3" houseid="2437" entryx="32216" entryy="31124" entryz="6" rent="4250" townid="13" size="75" />
|
||||
<house name="Spirit Homes 4" houseid="2438" entryx="32220" entryy="31129" entryz="7" rent="1100" townid="13" size="19" />
|
||||
<house name="Glacier Side 4" houseid="2439" entryx="32204" entryy="31147" entryz="6" rent="2050" townid="13" size="38" />
|
||||
<house name="Shelf Site" houseid="2440" entryx="32197" entryy="31150" entryz="6" rent="4800" townid="13" size="83" />
|
||||
<house name="Raven Corner 1" houseid="2441" entryx="32234" entryy="31154" entryz="7" rent="855" townid="13" size="15" />
|
||||
<house name="Raven Corner 2" houseid="2442" entryx="32233" entryy="31156" entryz="7" rent="1685" townid="13" size="25" />
|
||||
<house name="Raven Corner 3" houseid="2443" entryx="32234" entryy="31157" entryz="7" rent="855" townid="13" size="15" />
|
||||
<house name="Bears Paw 3" houseid="2444" entryx="32248" entryy="31157" entryz="7" rent="2090" townid="13" size="35" />
|
||||
<house name="Bears Paw 4" houseid="2445" entryx="32256" entryy="31158" entryz="7" rent="5205" townid="13" size="98" />
|
||||
<house name="Bears Paw 5" houseid="2446" entryx="32272" entryy="31157" entryz="7" rent="2045" townid="13" size="34" />
|
||||
<house name="Trout Plaza 5 (Shop)" houseid="2447" entryx="32268" entryy="31174" entryz="7" rent="3880" townid="13" size="73" />
|
||||
<house name="Pilchard Bin 1" houseid="2448" entryx="32280" entryy="31164" entryz="7" rent="685" townid="13" size="8" />
|
||||
<house name="Pilchard Bin 2" houseid="2449" entryx="32280" entryy="31160" entryz="7" rent="685" townid="13" size="8" />
|
||||
<house name="Pilchard Bin 3" houseid="2450" entryx="32280" entryy="31156" entryz="7" rent="585" townid="13" size="10" />
|
||||
<house name="Pilchard Bin 4" houseid="2451" entryx="32280" entryy="31152" entryz="7" rent="585" townid="13" size="10" />
|
||||
<house name="Pilchard Bin 5" houseid="2452" entryx="32280" entryy="31148" entryz="7" rent="685" townid="13" size="8" />
|
||||
<house name="Pilchard Bin 10" houseid="2453" entryx="32281" entryy="31148" entryz="6" rent="450" townid="13" size="7" />
|
||||
<house name="Pilchard Bin 9" houseid="2454" entryx="32281" entryy="31152" entryz="6" rent="450" townid="13" size="7" />
|
||||
<house name="Pilchard Bin 8" houseid="2455" entryx="32281" entryy="31156" entryz="6" rent="450" townid="13" size="6" />
|
||||
<house name="Pilchard Bin 7" houseid="2456" entryx="32281" entryy="31160" entryz="6" rent="450" townid="13" size="7" />
|
||||
<house name="Pilchard Bin 6" houseid="2457" entryx="32281" entryy="31164" entryz="6" rent="450" townid="13" size="7" />
|
||||
<house name="Trout Plaza 1" houseid="2458" entryx="32248" entryy="31166" entryz="7" rent="2395" townid="13" size="42" />
|
||||
<house name="Trout Plaza 2" houseid="2459" entryx="32260" entryy="31161" entryz="7" rent="1540" townid="13" size="26" />
|
||||
<house name="Trout Plaza 3" houseid="2460" entryx="32255" entryy="31173" entryz="7" rent="900" townid="13" size="18" />
|
||||
<house name="Trout Plaza 4" houseid="2461" entryx="32255" entryy="31177" entryz="7" rent="900" townid="13" size="18" />
|
||||
<house name="Skiffs End 1" houseid="2462" entryx="32250" entryy="31187" entryz="7" rent="1540" townid="13" size="28" />
|
||||
<house name="Skiffs End 2" houseid="2463" entryx="32257" entryy="31189" entryz="7" rent="910" townid="13" size="13" />
|
||||
<house name="Furrier Quarter 3" houseid="2464" entryx="32232" entryy="31191" entryz="7" rent="1010" townid="13" size="20" />
|
||||
<house name="Mammoth Belly" houseid="2465" entryx="32241" entryy="31174" entryz="7" rent="22810" townid="13" size="278" />
|
||||
<house name="Furrier Quarter 2" houseid="2466" entryx="32225" entryy="31177" entryz="7" rent="1045" townid="13" size="21" />
|
||||
<house name="Furrier Quarter 1" houseid="2467" entryx="32221" entryy="31176" entryz="7" rent="1635" townid="13" size="34" />
|
||||
<house name="Fimbul Shelf 3" houseid="2468" entryx="32215" entryy="31177" entryz="7" rent="1255" townid="13" size="28" />
|
||||
<house name="Fimbul Shelf 4" houseid="2469" entryx="32218" entryy="31191" entryz="7" rent="1045" townid="13" size="22" />
|
||||
<house name="Fimbul Shelf 2" houseid="2470" entryx="32209" entryy="31175" entryz="7" rent="1045" townid="13" size="21" />
|
||||
<house name="Fimbul Shelf 1" houseid="2471" entryx="32204" entryy="31169" entryz="7" rent="975" townid="13" size="20" />
|
||||
<house name="Frost Manor" houseid="2472" entryx="32287" entryy="31106" entryz="5" rent="26370" townid="13" size="381" />
|
||||
</houses>
|
||||
|
||||
Binary file not shown.
@ -153,6 +153,7 @@ enum FluidTypes_t : uint8_t
|
||||
FLUID_RUM,
|
||||
FLUID_COCONUTMILK,
|
||||
FLUID_FRUITJUICE,
|
||||
FLUID_MEAD,
|
||||
};
|
||||
|
||||
const uint8_t reverseFluidMap[] = {
|
||||
|
||||
@ -1468,6 +1468,7 @@ void LuaScriptInterface::registerFunctions()
|
||||
registerEnum(FLUID_RUM)
|
||||
registerEnum(FLUID_COCONUTMILK)
|
||||
registerEnum(FLUID_FRUITJUICE)
|
||||
registerEnum(FLUID_MEAD)
|
||||
|
||||
registerEnum(TALKTYPE_SAY)
|
||||
registerEnum(TALKTYPE_WHISPER)
|
||||
|
||||
@ -204,6 +204,7 @@ uint8_t getLiquidColor(uint8_t type)
|
||||
case FLUID_MUD:
|
||||
case FLUID_OIL:
|
||||
case FLUID_RUM:
|
||||
case FLUID_MEAD:
|
||||
result = FLUID_COLOR_BROWN;
|
||||
break;
|
||||
case FLUID_MILK:
|
||||
@ -768,7 +769,8 @@ FluidNames fluidNames[] = {
|
||||
{"lemonade", FLUID_LEMONADE},
|
||||
{"rum", FLUID_RUM},
|
||||
{"coconutmilk", FLUID_COCONUTMILK},
|
||||
{"fruitjuice", FLUID_FRUITJUICE}
|
||||
{"fruitjuice", FLUID_FRUITJUICE},
|
||||
{"mead", FLUID_MEAD}
|
||||
};
|
||||
|
||||
MagicEffectClasses getMagicEffect(const std::string& strValue)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user