Skip to content

Commit

Permalink
Merge branch 'main' into dudantas/improve-eventscheduler-by-json
Browse files Browse the repository at this point in the history
majestyotbr authored Jan 28, 2025
2 parents 6cc833d + e00ec0d commit 37e33d4
Showing 281 changed files with 9,775 additions and 2,381 deletions.
3 changes: 3 additions & 0 deletions config.lua.dist
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ maintainModeMessage = ""
-- NOTE: valid values for worldType are: "pvp", "no-pvp" and "pvp-enforced"
-- NOTE: removeBeginningWeaponAmmunition: spears, arrows, bolt have endless ammo (allows training for paladins)
-- NOTE: refundManaOnBeginningWeapons: wand of vortex and snakebite refund mana used (allows training for mages)
-- NOTE: loginProtectionTime in MS
worldType = "pvp"
hotkeyAimbotEnabled = true
protectionLevel = 7
@@ -47,6 +48,7 @@ monthKillsToRedSkull = 10
redSkullDuration = 1
blackSkullDuration = 3
orangeSkullDuration = 7
loginProtectionTime = 10 * 1000

cleanProtectionZones = false

@@ -342,6 +344,7 @@ deathLosePercent = -1
Setting this to false may pose risks; if a house is abandoned and contains a large number of items on the floor, those items will be transferred to the player's depot instantly.
• This could potentially freeze the server due to the heavy operation. It's advised to keep this setting enabled (true) to minimize risks.
]]
-- NOTE: When toggleCyclopediaHouseAuction = true, the !buyhouse commmand does not work.
-- Periods: daily/weekly/monthly/yearly/never
-- Base: sqm,rent,sqm+rent
toggleCyclopediaHouseAuction = true
72 changes: 70 additions & 2 deletions data-otservbr-global/lib/core/quests.lua
Original file line number Diff line number Diff line change
@@ -6343,12 +6343,12 @@ if not Quests then
},
[47] = {
name = "Grave Danger",
startStorageId = Storage.Quest.U12_20.GraveDanger.QuestLine,
startStorageId = Storage.Quest.U12_20.GraveDanger.Questline,
startStorageValue = 1,
missions = {
[1] = {
name = "* Grave Danger - The Lich Knights",
storageId = Storage.Quest.U12_20.GraveDanger.QuestLine,
storageId = Storage.Quest.U12_20.GraveDanger.Questline,
missionId = 10437,
startValue = 1,
endValue = 2,
@@ -6633,5 +6633,73 @@ if not Quests then
},
},
},
[50] = {
name = "The Dream Courts",
startStorageId = Storage.Quest.U12_00.TheDreamCourts.Main.Questline,
startStorageValue = 1,
missions = {
[1] = {
name = "The Dream Courts",
storageId = Storage.Quest.U12_00.TheDreamCourts.WardStones.Questline,
missionId = 10457,
startValue = 1,
endValue = 3,
states = {
[1] = function(player)
return string.format("You already got %d/8 energized ward stones.", math.max(player:getStorageValue(Storage.Quest.U12_00.TheDreamCourts.WardStones.Count), 0))
end,
[2] = "You must kill the Nightmare Beast.",
[3] = "By defeating the dreadful Nightmare Beast you did the Winter Court and the Summer Court alike a great favor. From now on, the dream elves will regard you as a friend.",
},
},
[2] = {
name = "Unsafe Release",
storageId = Storage.Quest.U12_00.TheDreamCourts.UnsafeRelease.Questline,
missionId = 10458,
startValue = 1,
endValue = 3,
states = {
[1] = "Part I",
[2] = "Part II",
[3] = "Andre was happy to hear that the compass works as intendend. From now on it is possible that he will charge your compass again. It can be used to give acess to mystical chests once a day.",
},
},
[3] = {
name = "Haunted House",
storageId = Storage.Quest.U12_00.TheDreamCourts.HauntedHouse.Questline,
missionId = 10459,
startValue = 1,
endValue = 6,
states = {
[1] = function(player)
return string.format(
"A tormented soul trusted you with the secret of this house: join the passages to the three dungeons it connects to reveal a hidden portal within!\n\nCellar %d/1\nTemple %d/1\nTomb %d/1",
math.max(player:getStorageValue(Storage.Quest.U12_00.TheDreamCourts.HauntedHouse.Cellar), 0),
math.max(player:getStorageValue(Storage.Quest.U12_00.TheDreamCourts.HauntedHouse.Temple), 0),
math.max(player:getStorageValue(Storage.Quest.U12_00.TheDreamCourts.HauntedHouse.Tomb), 0)
)
end,
[2] = "Part I - burried catedral",
[3] = "Part II - puzzle dos livros",
[4] = "Part III - bosses",
[5] = "Part IV - last stone",
[6] = "Activating the ward stone after defeating the Faceless Bane has gained you acess to the deepest mysteries of the dream courts.",
},
},
[4] = {
name = "The Seven Keys",
storageId = Storage.Quest.U12_00.TheDreamCourts.TheSevenKeys.Questline,
missionId = 10460,
startValue = 1,
endValue = 2,
states = {
[1] = function(player)
return string.format("You already got %d/7 secret keys.", math.max(player:getStorageValue(Storage.Quest.U12_00.TheDreamCourts.TheSevenKeys.Count), 0))
end,
[2] = "You found the seven keys to unlock the Seven Dream Doors in the Labyrinth of Summer's and Winter's Dreams.",
},
},
},
},
}
end
Loading

0 comments on commit 37e33d4

Please sign in to comment.