Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
mattyx14 committed Jan 25, 2024
1 parent 608bb89 commit 471ffd3
Show file tree
Hide file tree
Showing 48 changed files with 1,492 additions and 782 deletions.
2 changes: 1 addition & 1 deletion data-otxserver/monster/constructs/animated_snowman.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ monster.loot = {
{ name = "shiver arrow", chance = 7310 },
{ name = "ice rapier", chance = 4750 },
{ name = "glacier mask", chance = 4570 },
{ name = "snowball", chance = 4000, maxCount = 5 },
{ id = 2992, chance = 4000, maxCount = 5 }, -- snowball
{ name = "hailstorm rod", chance = 3470 },
{ name = "glacier mask", chance = 250 },
{ name = "glacier amulet", chance = 3290 },
Expand Down
1 change: 1 addition & 0 deletions data-otxserver/monster/demons/brachiodemon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ monster.attacks = {
{ name = "combat", interval = 2000, chance = 22, type = COMBAT_DEATHDAMAGE, minDamage = -900, maxDamage = -1280, radius = 4, effect = CONST_ME_EXPLOSIONHIT, target = false },
{ name = "combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -1150, maxDamage = -1460, range = 7, effect = CONST_ANI_SUDDENDEATH, target = true },
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_DEATHDAMAGE, minDamage = -950, maxDamage = -1100, range = 7, radius = 4, shootEffect = CONST_ANI_SUDDENDEATH, effect = CONST_ME_MORTAREA, target = true },
{ name = "destroy magic walls", interval = 1000, chance = 30 },
}

monster.defenses = {
Expand Down
1 change: 1 addition & 0 deletions data-otxserver/monster/demons/many_faces.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ monster.attacks = {
{ name = "combat", interval = 5000, chance = 44, type = COMBAT_ICEDAMAGE, minDamage = -1000, maxDamage = -1450, range = 7, radius = 5, shootEffect = CONST_ANI_ICE, effect = CONST_ME_ICEAREA, target = true },
{ name = "combat", interval = 9500, chance = 59, type = COMBAT_HOLYDAMAGE, minDamage = -1050, maxDamage = -1300, radius = 4, effect = CONST_ME_HOLYAREA, target = false },
{ name = "extended holy chain", interval = 10000, chance = 59, minDamage = -1150, maxDamage = -1300, range = 7 },
{ name = "destroy magic walls", interval = 1000, chance = 30 },
}

monster.defenses = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ monster.loot = {
{ id = 2639, chance = 4000 }, -- picture
{ id = 2950, chance = 5000 }, -- lute
{ id = 2983, chance = 500 }, -- flower bowl
{ name = "snowball", chance = 7000, maxCount = 5 },
{ id = 2992, chance = 7000, maxCount = 5 }, -- snowball
{ name = "piggy bank", chance = 1000 },
{ name = "gold coin", chance = 22500, maxCount = 22 },
{ name = "scarab coin", chance = 500, maxCount = 2 },
Expand Down
2 changes: 1 addition & 1 deletion data-otxserver/monster/mammals/yeti.lua
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ monster.voices = {
}

monster.loot = {
{ name = "snowball", chance = 10000, maxCount = 22 },
{ id = 2992, chance = 10000, maxCount = 22 }, -- snowball
{ name = "gold coin", chance = 100000, maxCount = 60 },
{ name = "gold coin", chance = 100000, maxCount = 40 },
{ name = "bunnyslippers", chance = 1333 },
Expand Down
1 change: 1 addition & 0 deletions data-otxserver/monster/plants/cloak_of_terror.lua
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ monster.attacks = {
{ name = "combat", interval = 3000, chance = 20, type = COMBAT_ENERGYDAMAGE, minDamage = -1150, maxDamage = -1300, range = 7, radius = 4, effect = CONST_ME_ENERGYHIT, target = true },
{ name = "combat", interval = 2000, chance = 14, type = COMBAT_HOLYDAMAGE, minDamage = -1000, maxDamage = -1300, range = 7, shootEffect = CONST_ANI_SPECTRALBOLT, effect = CONST_ME_HOLYDAMAGE, target = true },
{ name = "combat", interval = 2000, chance = 24, type = COMBAT_HOLYDAMAGE, minDamage = -800, maxDamage = -1200, range = 7, radius = 3, shootEffect = CONST_ANI_SMALLHOLY, effect = CONST_ME_YELLOW_ENERGY_SPARK, target = true },
{ name = "destroy magic walls", interval = 1000, chance = 30 },
}

monster.defenses = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ monster.loot = {
{ name = "slimy leg", chance = 4170 },
{ name = "badger boots", chance = 4170 },
{ name = "spellbook of warding", chance = 2080 },
{ name = "gnome sword", chance = 4170 },
{ name = "gnome armor", chance = 3390 },
}

monster.attacks = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ monster.loot = {
{ name = "gnome sword", chance = 4170 },
{ name = "terra mantle", chance = 2080 },
{ name = "violet gem", chance = 2080 },
{ name = "gnome legs", chance = 3390 },
}

monster.attacks = {
Expand Down
2 changes: 1 addition & 1 deletion data-otxserver/monster/quests/the_inquisition/ushuriel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ monster.loot = {
{ name = "mysterious voodoo skull", chance = 12500 },
{ name = "skull helmet", chance = 20000 },
{ name = "iron ore", chance = 33333 },
{ name = "spirit container", chance = 4761 },
{ id = 5884, chance = 4761 }, -- spirit container
{ name = "flask of warrior's sweat", chance = 5555 },
{ name = "enchanted chicken wing", chance = 7692 },
{ name = "huge chunk of crude iron", chance = 14285 },
Expand Down
21 changes: 10 additions & 11 deletions data-otxserver/monster/reptiles/corrupt_naga.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ monster.description = "a corrupt naga"
monster.experience = 4380
monster.outfit = {
lookType = 1538,
lookHead = 55,
lookBody = 6,
lookLegs = 0,
lookFeet = 78,
lookHead = 86,
lookBody = 57,
lookLegs = 75,
lookFeet = 94,
lookAddons = 3,
lookMount = 0,
}

monster.health = 5990
monster.maxHealth = 5990
monster.race = "blood"
monster.corpse = 0
monster.corpse = 39217
monster.speed = 182
monster.manaCost = 0

Expand Down Expand Up @@ -60,15 +60,14 @@ monster.voices = {
}

monster.loot = {
{ name = "Platinum Coin", chance = 75420, minCount = 1, maxCount = 8 },
{ name = "Violet Crystal Shard", chance = 24580, minCount = 1, maxCount = 2 },
{ name = "Corrupt Naga Scales", chance = 17720 },
{ name = "corrupt naga scales", chance = 17720 },
}

monster.attacks = {
{ name = "combat", interval = 2000, chance = 100, minDamage = -300, maxDamage = -600, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_PURPLEENERGY, target = true },
{ name = "nagadeath", interval = 6000, chance = 39, target = false, minDamage = -1000, maxDamage = -2200 },
{ name = "nagadeathattack", interval = 3000, chance = 68, target = true, minDamage = -400, maxDamage = -600 },
{ name = "combat", interval = 2000, chance = 100, type = COMBAT_PHYSICALDAMAGE, minDamage = -120, maxDamage = -340, target = true }, -- basic_attack
{ name = "combat", interval = 2500, chance = 30, type = COMBAT_PHYSICALDAMAGE, minDamage = -320, maxDamage = -430, effect = CONST_ME_YELLOWSMOKE, range = 3, target = true }, -- eruption_strike
{ name = "nagadeathattack", interval = 3000, chance = 35, minDamage = -360, maxDamage = -415, target = true }, -- death_strike
{ name = "combat", interval = 3500, chance = 35, type = COMBAT_LIFEDRAIN, minDamage = -360, maxDamage = -386, radius = 4, effect = CONST_ME_DRAWBLOOD, target = false }, -- great_blood_ball
}

monster.defenses = {
Expand Down
22 changes: 11 additions & 11 deletions data-otxserver/monster/reptiles/rogue_naga.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ monster.description = "a rogue naga"
monster.experience = 4510
monster.outfit = {
lookType = 1543,
lookHead = 55,
lookBody = 6,
lookLegs = 0,
lookFeet = 78,
lookHead = 75,
lookBody = 13,
lookLegs = 95,
lookFeet = 109,
lookAddons = 3,
lookMount = 0,
}

monster.health = 6200
monster.maxHealth = 6200
monster.race = "blood"
monster.corpse = 0
monster.corpse = 39221
monster.speed = 182
monster.manaCost = 0

Expand Down Expand Up @@ -64,15 +64,15 @@ monster.voices = {
}

monster.loot = {
{ name = "Platinum Coin", chance = 85600, minCount = 1, maxCount = 12 },
{ name = "Rogue Naga Scales", chance = 15450 },
{ name = "Green Crystal Shard", chance = 14400, minCount = 1, maxCount = 2 },
{ name = "rogue naga scales", chance = 15450 },
}

monster.attacks = {
{ name = "combat", interval = 2000, chance = 100, minDamage = -300, maxDamage = -600, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_PURPLEENERGY, target = true },
{ name = "combat", interval = 2000, chance = 47, type = COMBAT_PHYSICALDAMAGE, minDamage = -350, maxDamage = -400, effect = CONST_ME_BIG_SCRATCH, target = true },
{ name = "combat", interval = 1000, chance = 10, type = COMBAT_PHYSICALDAMAGE, minDamage = -380, maxDamage = -470, length = 5, spread = 3, effect = CONST_ME_GROUNDSHAKER, target = false },
{ name = "combat", interval = 2000, chance = 50, type = COMBAT_PHYSICALDAMAGE, minDamage = -95, maxDamage = -390, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_PURPLEENERGY, range = 6, target = true }, -- basic_attack
{ name = "nagadeathattack", interval = 2500, chance = 20, minDamage = -430, maxDamage = -505, range = 6, target = true }, -- death_strike
{ name = "nagadeath", interval = 3000, chance = 20, minDamage = -380, maxDamage = -470, target = false }, -- short_death_wave
{ name = "death chain", interval = 3500, chance = 20, minDamage = -460, maxDamage = -520, range = 6, target = true }, -- death_chain
{ name = "combat", interval = 4000, chance = 20, type = COMBAT_PHYSICALDAMAGE, minDamage = -85, maxDamage = -190, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_PURPLEENERGY, range = 6, target = true }, -- explosion_strike
}

monster.defenses = {
Expand Down
1 change: 1 addition & 0 deletions data-otxserver/monster/undeads/bony_sea_devil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ monster.attacks = {
{ name = "combat", interval = 2000, chance = 25, type = COMBAT_ICEDAMAGE, minDamage = -950, maxDamage = -1100, range = 7, radius = 5, shootEffect = CONST_ANI_ICE, effect = CONST_ME_ICEAREA, target = true },
{ name = "ice chain", interval = 2000, chance = 15, minDamage = -1100, maxDamage = -1300, range = 7 },
{ name = "soulwars fear", interval = 2000, chance = 1, target = true },
{ name = "destroy magic walls", interval = 1000, chance = 30 },
}

monster.defenses = {
Expand Down
2 changes: 1 addition & 1 deletion data-otxserver/monster/undeads/souleater.lua
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ monster.loot = {
{ name = "platinum coin", chance = 49610, maxCount = 6 },
{ name = "necrotic rod", chance = 980 },
{ name = "wand of cosmic energy", chance = 910 },
{ name = "spirit container", chance = 140 },
{ id = 5884, chance = 140 }, -- spirit container
{ id = 6299, chance = 300 }, -- death ring
{ name = "great mana potion", chance = 8000 },
{ name = "ultimate health potion", chance = 9400 },
Expand Down
2 changes: 1 addition & 1 deletion data-otxserver/monster/vermins/afflicted_strider.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ monster.Bestiary = {
monster.health = 10000
monster.maxHealth = 10000
monster.race = "blood"
monster.corpse = 36716
monster.corpse = 36719
monster.speed = 135
monster.manaCost = 0

Expand Down
2 changes: 1 addition & 1 deletion data-otxserver/monster/vermins/blemished_spawn.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ monster.Bestiary = {
monster.health = 9000
monster.maxHealth = 9000
monster.race = "blood"
monster.corpse = 36698
monster.corpse = 36701
monster.speed = 140
monster.manaCost = 0

Expand Down
7 changes: 7 additions & 0 deletions data-otxserver/scripts/actions/other/bag_you_covet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ function bagyouCovet.onUse(player, item, fromPosition, target, toPosition, isHot
item:remove(1)

player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You received a " .. rewardItem.name .. ".")

local text = player:getName() .. " received a " .. rewardItem.name .. " from a " .. item:getName() .. "."
local vocation = player:vocationAbbrev()
Webhook.sendMessage(":game_die: " .. player:getMarkdownLink() .. " received a **" .. rewardItem.name .. "** from a _" .. item:getName() .. "_.")
Broadcast(text, function(targetPlayer)
return targetPlayer ~= player
end)
return true
end

Expand Down
7 changes: 7 additions & 0 deletions data-otxserver/scripts/actions/other/bag_you_desire.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ function bagyouDesire.onUse(player, item, fromPosition, target, toPosition, isHo
item:remove(1)

player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You received a " .. rewardItem.name .. ".")

local text = player:getName() .. " received a " .. rewardItem.name .. " from a " .. item:getName() .. "."
local vocation = player:vocationAbbrev()
Webhook.sendMessage(":game_die: " .. player:getMarkdownLink() .. " received a **" .. rewardItem.name .. "** from a _" .. item:getName() .. "_.")
Broadcast(text, function(targetPlayer)
return targetPlayer ~= player
end)
return true
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local data = {
local function finditem(self, cylinder, conv)
if cylinder == 0 then
cylinder = self:getSlotItem(CONST_SLOT_BACKPACK)
finditem(self, self:getSlotItem(CONST_SLOT_STORE_INBOX), conv)
finditem(self, self:getStoreInbox(), conv)
end

if cylinder and cylinder:isContainer() then
Expand Down
8 changes: 7 additions & 1 deletion data-otxserver/scripts/actions/other/primal_bag.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ function primalBag.onUse(player, item, fromPosition, target, toPosition, isHotke
player:addItem(rewardItem.id, 1)
item:remove(1)

player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You received one " .. rewardItem.name .. ".")
player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You received a " .. rewardItem.name .. ".")
local text = player:getName() .. " received a " .. rewardItem.name .. " from a " .. item:getName() .. "."
local vocation = player:vocationAbbrev()
Webhook.sendMessage(":game_die: " .. player:getMarkdownLink() .. " received a **" .. rewardItem.name .. "** from a _" .. item:getName() .. "_.")
Broadcast(text, function(targetPlayer)
return targetPlayer ~= player
end)
return true
end

Expand Down
2 changes: 1 addition & 1 deletion data-otxserver/scripts/actions/tibiadrome/concoctions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ local configs = {
player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Your spells are no longer on cooldown.")
end,
},
[Concoction.Ids.StrikeEnhancement] = { condition = { CONDITION_PARAM_SKILL_CRITICAL_HIT_CHANCE, 5 } },
[Concoction.Ids.StrikeEnhancement] = { condition = { CONDITION_PARAM_SKILL_CRITICAL_HIT_CHANCE, 500 } },
[Concoction.Ids.CharmUpgrade] = { condition = { CONDITION_PARAM_CHARM_CHANCE_MODIFIER, 5 } },
[Concoction.Ids.WealthDuplex] = { rate = 100 },
[Concoction.Ids.BestiaryBetterment] = { multiplier = 2.0 },
Expand Down
Loading

0 comments on commit 471ffd3

Please sign in to comment.