Skip to content

Commit

Permalink
Merge branch 'main' into house-auction
Browse files Browse the repository at this point in the history
  • Loading branch information
@jprzimba
jprzimba committed Jan 1, 2025
2 parents 62590a4 + da7e4e1 commit d443985
Show file tree
Hide file tree
Showing 50 changed files with 4,127 additions and 826 deletions.
6 changes: 6 additions & 0 deletions data-global/lib/core/storages.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,7 @@ Storage = {
NoblemanSecondAddon = 41308,
FormorgarMinesHoistSkeleton = 41309,
FormorgarMinesHoistChest = 41310,
PickAmount = 41311,
},
},
U8_1 = { -- update 8.1 - Reserved Storages 41351 - 41650
Expand Down Expand Up @@ -2843,6 +2844,11 @@ Storage = {
},
},
},
U13_20 = { -- update 13.20 - Reserved Storages 47952 - 47970
RottenBlood = {
AccessDoor = 47952,
},
},
},
-- Reserved storage from 63951 - 63999
ThaisExhibition = {
Expand Down
126 changes: 47 additions & 79 deletions ...r/quests/rotten_bood/bosses/bakragore.lua → data-global/monster/bosses/bakragore.lua
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local mType = Game.createMonsterType("Bakragore")
local monster = {}

monster.description = "bakragore"
monster.description = "Bakragore"
monster.experience = 15000000
monster.outfit = {
lookType = 1671,
Expand All @@ -14,24 +14,24 @@ monster.outfit = {
}

monster.events = {
"RottenBloodBossOutFitDeath",
"RottenBloodBakragoreDeath",
}

monster.bosstiary = {
bossRaceId = 2367,
bossRace = RARITY_NEMESIS,
}

monster.health = 660000
monster.maxHealth = 660000
monster.race = "undead"
monster.corpse = 44012
monster.speed = 195
monster.speed = 250
monster.manaCost = 0

monster.changeTarget = {
interval = 2000,
chance = 10,
}

monster.bosstiary = {
bossRaceId = 2367,
bossRace = RARITY_NEMESIS,
interval = 10000,
chance = 20,
}

monster.strategiesTarget = {
Expand All @@ -51,7 +51,7 @@ monster.flags = {
illusionable = false,
canPushItems = true,
canPushCreatures = true,
staticAttackChance = 95,
staticAttackChance = 98,
targetDistance = 1,
runHealth = 0,
healthHidden = false,
Expand All @@ -66,80 +66,48 @@ monster.light = {
color = 0,
}

monster.summon = {}
monster.summon = {
maxSummons = 2,
summons = {
{ name = "Elder Bloodjaw", chance = 20, interval = 2000, count = 2 },
},
}

monster.voices = {
interval = 5000,
chance = 10,
{ text = "Light ... darkens!", yell = false },
{ text = "Light .. the ... darkness!", yell = false },
{ text = "Darkness ... is ... light!", yell = false },
{ text = "WILL ... PUNISH ... YOU!", yell = false },
{ text = "RAAAR!", yell = false },
}

monster.loot = {
{ id = 3043, chance = 100000, maxCount = 30 },
{ id = 7643, chance = 40000, maxCount = 20 },
{ id = 238, chance = 40000, maxCount = 20 },
{ id = 7642, chance = 40000, maxCount = 20 },
{ name = "white gem", chance = 30000, maxCount = 1 },
{ name = "giant sapphire", chance = 3000, maxCount = 1 },
{ id = 44008, chance = 10000, maxCount = 2 },
{ name = "fireborn giant armor", chance = 18000 },
{ name = "royal crossbow", chance = 18000 },
{ name = "stomper", chance = 13000 },
{ name = "blue gem", chance = 9000 },
{ name = "gold ring", chance = 9000 },
{ name = "steel boots", chance = 9000 },
{ name = "thunder hammer", chance = 9000 },
{ id = 43855, chance = 4500, maxCount = 2 },
{ id = 43854, chance = 29500, maxCount = 2 },
{ id = 43853, chance = 44500, maxCount = 3 },
{ id = 43901, chance = 4000 },
{ id = 43927, chance = 24500 },
{ id = 32003, chance = 8000, maxCount = 2 },
{ id = 32005, chance = 8000, maxCount = 6 },
{ id = 32007, chance = 4000 },
{ id = 31991, chance = 1000 },
{ id = 31992, chance = 1000 },
{ id = 31993, chance = 1000 },
{ id = 31994, chance = 1000 },
{ id = 31995, chance = 1000 },
{ id = 32005, chance = 4000, maxCount = 6 },
{ id = 23267, chance = 10000, maxCount = 3 },
{ id = 32014, chance = 3000 },
{ id = 23234, chance = 3000, maxCount = 2 },
{ id = 23236, chance = 3000, maxCount = 3 },
{ id = 23238, chance = 3000, maxCount = 3 },
{ id = 31996, chance = 1000 },
{ id = 31997, chance = 1000 },
{ id = 44048, chance = 3000 }, -- Spirit Horseshoe ( Spirit of Purity Mount x4 )
{ id = 3278, chance = 50 }, -- Magic Longsword Ultra Rare
{ id = 43963, chance = 1000 }, -- figurine bakragore
{ id = 43968, chance = 1000 }, -- bakragore's amalgamation
{ id = 9058, chance = 800 }, -- gold ingot
{ id = 43860, chance = 600 }, -- Bag you covet
{ id = 43864, chance = 310 }, -- Sanguine Items ( not grand )
{ id = 43866, chance = 320 },
{ id = 43868, chance = 330 },
{ id = 43870, chance = 340 },
{ id = 43872, chance = 350 },
{ id = 43874, chance = 360 },
{ id = 43876, chance = 370 },
{ id = 43877, chance = 380 },
{ id = 43879, chance = 390 },
{ id = 43881, chance = 400 },
{ id = 31965, chance = 15000, maxCount = 2 },
{ id = 43882, chance = 410 },
{ id = 43884, chance = 420 },
{ id = 43885, chance = 430 },
{ id = 43887, chance = 440 },
{ id = 36478, chance = 450 },
{ name = "crystal coin", chance = 8938, maxCount = 165 },
{ name = "ultimate mana potion", chance = 11433, maxCount = 198 },
{ name = "giant amethyst", chance = 10570, maxCount = 4 },
{ name = "giant topaz", chance = 10570, maxCount = 6 },
{ name = "ultimate spirit potion", chance = 11433, maxCount = 45 },
{ name = "giant ruby", chance = 10570, maxCount = 1 },
{ name = "giant sapphire", chance = 10570, maxCount = 1 },
{ name = "mastermind potion", chance = 10938, maxCount = 23 },
{ id = 3039, chance = 10570, maxCount = 3 }, -- red gem
{ name = "violet gem", chance = 10970, maxCount = 8 },
{ name = "yellow gem", chance = 10970, maxCount = 9 },
-- { name = "figurine of bakragore", chance = 10970 },
-- { name = "bakragore's amalgamation", chance = 570 },
{ name = "spiritual horseshoe", chance = 470 },
{ id = 43895, chance = 360 }, -- Bag you covet
}

monster.attacks = {
{ name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -3000 },
{ name = "combat", interval = 3000, chance = 35, type = COMBAT_ICEDAMAGE, minDamage = -900, maxDamage = -1100, range = 7, radius = 7, shootEffect = CONST_ANI_ICE, effect = 243, target = true },
{ name = "combat", interval = 2000, chance = 13, type = COMBAT_DEATHDAMAGE, minDamage = -100, maxDamage = -1000, length = 8, spread = 3, effect = 252, target = false },
{ name = "combat", interval = 3000, chance = 30, type = COMBAT_FIREDAMAGE, minDamage = -1000, maxDamage = -2000, length = 8, spread = 3, effect = 249, target = false },
{ name = "combat", interval = 2000, chance = 13, type = COMBAT_DEATHDAMAGE, minDamage = -100, maxDamage = -1000, length = 8, spread = 0, effect = 252, target = false },
{ name = "combat", interval = 3000, chance = 30, type = COMBAT_FIREDAMAGE, minDamage = -1000, maxDamage = -2000, length = 8, spread = 0, effect = 249, target = false },
{ name = "combat", interval = 2000, chance = 30, type = COMBAT_ICEDAMAGE, minDamage = -950, maxDamage = -2400, range = 7, radius = 3, shootEffect = 37, effect = 240, target = true },
{ name = "combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -1000, maxDamage = -2500, length = 8, spread = 3, effect = 244, target = false },
{ name = "combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -1000, maxDamage = -2500, length = 8, spread = 0, effect = 244, target = false },
}

monster.defenses = {
Expand All @@ -150,16 +118,16 @@ monster.defenses = {
}

monster.elements = {
{ type = COMBAT_PHYSICALDAMAGE, percent = 0 },
{ type = COMBAT_ENERGYDAMAGE, percent = 0 },
{ type = COMBAT_EARTHDAMAGE, percent = 0 },
{ type = COMBAT_FIREDAMAGE, percent = 0 },
{ type = COMBAT_PHYSICALDAMAGE, percent = 15 },
{ type = COMBAT_ENERGYDAMAGE, percent = 15 },
{ type = COMBAT_EARTHDAMAGE, percent = 15 },
{ type = COMBAT_FIREDAMAGE, percent = 15 },
{ type = COMBAT_LIFEDRAIN, percent = 0 },
{ type = COMBAT_MANADRAIN, percent = 0 },
{ type = COMBAT_DROWNDAMAGE, percent = 0 },
{ type = COMBAT_ICEDAMAGE, percent = 0 },
{ type = COMBAT_HOLYDAMAGE, percent = 0 },
{ type = COMBAT_DEATHDAMAGE, percent = 0 },
{ type = COMBAT_ICEDAMAGE, percent = 15 },
{ type = COMBAT_HOLYDAMAGE, percent = 15 },
{ type = COMBAT_DEATHDAMAGE, percent = 15 },
}

monster.immunities = {
Expand Down
87 changes: 42 additions & 45 deletions ...ter/quests/rotten_bood/bosses/chagorz.lua → data-global/monster/bosses/chagorz.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local monster = {}
monster.description = "Chagorz"
monster.experience = 3250000
monster.outfit = {
lookType = 1666,
lookType = 1665,
lookHead = 0,
lookBody = 0,
lookLegs = 0,
Expand All @@ -17,21 +17,21 @@ monster.events = {
"RottenBloodBossDeath",
}

monster.bosstiary = {
bossRaceId = 2366,
bossRace = RARITY_ARCHFOE,
}

monster.health = 350000
monster.maxHealth = 350000
monster.race = "undead"
monster.corpse = 44021
monster.speed = 195
monster.corpse = 44024
monster.speed = 250
monster.manaCost = 0

monster.changeTarget = {
interval = 2000,
chance = 10,
}

monster.bosstiary = {
bossRaceId = 2366,
bossRace = RARITY_NEMESIS,
interval = 10000,
chance = 20,
}

monster.strategiesTarget = {
Expand All @@ -51,15 +51,14 @@ monster.flags = {
illusionable = false,
canPushItems = true,
canPushCreatures = true,
staticAttackChance = 95,
staticAttackChance = 98,
targetDistance = 1,
runHealth = 0,
healthHidden = false,
isBlockable = false,
canWalkOnEnergy = true,
canWalkOnFire = true,
canWalkOnPoison = true,
pet = false,
}

monster.light = {
Expand All @@ -72,38 +71,36 @@ monster.summon = {}
monster.voices = {
interval = 5000,
chance = 10,
{ text = "The light... that... drains!", yell = false },
{ text = "RAAAR!", yell = false },
{ text = "WILL ... PUNISH ... YOU!", yell = false },
{ text = "Darkness ... devours!", yell = false },
}

monster.loot = {
{ id = 43895, chance = 4996 }, -- bag you covet,
{ name = "berserk potion", chance = 2758, minCount = 0, maxCount = 40 },
{ id = 3041, chance = 4702, minCount = 0, maxCount = 1 }, -- blue gem,
{ name = "bullseye potion", chance = 3972, minCount = 0, maxCount = 31 },
{ name = "crystal coin", chance = 4018, minCount = 0, maxCount = 100 },
{ name = "darklight figurine", chance = 3164 },
{ name = "giant topaz", chance = 3744, minCount = 0, maxCount = 1 },
{ name = "giant sapphire", chance = 4917, minCount = 0, maxCount = 1 },
{ name = "gold ingot", chance = 2250, minCount = 0, maxCount = 1 },
{ name = "green gem", chance = 4373, minCount = 0, maxCount = 1 },
{ name = "mastermind potion", chance = 3945, minCount = 0, maxCount = 27 },
{ name = "raw watermelon tourmaline", chance = 1876, minCount = 0, maxCount = 1 },
{ id = 3039, chance = 2121, minCount = 0, maxCount = 1 }, -- red gem,
{ name = "supreme health potion", chance = 2303, minCount = 0, maxCount = 164 },
{ name = "the essence of chagorz", chance = 4820 },
{ name = "unicorn figurine", chance = 3030 },
{ name = "ultimate mana potion", chance = 2519, minCount = 0, maxCount = 98 },
{ name = "ultimate spirit potion", chance = 2047, minCount = 0, maxCount = 127 },
{ name = "violet gem", chance = 4963, minCount = 0, maxCount = 1 },
{ name = "white gem", chance = 4927, minCount = 0, maxCount = 3 },
{ name = "yellow gem", chance = 1940, minCount = 0, maxCount = 1 },
{ name = "crystal coin", chance = 5441, maxCount = 108 },
{ name = "mastermind potion", chance = 5530, maxCount = 28 },
{ name = "supreme health potion", chance = 5044, maxCount = 154 },
{ name = "giant sapphire", chance = 10546, maxCount = 1 },
{ name = "ultimate mana potion", chance = 5752, maxCount = 107 },
{ name = "violet gem", chance = 13217, maxCount = 4 },
{ id = 3039, chance = 13465, maxCount = 1 }, -- red gem
{ name = "yellow gem", chance = 14071, maxCount = 1 },
{ name = "blue gem", chance = 11156, maxCount = 3 },
{ name = "bullseye potion", chance = 6792, maxCount = 21 },
{ name = "giant amethyst", chance = 11603, maxCount = 1 },
{ name = "giant topaz", chance = 12280, maxCount = 1 },
{ name = "green gem", chance = 8348, maxCount = 1 },
{ name = "ultimate spirit potion", chance = 10934, maxCount = 18 },
{ name = "white gem", chance = 9600, maxCount = 3 },
}

monster.attacks = {
{ name = "melee", interval = 2000, chance = 100, minDamage = -1300, maxDamage = -2250 },
{ name = "combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -500, maxDamage = -900, radius = 4, effect = CONST_ME_GREEN_RINGS, target = false },
{ name = "combat", interval = 2000, chance = 20, type = COMBAT_DEATHDAMAGE, minDamage = -500, maxDamage = -900, range = 4, radius = 4, effect = 241, target = true },
{ name = "combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -1000, maxDamage = -1200, length = 10, spread = 3, effect = CONST_ME_POFF, target = false },
{ name = "combat", interval = 2000, chance = 20, type = COMBAT_LIFEDRAIN, minDamage = -1500, maxDamage = -1900, length = 10, spread = 3, effect = 225, target = false },
{ name = "combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -1000, maxDamage = -1200, length = 10, spread = 0, effect = CONST_ME_POFF, target = false },
{ name = "combat", interval = 2000, chance = 20, type = COMBAT_LIFEDRAIN, minDamage = -1500, maxDamage = -1900, length = 10, spread = 0, effect = 225, target = false },
{ name = "speed", interval = 2000, chance = 20, speedChange = -600, radius = 7, effect = CONST_ME_MAGIC_GREEN, target = false, duration = 20000 },
}

Expand All @@ -114,16 +111,16 @@ monster.defenses = {
}

monster.elements = {
{ type = "COMBAT_PHYSICALDAMAGE", percent = 0 },
{ type = "COMBAT_DEATHDAMAGE", percent = 0 },
{ type = "COMBAT_HOLYDAMAGE", percent = 0 },
{ type = "COMBAT_ICEDAMAGE", percent = 0 },
{ type = "COMBAT_FIREDAMAGE", percent = 0 },
{ type = "COMBAT_ENERGYDAMAGE", percent = 0 },
{ type = "COMBAT_EARTHDAMAGE", percent = 10 },
{ type = "COMBAT_LIFEDRAIN", percent = 0 },
{ type = "COMBAT_MANADRAIN", percent = 0 },
{ type = "COMBAT_DROWNDAMAGE", percent = 0 },
{ type = COMBAT_PHYSICALDAMAGE, percent = 15 },
{ type = COMBAT_ENERGYDAMAGE, percent = 15 },
{ type = COMBAT_EARTHDAMAGE, percent = 15 },
{ type = COMBAT_FIREDAMAGE, percent = 15 },
{ type = COMBAT_LIFEDRAIN, percent = 0 },
{ type = COMBAT_MANADRAIN, percent = 0 },
{ type = COMBAT_DROWNDAMAGE, percent = 0 },
{ type = COMBAT_ICEDAMAGE, percent = 15 },
{ type = COMBAT_HOLYDAMAGE, percent = 15 },
{ type = COMBAT_DEATHDAMAGE, percent = 15 },
}

monster.immunities = {
Expand Down
Loading

0 comments on commit d443985

Please sign in to comment.