Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous datapack related changes/additions #3810

Merged
merged 10 commits into from
Dec 14, 2021
Merged

Miscellaneous datapack related changes/additions #3810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d31868
Added new achievements to the lib
Nov 28, 2021
5b99fb0
Potions update
Nov 28, 2021
11e3312
Updated empty potion flask descriptions
Nov 28, 2021
ebcb078
Added distance weapons
Nov 28, 2021
902cbfe
Added familiars (only files)
Nov 28, 2021
a25d248
Update weapons.xml
Nov 28, 2021
4462dad
Update sweet mangonaise elixir description
Nov 28, 2021
6e924fe
Update shiny blade attack and defense modifier
Nov 28, 2021
68d332b
Update food.lua
Nov 28, 2021
849e63d
Update food.lua
Nov 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion data/actions/scripts/other/food.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,17 @@ local foods = {
[24841] = {12, "Yum."}, -- prickly pear
[24843] = {60, "Chomp."}, -- roasted meat
[26191] = {25, "Mmmm."}, -- energy bar
[26201] = {15, "Mmmm."} -- energy drink
[26201] = {15, "Mmmm."}, -- energy drink
[27038] = {20, "Urgh."}, -- bug meat
[27039] = {10, "Gulp."}, -- cave turnip
[27052] = {60, "Mmmm."}, -- birthday cake
[27095] = {4, "Slurp."}, -- shell
[27604] = {10, "Slurp."}, -- bottle of Wine
[28348] = {15, "Mmmmm!"}, -- fresh fruit
[32854] = {40, "Mmmm."}, -- meringue cake
[32858] = {15, "Slurp."}, -- winterberry liquor
[34216] = {40, "Slurp."}, -- goanna meat
[34725] = {15, "Slurp."}, -- candy floss
}

function onUse(player, item, fromPosition, target, toPosition, isHotkey)
Expand Down
13 changes: 6 additions & 7 deletions data/actions/scripts/other/potions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,16 @@ local potions = {
},
[7589] = { -- strong mana potion
mana = {115, 185},
vocations = {1, 2, 3, 5, 6, 7},
level = 50,
flask = 7634,
description = "Only sorcerers, druids and paladins of level 50 or above may drink this fluid."
description = "Only players of level 50 or above may drink this fluid."
},
[7590] = { -- great mana potion
mana = {150, 250},
vocations = {1, 2, 5, 6},
vocations = {1, 2, 3, 5, 6, 7},
level = 80,
flask = 7635,
description = "Only druids and sorcerers of level 80 or above may drink this fluid."
description = "Only sorcerers, druids and paladins of level 80 or above may drink this fluid."
},
[7591] = { -- great health potion
health = {425, 575},
Expand Down Expand Up @@ -131,13 +130,13 @@ function onUse(player, item, fromPosition, target, toPosition, isHotkey)

local potion = potions[item:getId()]
if potion.level and player:getLevel() < potion.level or potion.vocations and not table.contains(potion.vocations, player:getVocation():getId()) then
player:say(potion.description, TALKTYPE_MONSTER_SAY)
player:say(potion.description, TALKTYPE_POTION)
return true
end

if potion.condition then
player:addCondition(potion.condition)
player:say(potion.text, TALKTYPE_MONSTER_SAY)
player:say(potion.text, TALKTYPE_POTION)
player:getPosition():sendMagicEffect(potion.effect)
elseif potion.transform then
local reward = potion.transform[math.random(#potion.transform)]
Expand Down Expand Up @@ -165,7 +164,7 @@ function onUse(player, item, fromPosition, target, toPosition, isHotkey)

player:addAchievementProgress("Potion Addict", 100000)
player:addItem(potion.flask)
target:say("Aaaah...", TALKTYPE_MONSTER_SAY)
target:say("Aaaah...", TALKTYPE_POTION)
target:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
end

Expand Down
70 changes: 54 additions & 16 deletions data/items/items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13264,11 +13264,11 @@
</item>
<item id="7589" article="a" name="strong mana potion">
<attribute key="weight" value="290" />
<attribute key="description" value="This potion can only be consumed by sorcerers, druids and paladins of level 50 or higher." />
<attribute key="description" value="This potion can only be consumed by players of level 50 or higher." />
</item>
<item id="7590" article="a" name="great mana potion">
<attribute key="weight" value="310" />
<attribute key="description" value="This potion can only be consumed by sorcerers and druids of level 80 or higher." />
<attribute key="description" value="This potion can only be consumed by sorcerers, druids and paladins of level 80 or higher." />
</item>
<item id="7591" article="a" name="great health potion">
<attribute key="weight" value="310" />
Expand Down Expand Up @@ -13355,15 +13355,15 @@
</item>
<item id="7634" article="an" name="empty potion flask">
<attribute key="weight" value="160" />
<attribute key="description" value="Return it to a potion store for your deposit." />
<attribute key="description" value="Return it to a potion store for your deposit or refill it with a potion keg or cask." />
</item>
<item id="7635" article="an" name="empty potion flask">
<attribute key="weight" value="180" />
<attribute key="description" value="Return it to a potion store for your deposit." />
<attribute key="description" value="Return it to a potion store for your deposit or refill it with a potion keg or cask." />
</item>
<item id="7636" article="an" name="empty potion flask">
<attribute key="weight" value="150" />
<attribute key="description" value="Return it to a potion store for your deposit." />
<attribute key="description" value="Return it to a potion store for your deposit or refill it with a potion keg or cask." />
</item>
<item id="7637" article="a" name="dead cat">
<attribute key="containerSize" value="5" />
Expand Down Expand Up @@ -21451,7 +21451,7 @@
<attribute key="weight" value="950" />
</item>
<item id="12544" article="a" name="sweet mangonaise elixir">
<attribute key="description" value="It's said to have incredible effects if you drink it while wearing a volatile magical ring with time limit." />
<attribute key="description" value="It's said to have incredible effects if you drink it while wearing certain magical rings. So it will not work on every kind of them." />
<attribute key="weight" value="300" />
</item>
<item id="12545" article="the" name="dead glitterscale">
Expand Down Expand Up @@ -23437,8 +23437,8 @@
<attribute key="description" value="It's very toxic. Do not ever drink green liquids." />
<attribute key="weight" value="180" />
</item>
<item id="13924" article="an" name="empty potion flask">
<attribute key="description" value="Return it to a magic store for deposit." />
<item id="13924" article="an" name="special flask">
<attribute key="description" value="Vascalir gave it to you to collect wasp poison." />
<attribute key="weight" value="180" />
</item>
<item id="13925" article="a" name="plague mask">
Expand Down Expand Up @@ -26553,9 +26553,9 @@
<item id="18465" article="a" name="shiny blade">
<attribute key="weight" value="4500" />
<attribute key="defense" value="35" />
<attribute key="attack" value="50" />
<attribute key="attack" value="49" />
<attribute key="weaponType" value="sword" />
<attribute key="extradef" value="3" />
<attribute key="extradef" value="2" />
<attribute key="skillSword" value="1" />
</item>
<item id="18466" article="a" name="dead crystal golem">
Expand Down Expand Up @@ -38046,7 +38046,14 @@
<item id="28388" article="a" name="gleaming starlight vial" />
<item id="28389" article="a" name="dark sun catcher" />
<item id="28390" article="a" name="shining sun catcher" />
<item id="28391" article="a" name="leaf star" />
<item id="28391" article="a" name="leaf star">
<attribute key="weight" value="200" />
<attribute key="weaponType" value="distance" />
<attribute key="attack" value="48" />
<attribute key="range" value="4" />
<attribute key="elementEarth" value="2" />
<attribute key="shootType" value="leafstar" />
</item>
<item id="28392" name="swan feathers" />
<item id="28393" article="a" name="rainbow quartz" />
<item id="28394" name="tar" />
Expand All @@ -38065,9 +38072,28 @@
<item fromid="28408" toid="28410" name="rubble" />
<item id="28411" name="earth" />
<item id="28412" name="strange colours" />
<item id="28413" article="a" name="diamond arrow" />
<item id="28414" article="a" name="spectral bolt" />
<item id="28415" article="a" name="royal star" />
<item id="28413" article="a" name="diamond arrow">
<attribute key="weight" value="80" />
<attribute key="weaponType" value="ammunition" />
<attribute key="ammoType" value="arrow" />
<attribute key="attack" value="37" />
<attribute key="shootType" value="diamondarrow" />
</item>
<item id="28414" article="a" name="spectral bolt">
<attribute key="weight" value="90" />
<attribute key="weaponType" value="ammunition" />
<attribute key="ammoType" value="bolt" />
<attribute key="attack" value="78" />
<attribute key="shootType" value="spectralbolt" />
</item>
<item id="28415" article="a" name="royal star">
<attribute key="weight" value="220" />
<attribute key="weaponType" value="distance" />
<attribute key="attack" value="64" />
<attribute key="range" value="4" />
<attribute key="elementFire" value="2" />
<attribute key="shootType" value="royalstar" />
</item>
<item id="28416" article="a" name="wand of darkness" />
<item id="28417" name="strange colours" />
<item id="28418" article="a" name="stump" />
Expand Down Expand Up @@ -40853,8 +40879,20 @@
<item fromid="38551" toid="38552" article="a" name="midnight panther rug" />
<item fromid="38553" toid="38554" article="a" name="moon carpet" />
<item fromid="38555" toid="38556" article="a" name="romantic carpet" />
<item id="38557" article="a" name="diamond arrow" />
<item id="38558" article="a" name="spectral bolt" />
<item id="38557" article="a" name="diamond arrow">
<attribute key="weight" value="80" />
<attribute key="weaponType" value="ammunition" />
<attribute key="ammoType" value="arrow" />
<attribute key="attack" value="37" />
<attribute key="shootType" value="diamondarrow" />
</item>
<item id="38558" article="a" name="spectral bolt">
<attribute key="weight" value="90" />
<attribute key="weaponType" value="ammunition" />
<attribute key="ammoType" value="bolt" />
<attribute key="attack" value="78" />
<attribute key="shootType" value="spectralbolt" />
</item>
<item id="38564" article="a" name="rope-ladder" />
<item fromid="38565" toid="38566" name="chaos critical dice" />
<item fromid="38567" toid="38568" article="a" name="grandiose cupboard" />
Expand Down
Loading