Skip to content

Commit

Permalink
Merge branch 'main' into luan/feat-condition-suppression
Browse files Browse the repository at this point in the history
  • Loading branch information
luan authored Jan 23, 2024
2 parents ce5ecd4 + 0cca850 commit c45f79f
Show file tree
Hide file tree
Showing 177 changed files with 5,207 additions and 1,684 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ at [this link](https://github.com/opentibiabr/canary/blob/master/CODE_OF_CONDUCT

### Getting **Started**

* [Gitbook](https://docs.opentibiabr.com/projects/canary).
* [Gitbook](https://docs.opentibiabr.com/opentibiabr/projects/canary).
* [Wiki](https://github.com/opentibiabr/canary/wiki).

### Issues
Expand Down
39 changes: 35 additions & 4 deletions config.lua.dist
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ forgeCostOneSliver = 20
forgeSliverAmount = 3
forgeCoreCost = 50
forgeMaxDust = 225
forgeFusionCost = 100
forgeTransferCost = 100
forgeFusionDustCost = 100
forgeConvergenceFusionDustCost = 130
forgeTransferDustCost = 100
forgeConvergenceTransferCost = 160
forgeBaseSuccessRate = 50
forgeBonusSuccessRate = 15
forgeTierLossReduction = 50
Expand All @@ -131,6 +133,24 @@ forgeFiendishLimit = 3
forgeFiendishIntervalType = "hour"
forgeFiendishIntervalTime = "1"

ruseChanceFormulaA = 0.0307576
ruseChanceFormulaB = 0.440697
ruseChanceFormulaC = 0.026

onslaughtChanceFormulaA = 0.05
onslaughtChanceFormulaB = 0.4
onslaughtChanceFormulaC = 0.05

momentumChanceFormulaA = 0.05
momentumChanceFormulaB = 1.9
momentumChanceFormulaC = 0.05

transcendanceChanceFormulaA = 0.0127
transcendanceChanceFormulaB = 0.1070
transcendanceChanceFormulaC = 0.0073

transcendanceAvatarDuration = 7000

-- Bestiary & Bosstiary system
-- NOTE: bestiaryKillMultiplier, multiplier value of monster killed, default 1
-- NOTE: bosstiaryKillMultiplier, multiplier value of boss killed, default 1
Expand Down Expand Up @@ -177,6 +197,15 @@ pvpMaxLevelDifference = 0
wheelSystemEnabled = true
wheelPointsPerLevel = 1

-- Gem Atelier
wheelAtelierRotateLesserCost = 125000
wheelAtelierRotateRegularCost = 250000
wheelAtelierRotateGreaterCost = 500000

wheelAtelierRevealLesserCost = 125000
wheelAtelierRevealRegularCost = 1000000
wheelAtelierRevealGreaterCost = 6000000

-- Familiar system
-- NOTE: the time will be divided by 2 to get half the value, the familiar lasts 15 minutes by default and the cooldown of the spell is 30 minutes
-- Only change it here if you know what you are doing or to make testing easier with familiars
Expand Down Expand Up @@ -359,6 +388,8 @@ resetSessionsOnStartup = false

-- Misc.
-- NOTE: experienceDisplayRates: set to false to ignore exp rate or true to include exp rate
-- NOTE: disableLegacyRaids: set to true to disable legacy XML raids
-- NOTE: combatChainDelay: set to minimum 50 miliseconds
allowChangeOutfit = true
toggleMountInProtectionZone = false
freePremium = false
Expand All @@ -384,9 +415,9 @@ experienceDisplayRates = true
toggleAttackSpeedOnFist = false
multiplierSpeedOnFist = 5
maxSpeedOnFist = 500
disableLegacyRaids = false -- disable legacy XML raids
disableLegacyRaids = false
disableMonsterArmor = false
combatChainDelay = 50 -- minimum: 50 miliseconds
combatChainDelay = 50
minElementalResistance = -200
maxElementalResistance = 200
maxDamageReflection = 200
Expand Down
2 changes: 1 addition & 1 deletion data-canary/scripts/actions/tools/magic_gold_converter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local data = {
local function findItem(self, cylinder, converterItem)
if cylinder == 0 then
cylinder = self:getSlotItem(CONST_SLOT_BACKPACK)
findItem(self, self:getSlotItem(CONST_SLOT_STORE_INBOX), converterItem)
findItem(self, self:getStoreInbox(), converterItem)
end

if cylinder and cylinder:isContainer() then
Expand Down
100 changes: 81 additions & 19 deletions data-canary/scripts/item_classification/item_tiers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,91 @@ local itemTierClassifications = {
-- Upgrade classification 1
[1] = {
-- Update tier 0
[1] = { price = 25000, core = 1 },
[1] = {
regular = 25000,
core = 1,
},
},
-- Upgrade classification 2
[2] = {
-- Update tier 0
[1] = { price = 750000, core = 1 },
[1] = {
regular = 750000,
core = 1,
},
-- Update tier 1
[2] = { price = 5000000, core = 1 },
[2] = {
regular = 5000000,
core = 1,
},
},
-- Upgrade classification 3
[3] = {
[1] = { price = 4000000, core = 1 },
[2] = { price = 10000000, core = 1 },
[3] = { price = 20000000, core = 2 },
[1] = {
regular = 4000000,
core = 1,
},
[2] = {
regular = 10000000,
core = 1,
},
[3] = {
regular = 20000000,
core = 2,
},
},
-- Upgrade classification 4
[4] = {
[1] = { price = 8000000, core = 1 },
[2] = { price = 20000000, core = 1 },
[3] = { price = 40000000, core = 2 },
[4] = { price = 65000000, core = 5 },
[5] = { price = 100000000, core = 10 },
[6] = { price = 250000000, core = 15 },
[7] = { price = 750000000, core = 25 },
[8] = { price = 2500000000, core = 35 },
[9] = { price = 8000000000, core = 50 },
[10] = { price = 15000000000, core = 65 },
[1] = {
regular = 8000000,
core = 1,
convergence = { fusion = { price = 55000000 }, transfer = { price = 65000000 } },
},
[2] = {
regular = 20000000,
core = 2,
convergence = { fusion = { price = 110000000 }, transfer = { price = 165000000 } },
},
[3] = {
regular = 40000000,
core = 5,
convergence = { fusion = { price = 170000000 }, transfer = { price = 375000000 } },
},
[4] = {
regular = 65000000,
core = 10,
convergence = { fusion = { price = 300000000 }, transfer = { price = 800000000 } },
},
[5] = {
regular = 100000000,
core = 15,
convergence = { fusion = { price = 875000000 }, transfer = { price = 2000000000 } },
},
[6] = {
regular = 250000000,
core = 25,
convergence = { fusion = { price = 2350000000 }, transfer = { price = 5250000000 } },
},
[7] = {
regular = 750000000,
core = 35,
convergence = { fusion = { price = 6950000000 }, transfer = { price = 14500000000 } },
},
[8] = {
regular = 2500000000,
core = 50,
convergence = { fusion = { price = 21250000000 }, transfer = { price = 42500000000 } },
},
[9] = {
regular = 8000000000,
core = 60,
convergence = { fusion = { price = 50000000000 }, transfer = { price = 100000000000 } },
},
[10] = {
regular = 15000000000,
core = 85,
convergence = { fusion = { price = 125000000000 }, transfer = { price = 300000000000 } },
},
},
}

Expand All @@ -40,9 +98,13 @@ for classificationId, classificationTable in ipairs(itemTierClassifications) do
-- Registers table for register_item_tier.lua interface
classification.Upgrades = {}
for tierId, tierTable in ipairs(classificationTable) do
if tierId and tierTable.price and tierTable.core ~= nil then
table.insert(classification.Upgrades, { TierId = tierId - 1, Price = tierTable.price, Core = tierTable.core })
end
table.insert(classification.Upgrades, {
TierId = tierId,
Core = tierTable.core,
RegularPrice = tierTable.regular,
ConvergenceFustionPrice = tierTable.convergence and tierTable.convergence.fusion.price or 0,
ConvergenceTransferPrice = tierTable.convergence and tierTable.convergence.transfer.price or 0,
})
end
-- Create item classification and register classification table
itemClassification:register(classification)
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/bosses/the_abomination.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ monster.loot = {

monster.attacks = {
{ name = "melee", interval = 2000, chance = 100, skill = 90, attack = 120 },
{ name = "speed", interval = 1000, chance = 12, speedChange = -100, radius = 6, effect = CONST_ME_POISONAREA, target = false, duration = 10000 },
{ name = "speed", interval = 1000, chance = 12, speedChange = -800, radius = 6, effect = CONST_ME_POISONAREA, target = false, duration = 10000 },
{ name = "combat", interval = 1000, chance = 9, type = COMBAT_EARTHDAMAGE, minDamage = -200, maxDamage = -650, radius = 4, effect = CONST_ME_POISONAREA, target = false },
{ name = "combat", interval = 1000, chance = 11, type = COMBAT_LIFEDRAIN, minDamage = -400, maxDamage = -900, radius = 4, shootEffect = CONST_ANI_POISON, effect = CONST_ME_SOUND_GREEN, target = true },
{ name = "combat", interval = 2000, chance = 19, type = COMBAT_PHYSICALDAMAGE, minDamage = -350, maxDamage = -850, length = 7, spread = 0, shootEffect = CONST_ANI_POISON, effect = CONST_ME_HITBYPOISON, target = false },
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/bosses/the_collector.lua
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ monster.loot = {}

monster.attacks = {
{ name = "melee", interval = 2000, chance = 100, skill = 100, attack = 40 },
{ name = "speed", interval = 1000, chance = 13, speedChange = -100, length = 8, spread = 0, effect = CONST_ME_ENERGYHIT, target = false, duration = 20000 },
{ name = "speed", interval = 1000, chance = 13, speedChange = -800, length = 8, spread = 0, effect = CONST_ME_ENERGYHIT, target = false, duration = 20000 },
{ name = "combat", interval = 1000, chance = 15, type = COMBAT_PHYSICALDAMAGE, minDamage = 0, maxDamage = -85, range = 7, shootEffect = CONST_ANI_LARGEROCK, target = false },
{ name = "melee", interval = 2000, chance = 15, minDamage = -10, maxDamage = -80 },
}
Expand Down
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
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/constructs/ice_golem.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ monster.loot = {

monster.attacks = {
{ name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -220 },
{ name = "speed", interval = 1000, chance = 13, speedChange = -100, length = 8, spread = 0, effect = CONST_ME_ENERGYHIT, target = false, duration = 20000 },
{ name = "speed", interval = 1000, chance = 13, speedChange = -800, length = 8, spread = 0, effect = CONST_ME_ENERGYHIT, target = false, duration = 20000 },
{ name = "combat", interval = 1000, chance = 15, type = COMBAT_ICEDAMAGE, minDamage = -50, maxDamage = -85, range = 7, shootEffect = CONST_ANI_SMALLICE, effect = CONST_ME_ICEATTACK, target = false },
{ name = "ice golem skill reducer", interval = 2000, chance = 10, target = false },
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ monster.attacks = {
{ name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -280 },
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_LIFEDRAIN, minDamage = -250, maxDamage = -700, length = 5, spread = 3, effect = CONST_ME_MAGIC_RED, target = false },
{ name = "combat", interval = 2000, chance = 30, type = COMBAT_FIREDAMAGE, minDamage = -80, maxDamage = -250, radius = 3, effect = CONST_ME_HITBYFIRE, target = false },
{ name = "speed", interval = 2000, chance = 10, speedChange = -100, length = 5, spread = 3, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 },
{ name = "speed", interval = 2000, chance = 10, speedChange = -800, length = 5, spread = 3, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 },
}

monster.defenses = {
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/constructs/lava_golem.lua
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ monster.attacks = {
{ name = "combat", interval = 2000, chance = 10, type = COMBAT_MANADRAIN, minDamage = -600, maxDamage = -1300, length = 8, spread = 3, effect = CONST_ME_MORTAREA, target = false },
{ name = "lava golem soulfire", interval = 2000, chance = 15, target = false },
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_FIREDAMAGE, minDamage = -220, maxDamage = -350, radius = 4, effect = CONST_ME_FIREAREA, target = true },
{ name = "speed", interval = 2000, chance = 10, speedChange = -100, length = 5, spread = 3, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 },
{ name = "speed", interval = 2000, chance = 10, speedChange = -800, length = 5, spread = 3, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 },
{ name = "combat", interval = 2000, chance = 30, type = COMBAT_FIREDAMAGE, minDamage = -280, maxDamage = -350, radius = 3, effect = CONST_ME_HITBYFIRE, target = false },
}

Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/constructs/magma_crawler.lua
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ monster.attacks = {
{ name = "magma crawler soulfire", interval = 2000, chance = 20, target = false },
{ name = "soulfire rune", interval = 2000, chance = 10, target = false },
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_FIREDAMAGE, minDamage = -140, maxDamage = -180, radius = 3, effect = CONST_ME_HITBYFIRE, target = false },
{ name = "speed", interval = 2000, chance = 10, speedChange = -100, radius = 2, effect = CONST_ME_MAGIC_RED, target = false, duration = 20000 },
{ name = "speed", interval = 2000, chance = 10, speedChange = -800, radius = 2, effect = CONST_ME_MAGIC_RED, target = false, duration = 20000 },
}

monster.defenses = {
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/constructs/orewalker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ monster.attacks = {
-- poison
{ name = "condition", type = CONDITION_POISON, interval = 2000, chance = 10, minDamage = -800, maxDamage = -1080, radius = 3, shootEffect = CONST_ANI_SMALLEARTH, effect = CONST_ME_SMALLPLANTS, target = true },
{ name = "drunk", interval = 2000, chance = 15, radius = 4, effect = CONST_ME_SOUND_PURPLE, target = false, duration = 6000 },
{ name = "speed", interval = 2000, chance = 15, speedChange = -100, radius = 2, effect = CONST_ME_MAGIC_RED, target = false, duration = 20000 },
{ name = "speed", interval = 2000, chance = 15, speedChange = -800, radius = 2, effect = CONST_ME_MAGIC_RED, target = false, duration = 20000 },
}

monster.defenses = {
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/constructs/weeper.lua
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ monster.attacks = {
{ name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -450 },
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_FIREDAMAGE, minDamage = -400, maxDamage = -1000, length = 8, spread = 0, effect = CONST_ME_FIREATTACK, target = false },
{ name = "combat", interval = 3000, chance = 100, type = COMBAT_FIREDAMAGE, minDamage = -80, maxDamage = -250, radius = 3, effect = CONST_ME_HITBYFIRE, target = false },
{ name = "speed", interval = 2000, chance = 10, speedChange = -100, length = 5, spread = 0, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 },
{ name = "speed", interval = 2000, chance = 10, speedChange = -800, length = 5, spread = 0, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 },
}

monster.defenses = {
Expand Down
1 change: 1 addition & 0 deletions data-otservbr-global/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
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/demons/dawnfire_asura.lua
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ monster.attacks = {
{ name = "combat", interval = 3700, chance = 17, type = COMBAT_LIFEDRAIN, minDamage = -100, maxDamage = -300, length = 8, spread = 0, effect = CONST_ME_PURPLEENERGY, target = false },
{ name = "combat", interval = 3200, chance = 25, type = COMBAT_DEATHDAMAGE, minDamage = -100, maxDamage = -350, radius = 4, range = 5, target = true, effect = CONST_ME_MORTAREA },
{ name = "combat", interval = 2700, chance = 20, type = COMBAT_FIREDAMAGE, minDamage = -95, maxDamage = -180, range = 3, shootEffect = CONST_ANI_FIRE, target = true },
{ name = "speed", interval = 2000, chance = 20, speedChange = -100, radius = 1, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_SLEEP, target = true, duration = 15000 },
{ name = "speed", interval = 2000, chance = 20, speedChange = -800, radius = 1, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_SLEEP, target = true, duration = 15000 },
}

monster.defenses = {
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/demons/fury.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ monster.attacks = {
{ name = "fury skill reducer", interval = 2000, chance = 5, target = false },
{ name = "combat", interval = 2000, chance = 10, type = COMBAT_LIFEDRAIN, minDamage = -120, maxDamage = -300, radius = 3, effect = CONST_ME_HITAREA, target = false },
{ name = "combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -125, maxDamage = -250, range = 7, shootEffect = CONST_ANI_SUDDENDEATH, effect = CONST_ME_SMALLCLOUDS, target = false },
{ name = "speed", interval = 2000, chance = 15, speedChange = -100, range = 7, shootEffect = CONST_ANI_SUDDENDEATH, effect = CONST_ME_SMALLCLOUDS, target = false, duration = 30000 },
{ name = "speed", interval = 2000, chance = 15, speedChange = -800, range = 7, shootEffect = CONST_ANI_SUDDENDEATH, effect = CONST_ME_SMALLCLOUDS, target = false, duration = 30000 },
}

monster.defenses = {
Expand Down
1 change: 1 addition & 0 deletions data-otservbr-global/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
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/demons/midnight_asura.lua
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ monster.attacks = {
{ name = "combat", interval = 4100, chance = 27, type = COMBAT_DEATHDAMAGE, minDamage = -150, maxDamage = -300, length = 8, spread = 0, effect = CONST_ME_MORTAREA, target = false },
{ name = "combat", interval = 2700, chance = 15, type = COMBAT_DEATHDAMAGE, minDamage = -50, maxDamage = -200, range = 5, shootEffect = CONST_ANI_SUDDENDEATH, target = true },
{ name = "combat", interval = 3100, chance = 15, type = COMBAT_ENERGYDAMAGE, minDamage = -50, maxDamage = -100, range = 1, shootEffect = CONST_ANI_ENERGY, target = true },
{ name = "speed", interval = 2000, chance = 20, speedChange = -100, radius = 1, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_SLEEP, target = true, duration = 15000 },
{ name = "speed", interval = 2000, chance = 20, speedChange = -800, radius = 1, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_SLEEP, target = true, duration = 15000 },
}

monster.defenses = {
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/demons/plaguesmith.lua
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ monster.attacks = {
{ name = "melee", interval = 1500, chance = 100, minDamage = 0, maxDamage = -539, condition = { type = CONDITION_POISON, totalDamage = 200, interval = 4000 } },
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_EARTHDAMAGE, minDamage = -60, maxDamage = -114, radius = 4, effect = CONST_ME_POISONAREA, target = false },
{ name = "plaguesmith wave", interval = 2000, chance = 10, minDamage = -100, maxDamage = -350, target = false },
{ name = "speed", interval = 2000, chance = 15, speedChange = -100, radius = 4, effect = CONST_ME_POISONAREA, target = false, duration = 30000 },
{ name = "speed", interval = 2000, chance = 15, speedChange = -800, radius = 4, effect = CONST_ME_POISONAREA, target = false, duration = 30000 },
}

monster.defenses = {
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/monster/dragons/ghastly_dragon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ monster.attacks = {
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_LIFEDRAIN, minDamage = -80, maxDamage = -230, range = 7, effect = CONST_ME_MAGIC_RED, target = true },
{ name = "ghastly dragon wave", interval = 2000, chance = 10, minDamage = -120, maxDamage = -250, target = false },
{ name = "combat", interval = 2000, chance = 15, type = COMBAT_DEATHDAMAGE, minDamage = -110, maxDamage = -180, radius = 4, effect = CONST_ME_MORTAREA, target = false },
{ name = "speed", interval = 2000, chance = 20, speedChange = -100, range = 7, effect = CONST_ME_SMALLCLOUDS, target = true, duration = 30000 },
{ name = "speed", interval = 2000, chance = 20, speedChange = -800, range = 7, effect = CONST_ME_SMALLCLOUDS, target = true, duration = 30000 },
}

monster.defenses = {
Expand Down
Loading

0 comments on commit c45f79f

Please sign in to comment.