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

fix: error in foods.lua #2363

Merged
merged 5 commits into from
Mar 6, 2024
Merged

fix: error in foods.lua #2363

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ca6a5a
fixing foods
lamonato29 Mar 2, 2024
8900fb6
fix: missing raid in raids.xml
lamonato29 Mar 6, 2024
7b874d4
Revert "fix: missing raid in raids.xml"
lamonato29 Mar 6, 2024
041ff42
Merge branch 'opentibiabr:main' into Fix
lamonato29 Mar 6, 2024
156a2ad
Merge branch 'main' into Fix
lamonato29 Mar 6, 2024
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
1 change: 1 addition & 0 deletions data-otservbr-global/raids/raids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<!-- Thais -->
<raid name="Cyclops" file="thais/cyclops.xml" interval2="500" margin="30" />
<raid name="OrcsThais" file="thais/orcs.xml" interval2="500" margin="70" />
<raid name="RatsThais" file="thais/rats.xml" interval2="500" margin="70" />
lamonato29 marked this conversation as resolved.
Show resolved Hide resolved
<!-- Venore -->
<raid name="Dharalion" file="venore/dharalion.xml" interval2="500" margin="70" />
<raid name="Elves" file="venore/elves.xml" interval2="500" margin="80" />
Expand Down
2 changes: 1 addition & 1 deletion data/scripts/actions/items/foods.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ local foods = {
local food = Action()

function food.onUse(player, item, fromPosition, target, toPosition, isHotkey)
local itemFood = setting[item.itemid]
local itemFood = foods[item.itemid]
if not itemFood then
return false
end
Expand Down
2 changes: 1 addition & 1 deletion data/scripts/actions/items/garlic_bread.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ function garlicBread.onUse(player, item, fromPosition, target, toPosition, isHot
return true
end

garlicBread:id(9087)
garlicBread:id(8194)
lamonato29 marked this conversation as resolved.
Show resolved Hide resolved
garlicBread:register()
Loading