Skip to content

Commit

Permalink
Merge branch 'main' into rook-system
Browse files Browse the repository at this point in the history
  • Loading branch information
@jprzimba
jprzimba committed Jan 2, 2025
2 parents c2da6c6 + b795b7a commit a331e98
Show file tree
Hide file tree
Showing 75 changed files with 756 additions and 748 deletions.
12 changes: 6 additions & 6 deletions data-global/npc/alaistar.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ local itemsTable = {
{ itemName = "empty potion flask", clientId = 284, sell = 5 },
{ itemName = "empty potion flask", clientId = 285, sell = 5 },
{ itemName = "great health potion", clientId = 239, buy = 225 },
{ itemName = "great mana potion", clientId = 238, buy = 144 },
{ itemName = "great spirit potion", clientId = 7642, buy = 228 },
{ itemName = "great mana potion", clientId = 238, buy = 158 },
{ itemName = "great spirit potion", clientId = 7642, buy = 254 },
{ itemName = "health potion", clientId = 266, buy = 50 },
{ itemName = "mana potion", clientId = 268, buy = 56 },
{ itemName = "strong health potion", clientId = 236, buy = 115 },
{ itemName = "strong mana potion", clientId = 237, buy = 93 },
{ itemName = "supreme health potion", clientId = 23375, buy = 625 },
{ itemName = "strong mana potion", clientId = 237, buy = 108 },
{ itemName = "supreme health potion", clientId = 23375, buy = 650 },
{ itemName = "ultimate health potion", clientId = 7643, buy = 379 },
{ itemName = "ultimate mana potion", clientId = 23373, buy = 438 },
{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
{ itemName = "ultimate mana potion", clientId = 23373, buy = 488 },
{ itemName = "ultimate spirit potion", clientId = 23374, buy = 488 },
{ itemName = "vial", clientId = 2874, sell = 5 },
},
["creature products"] = {
Expand Down
16 changes: 8 additions & 8 deletions data-global/npc/alexander.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ npcConfig.voices = {

local itemsTable = {
["exercise weapons"] = {
{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
{ itemName = "durable exercise rod", clientId = 35283, buy = 1250000, count = 1800 },
{ itemName = "durable exercise wand", clientId = 35284, buy = 1250000, count = 1800 },
{ itemName = "exercise rod", clientId = 28556, buy = 347222, count = 500 },
{ itemName = "exercise wand", clientId = 28557, buy = 347222, count = 500 },
{ itemName = "lasting exercise rod", clientId = 35289, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise wand", clientId = 35290, buy = 10000000, count = 14400 },
},
["creature products"] = {
{ itemName = "crystal ball", clientId = 3076, buy = 530, sell = 190 },
Expand Down Expand Up @@ -64,8 +64,8 @@ local itemsTable = {
{ itemName = "paralyze rune", clientId = 3165, buy = 700 },
{ itemName = "poison bomb rune", clientId = 3173, buy = 85 },
{ itemName = "soulfire rune", clientId = 3195, buy = 46 },
{ itemName = "stone shower rune", clientId = 3175, buy = 37 },
{ itemName = "thunderstorm rune", clientId = 3202, buy = 47 },
{ itemName = "stone shower rune", clientId = 3175, buy = 41 },
{ itemName = "thunderstorm rune", clientId = 3202, buy = 52 },
{ itemName = "wild growth rune", clientId = 3156, buy = 160 },
},
["wands"] = {
Expand Down
2 changes: 1 addition & 1 deletion data-global/npc/archery.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ npcConfig.shop = {
{ itemName = "burst arrow", clientId = 3449, buy = 15 },
{ itemName = "crossbow", clientId = 3349, buy = 500 },
{ itemName = "crystalline arrow", clientId = 15793, buy = 20 },
{ itemName = "diamond arrow", clientId = 35901, buy = 100 },
{ itemName = "diamond arrow", clientId = 35901, buy = 130 },
{ itemName = "drill bolt", clientId = 16142, buy = 12 },
{ itemName = "earth arrow", clientId = 774, buy = 5 },
{ itemName = "envenomed arrow", clientId = 16143, buy = 12 },
Expand Down
30 changes: 15 additions & 15 deletions data-global/npc/asima.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,28 @@ npcConfig.flags = {

local itemsTable = {
["exercise weapons"] = {
{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
{ itemName = "durable exercise rod", clientId = 35283, buy = 1250000, count = 1800 },
{ itemName = "durable exercise wand", clientId = 35284, buy = 1250000, count = 1800 },
{ itemName = "exercise rod", clientId = 28556, buy = 347222, count = 500 },
{ itemName = "exercise wand", clientId = 28557, buy = 347222, count = 500 },
{ itemName = "lasting exercise rod", clientId = 35289, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise wand", clientId = 35290, buy = 10000000, count = 14400 },
},
["potions"] = {
{ itemName = "empty potion flask", clientId = 283, sell = 5 },
{ itemName = "empty potion flask", clientId = 284, sell = 5 },
{ itemName = "empty potion flask", clientId = 285, sell = 5 },
{ itemName = "great health potion", clientId = 239, buy = 225 },
{ itemName = "great mana potion", clientId = 238, buy = 144 },
{ itemName = "great spirit potion", clientId = 7642, buy = 228 },
{ itemName = "great mana potion", clientId = 238, buy = 158 },
{ itemName = "great spirit potion", clientId = 7642, buy = 254 },
{ itemName = "health potion", clientId = 266, buy = 50 },
{ itemName = "mana potion", clientId = 268, buy = 56 },
{ itemName = "strong health potion", clientId = 236, buy = 115 },
{ itemName = "strong mana potion", clientId = 237, buy = 93 },
{ itemName = "supreme health potion", clientId = 23375, buy = 625 },
{ itemName = "strong mana potion", clientId = 237, buy = 108 },
{ itemName = "supreme health potion", clientId = 23375, buy = 650 },
{ itemName = "ultimate health potion", clientId = 7643, buy = 379 },
{ itemName = "ultimate mana potion", clientId = 23373, buy = 438 },
{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
{ itemName = "ultimate mana potion", clientId = 23373, buy = 488 },
{ itemName = "ultimate spirit potion", clientId = 23374, buy = 488 },
{ itemName = "vial", clientId = 2874, sell = 5 },
},
["others"] = {
Expand All @@ -56,7 +56,7 @@ local itemsTable = {
{ itemName = "spellbook", clientId = 3059, buy = 150 },
},
["runes"] = {
{ itemName = "avalanche rune", clientId = 3161, buy = 57 },
{ itemName = "avalanche rune", clientId = 3161, buy = 64 },
{ itemName = "blank rune", clientId = 3147, buy = 10 },
{ itemName = "chameleon rune", clientId = 3178, buy = 210 },
{ itemName = "convince creature rune", clientId = 3177, buy = 80 },
Expand All @@ -68,13 +68,13 @@ local itemsTable = {
{ itemName = "fire bomb rune", clientId = 3192, buy = 147 },
{ itemName = "fire field rune", clientId = 3188, buy = 28 },
{ itemName = "fire wall rune", clientId = 3190, buy = 61 },
{ itemName = "great fireball rune", clientId = 3191, buy = 57 },
{ itemName = "great fireball rune", clientId = 3191, buy = 64 },
{ itemName = "heavy magic missile rune", clientId = 3198, buy = 12 },
{ itemName = "intense healing rune", clientId = 3152, buy = 95 },
{ itemName = "light magic missile rune", clientId = 3174, buy = 4 },
{ itemName = "poison field rune", clientId = 3172, buy = 21 },
{ itemName = "poison wall rune", clientId = 3176, buy = 52 },
{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
{ itemName = "sudden death rune", clientId = 3155, buy = 162 },
{ itemName = "stalagmite rune", clientId = 3179, buy = 12 },
{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
},
Expand Down
18 changes: 9 additions & 9 deletions data-global/npc/asnarus.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ npcConfig.shop = {
{ itemName = "crystalline arrow", clientId = 15793, buy = 20 },
{ itemName = "dead weight", clientId = 20202, sell = 450 },
{ itemName = "desintegrate rune", clientId = 3197, buy = 26 },
{ itemName = "diamond arrow", clientId = 35901, buy = 100 },
{ itemName = "diamond arrow", clientId = 35901, buy = 130 },
{ itemName = "drill bolt", clientId = 16142, buy = 12 },
{ itemName = "earth arrow", clientId = 774, buy = 5 },
{ itemName = "empty potion flask", clientId = 283, sell = 5 },
Expand All @@ -79,8 +79,8 @@ npcConfig.shop = {
{ itemName = "frazzle tongue", clientId = 20198, sell = 700 },
{ itemName = "goosebump leather", clientId = 20205, sell = 650 },
{ itemName = "great health potion", clientId = 239, buy = 225 },
{ itemName = "great mana potion", clientId = 238, buy = 144 },
{ itemName = "great spirit potion", clientId = 7642, buy = 228 },
{ itemName = "great mana potion", clientId = 238, buy = 158 },
{ itemName = "great spirit potion", clientId = 7642, buy = 254 },
{ itemName = "health potion", clientId = 266, buy = 50 },
{ itemName = "hemp rope", clientId = 20206, sell = 350 },
{ itemName = "holy missile rune", clientId = 3182, buy = 16 },
Expand All @@ -105,17 +105,17 @@ npcConfig.shop = {
{ itemName = "soulfire rune", clientId = 3195, buy = 46 },
{ itemName = "spear", clientId = 3277, buy = 9, sell = 3 },
{ itemName = "spectral bolt", clientId = 35902, buy = 70 },
{ itemName = "stone shower rune", clientId = 3175, buy = 37 },
{ itemName = "stone shower rune", clientId = 3175, buy = 41 },
{ itemName = "strong health potion", clientId = 236, buy = 115 },
{ itemName = "strong mana potion", clientId = 237, buy = 93 },
{ itemName = "supreme health potion", clientId = 23375, buy = 625 },
{ itemName = "strong mana potion", clientId = 237, buy = 108 },
{ itemName = "supreme health potion", clientId = 23375, buy = 650 },
{ itemName = "tarsal arrow", clientId = 14251, buy = 6 },
{ itemName = "throwing star", clientId = 3287, buy = 42 },
{ itemName = "thunderstorm rune", clientId = 3202, buy = 47 },
{ itemName = "thunderstorm rune", clientId = 3202, buy = 52 },
{ itemName = "trapped bad dream monster", clientId = 20203, sell = 900 },
{ itemName = "ultimate health potion", clientId = 7643, buy = 379 },
{ itemName = "ultimate mana potion", clientId = 23373, buy = 438 },
{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
{ itemName = "ultimate mana potion", clientId = 23373, buy = 488 },
{ itemName = "ultimate spirit potion", clientId = 23374, buy = 488 },
{ itemName = "vial", clientId = 2874, sell = 5 },
{ itemName = "vortex bolt", clientId = 14252, buy = 6 },
{ itemName = "wild growth rune", clientId = 3156, buy = 160 },
Expand Down
30 changes: 15 additions & 15 deletions data-global/npc/baltim.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ npcConfig.shop = {
{ itemName = "dagger", clientId = 3267, buy = 5, sell = 2 },
{ itemName = "double axe", clientId = 3275, sell = 260 },
{ itemName = "doublet", clientId = 3379, buy = 16, sell = 3 },
{ itemName = "durable exercise axe", clientId = 35280, buy = 945000, count = 1800 },
{ itemName = "durable exercise bow", clientId = 35282, buy = 945000, count = 1800 },
{ itemName = "durable exercise club", clientId = 35281, buy = 945000, count = 1800 },
{ itemName = "durable exercise shield", clientId = 44066, buy = 945000, count = 1800 },
{ itemName = "durable exercise sword", clientId = 35279, buy = 945000, count = 1800 },
{ itemName = "durable exercise axe", clientId = 35280, buy = 1250000, count = 1800 },
{ itemName = "durable exercise bow", clientId = 35282, buy = 1250000, count = 1800 },
{ itemName = "durable exercise club", clientId = 35281, buy = 1250000, count = 1800 },
{ itemName = "durable exercise shield", clientId = 44066, buy = 1250000, count = 1800 },
{ itemName = "durable exercise sword", clientId = 35279, buy = 1250000, count = 1800 },
{ itemName = "dwarven shield", clientId = 3425, buy = 500, sell = 100 },
{ itemName = "exercise axe", clientId = 28553, buy = 262500, count = 500 },
{ itemName = "exercise bow", clientId = 28555, buy = 262500, count = 500 },
{ itemName = "exercise club", clientId = 28554, buy = 262500, count = 500 },
{ itemName = "exercise shield", clientId = 44065, buy = 262500, count = 500 },
{ itemName = "exercise sword", clientId = 28552, buy = 262500, count = 500 },
{ itemName = "exercise axe", clientId = 28553, buy = 347222, count = 500 },
{ itemName = "exercise bow", clientId = 28555, buy = 347222, count = 500 },
{ itemName = "exercise club", clientId = 28554, buy = 347222, count = 500 },
{ itemName = "exercise shield", clientId = 44065, buy = 347222, count = 500 },
{ itemName = "exercise sword", clientId = 28552, buy = 347222, count = 500 },
{ itemName = "fire sword", clientId = 3280, sell = 1000 },
{ itemName = "frost giant pelt", clientId = 9658, sell = 160 },
{ itemName = "halberd", clientId = 3269, sell = 400 },
Expand All @@ -94,11 +94,11 @@ npcConfig.shop = {
{ itemName = "iron helmet", clientId = 3353, buy = 390, sell = 150 },
{ itemName = "jacket", clientId = 3561, buy = 12, sell = 1 },
{ itemName = "katana", clientId = 3300, sell = 35 },
{ itemName = "lasting exercise axe", clientId = 35286, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise bow", clientId = 35288, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise club", clientId = 35287, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise shield", clientId = 44067, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise sword", clientId = 35285, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise axe", clientId = 35286, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise bow", clientId = 35288, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise club", clientId = 35287, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise shield", clientId = 44067, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise sword", clientId = 35285, buy = 10000000, count = 14400 },
{ itemName = "leather armor", clientId = 3361, buy = 35, sell = 12 },
{ itemName = "leather boots", clientId = 3552, buy = 10, sell = 2 },
{ itemName = "leather helmet", clientId = 3355, buy = 12, sell = 4 },
Expand Down
32 changes: 16 additions & 16 deletions data-global/npc/brengus.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,23 +81,23 @@ npcConfig.shop = {
{ itemName = "crowbar", clientId = 3304, buy = 260, sell = 50 },
{ itemName = "crystalline arrow", clientId = 15793, buy = 20 },
{ itemName = "dagger", clientId = 3267, buy = 5, sell = 2 },
{ itemName = "diamond arrow", clientId = 35901, buy = 100 },
{ itemName = "diamond arrow", clientId = 35901, buy = 130 },
{ itemName = "double axe", clientId = 3275, sell = 260 },
{ itemName = "doublet", clientId = 3379, buy = 16, sell = 3 },
{ itemName = "drill bolt", clientId = 16142, buy = 12 },
{ itemName = "durable exercise axe", clientId = 35280, buy = 945000, count = 1800 },
{ itemName = "durable exercise bow", clientId = 35282, buy = 945000, count = 1800 },
{ itemName = "durable exercise club", clientId = 35281, buy = 945000, count = 1800 },
{ itemName = "durable exercise shield", clientId = 44066, buy = 945000, count = 1800 },
{ itemName = "durable exercise sword", clientId = 35279, buy = 945000, count = 1800 },
{ itemName = "durable exercise axe", clientId = 35280, buy = 1250000, count = 1800 },
{ itemName = "durable exercise bow", clientId = 35282, buy = 1250000, count = 1800 },
{ itemName = "durable exercise club", clientId = 35281, buy = 1250000, count = 1800 },
{ itemName = "durable exercise shield", clientId = 44066, buy = 1250000, count = 1800 },
{ itemName = "durable exercise sword", clientId = 35279, buy = 1250000, count = 1800 },
{ itemName = "dwarven shield", clientId = 3425, buy = 500, sell = 100 },
{ itemName = "earth arrow", clientId = 774, buy = 5 },
{ itemName = "envenomed arrow", clientId = 16143, buy = 12 },
{ itemName = "exercise axe", clientId = 28553, buy = 262500, count = 500 },
{ itemName = "exercise bow", clientId = 28555, buy = 262500, count = 500 },
{ itemName = "exercise club", clientId = 28554, buy = 262500, count = 500 },
{ itemName = "exercise shield", clientId = 44065, buy = 262500, count = 500 },
{ itemName = "exercise sword", clientId = 28552, buy = 262500, count = 500 },
{ itemName = "exercise axe", clientId = 28553, buy = 347222, count = 500 },
{ itemName = "exercise bow", clientId = 28555, buy = 347222, count = 500 },
{ itemName = "exercise club", clientId = 28554, buy = 347222, count = 500 },
{ itemName = "exercise shield", clientId = 44065, buy = 347222, count = 500 },
{ itemName = "exercise sword", clientId = 28552, buy = 347222, count = 500 },
{ itemName = "feather headdress", clientId = 3406, sell = 850 },
{ itemName = "fire sword", clientId = 3280, sell = 1000 },
{ itemName = "flaming arrow", clientId = 763, buy = 5 },
Expand All @@ -111,11 +111,11 @@ npcConfig.shop = {
{ itemName = "jacket", clientId = 3561, buy = 12, sell = 1 },
{ itemName = "katana", clientId = 3300, sell = 35 },
{ itemName = "kongra's shoulderpad", clientId = 11471, sell = 100 },
{ itemName = "lasting exercise axe", clientId = 35286, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise bow", clientId = 35288, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise club", clientId = 35287, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise shield", clientId = 44067, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise sword", clientId = 35285, buy = 7560000, count = 14400 },
{ itemName = "lasting exercise axe", clientId = 35286, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise bow", clientId = 35288, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise club", clientId = 35287, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise shield", clientId = 44067, buy = 10000000, count = 14400 },
{ itemName = "lasting exercise sword", clientId = 35285, buy = 10000000, count = 14400 },
{ itemName = "leather armor", clientId = 3361, buy = 35, sell = 12 },
{ itemName = "leather boots", clientId = 3552, buy = 10, sell = 2 },
{ itemName = "leather helmet", clientId = 3355, buy = 12, sell = 4 },
Expand Down
Loading

0 comments on commit a331e98

Please sign in to comment.