Skip to content

Commit 0944d9a

Browse files
HatbergXaver-DaRed
Hatberg
authored and
Xaver-DaRed
committed
Replace Magic Numbers in Tavnazia, Nashmau, Shadowreign shops
1 parent 7f0c0ab commit 0944d9a

24 files changed

Lines changed: 375 additions & 342 deletions

File tree

‎scripts/enum/item.lua‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,6 +1573,14 @@ xi.item =
15731573
CHOCOBO_EGG_A_BIT_WARM = 2317,
15741574
CHOCOBO_EGG_A_LITTLE_WARM = 2318,
15751575
CHOCOBO_EGG_SOMEWHAT_WARM = 2319,
1576+
ATTUNER = 2322,
1577+
TACTICAL_PROCESSOR = 2323,
1578+
DRUM_MAGAZINE = 2324,
1579+
EQUALIZER = 2325,
1580+
TARGET_MARKER = 2326,
1581+
MANA_CHANNELER = 2327,
1582+
ERASER = 2328,
1583+
SMOKE_SCREEN = 2329,
15761584
YOICHIS_SASH = 2330,
15771585
BLUE_MAGES_TESTIMONY = 2331,
15781586
CORSAIRS_TESTIMONY = 2332,
@@ -1605,6 +1613,10 @@ xi.item =
16051613
CHUNK_OF_DIORITE = 2388,
16061614
CRA_RACING_FORM = 2402,
16071615
FLOCON_DE_MER = 2408,
1616+
FLAME_HOLDER = 2409,
1617+
ICE_MAKER = 2410,
1618+
REPLICATOR = 2411,
1619+
HAMMERMILL = 2412,
16081620
CHUNK_OF_AHT_URHGAN_BRASS = 2417,
16091621
AHT_URHGAN_BRASS_INGOT = 2418,
16101622
WIVRE_HORN = 2426,
@@ -2414,6 +2426,9 @@ xi.item =
24142426
ROCKFIN_TOOTH = 3979,
24152427
BZTAVIAN_STINGER = 3980,
24162428
BZTAVIAN_WING = 3981,
2429+
GOLDEN_SEED_POUCH = 3984,
2430+
MONARCH_BEETLE_SALIVA = 3985,
2431+
CHESTNUT_TREE_SAP = 3986,
24172432
WAKTZA_ROSTRUM = 4012,
24182433
WAKTZA_CREST = 4013,
24192434
YGGDREANT_BOLE = 4014,
@@ -2937,10 +2952,12 @@ xi.item =
29372952
SCROLL_OF_FIRE_II = 4753,
29382953
SCROLL_OF_FIRE_III = 4754,
29392954
SCROLL_OF_FIRE_IV = 4755,
2955+
SCROLL_OF_FIRE_V = 4756,
29402956
SCROLL_OF_BLIZZARD = 4757,
29412957
SCROLL_OF_BLIZZARD_II = 4758,
29422958
SCROLL_OF_BLIZZARD_III = 4759,
29432959
SCROLL_OF_BLIZZARD_IV = 4760,
2960+
SCROLL_OF_BLIZZARD_V = 4761,
29442961
SCROLL_OF_AERO = 4762,
29452962
SCROLL_OF_AERO_II = 4763,
29462963
SCROLL_OF_AERO_III = 4764,
@@ -3030,6 +3047,8 @@ xi.item =
30303047
SCROLL_OF_BLIND_II = 4884,
30313048
SCROLL_OF_DREAD_SPIKES = 4885,
30323049
SCROLL_OF_ABSORB_ACC = 4886,
3050+
SCROLL_OF_FIRAJA = 4890,
3051+
SCROLL_OF_AEROJA = 4892,
30333052
SCROLL_OF_STONEJA = 4893,
30343053
SCROLL_OF_WATERJA = 4895,
30353054
FIRE_SPIRIT_PACT = 4896,
@@ -3040,7 +3059,9 @@ xi.item =
30403059
LIGHT_SPIRIT_PACT = 4902,
30413060
DARK_SPIRIT_PACT = 4903,
30423061
SCROLL_OF_DISTRACT = 4912,
3062+
SCROLL_OF_DISTRACT_II = 4913,
30433063
SCROLL_OF_FRAZZLE = 4914,
3064+
SCROLL_OF_FRAZZLE_II = 4915,
30443065
SCROLL_OF_KATON_ICHI = 4928,
30453066
SCROLL_OF_KATON_SAN = 4930,
30463067
SCROLL_OF_HYOTON_ICHI = 4931,
@@ -3611,8 +3632,26 @@ xi.item =
36113632
CELADON_YGGRETE_SHARD_III = 6013,
36123633
CELADON_YGGRETE_SHARD_IV = 6014,
36133634
CELADON_YGGRETE_SHARD_V = 6015,
3635+
PYROHELIX_SCHEMA = 6041,
3636+
HYDROHELIX_SCHEMA = 6042,
3637+
IONOHELIX_SCHEMA = 6043,
3638+
CRYOHELIX_SCHEMA = 6044,
3639+
GEOHELIX_SCHEMA = 6045,
3640+
ANEMOHELIX_SCHEMA = 6046,
3641+
LUMINOHELIX_SCHEMA = 6047,
3642+
NOCTOHELIX_SCHEMA = 6048,
3643+
FIRESTORM_SCHEMA = 6049,
3644+
RAINSTORM_SCHEMA = 6050,
3645+
THUNDERSTORM_SCHEMA = 6051,
3646+
HAILSTORM_SCHEMA = 6052,
3647+
SANDSTORM_SCHEMA = 6053,
3648+
WINDSTORM_SCHEMA = 6054,
3649+
AURORASTORM_SCHEMA = 6055,
3650+
VOIDSTORM_SCHEMA = 6056,
36143651
KLIMAFORM_SCHEMA = 6058,
36153652
ANIMUS_AUGEO_SCHEMA = 6059,
3653+
ANIMUS_MINUO_SCHEMA = 6060,
3654+
ADLOQUIUM_SCHEMA = 6061,
36163655
SLICE_OF_GABBRATH_MEAT = 6068,
36173656
PLATE_OF_INDI_POISON = 6074,
36183657
PLATE_OF_INDI_FRAILTY = 6092,
@@ -3949,9 +3988,23 @@ xi.item =
39493988
EUDAEMON_SHIELD = 8970,
39503989
SPECIAL_GOBBIEDIAL_KEY = 8973,
39513990
DENSE_CLUSTER = 9010,
3991+
STROBE_II = 9032,
3992+
TENSION_SPRING_III = 9033,
3993+
LOUDSPEAKER_III = 9034,
3994+
SCOPE_II = 9036,
3995+
ACCELERATOR_III = 9037,
3996+
ARMOR_PLATE_III = 9039,
3997+
STABILIZER_III = 9040,
3998+
MANA_JAMMER_III = 9042,
3999+
STEALTH_SCREEN_II = 9043,
39524000
REFRACTIVE_CRYSTAL = 9049,
39534001
MELLIDOPT_WING = 9050,
4002+
INHIBITOR_II = 9065,
4003+
AMPLIFIER = 9066,
4004+
REPEATER = 9067,
39544005
BARRIER_MODULE = 9068,
4006+
RESISTER = 9070,
4007+
ARCANIC_CELL = 9072,
39554008
CLUMP_OF_BEE_POLLEN = 9082,
39564009
MANDRAGORA_DEWDROP = 9083,
39574010
ESCHALIXIR_P2 = 9086,
@@ -4031,6 +4084,8 @@ xi.item =
40314084
MOG_KUPON_A_EMI = 9226,
40324085
MOG_KUPON_A_SYW = 9227,
40334086
MOG_KUPON_A_ASYW = 9228,
4087+
SPEEDLOADER = 9229,
4088+
SPEEDLOADER_II = 9230,
40344089
AMBUSCADE_VOUCHER_HEAD = 9235,
40354090
AMBUSCADE_VOUCHER_BODY = 9236,
40364091
AMBUSCADE_VOUCHER_HANDS = 9237,

‎scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@
22
-- Area: Bastok Markets (S)
33
-- NPC: Blingbrix
44
-----------------------------------
5-
local ID = zones[xi.zone.BASTOK_MARKETS_S]
6-
-----------------------------------
75
---@type TNpcEntity
86
local entity = {}
97

108
entity.onTrigger = function(player, npc)
119
local stock =
1210
{
13-
{ 4116, 4500, }, --Hi-Potion
14-
{ 4132, 28000, }, --Hi-Ether
15-
{ 605, 200, }, --Pickaxe
16-
{ 1020, 300, }, --Sickle
11+
{ xi.item.HI_POTION, 4500 },
12+
{ xi.item.HI_ETHER, 28000 },
13+
{ xi.item.PICKAXE, 200 },
14+
{ xi.item.SICKLE, 300 },
1715
}
1816

19-
player:showText(npc, ID.text.BLINGBRIX_SHOP_DIALOG)
17+
player:showText(npc, zones[xi.zone.BASTOK_MARKETS_S].text.BLINGBRIX_SHOP_DIALOG)
2018
xi.shop.general(player, stock)
2119
end
2220

‎scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22
-- Area: Bastok Markets (S)
33
-- NPC: Silke
44
-----------------------------------
5-
local ID = zones[xi.zone.BASTOK_MARKETS_S]
6-
-----------------------------------
75
---@type TNpcEntity
86
local entity = {}
97

108
entity.onTrigger = function(player, npc)
119
local stock =
1210
{
13-
{ 6059, 29925, }, -- Animus Augeo Schema
14-
{ 6060, 29925, }, -- Animus Minuo Schema
15-
{ 6061, 36300, }, -- Adloquim Schema
11+
{ xi.item.ANIMUS_AUGEO_SCHEMA, 29925 },
12+
{ xi.item.ANIMUS_MINUO_SCHEMA, 29925 },
13+
{ xi.item.ADLOQUIUM_SCHEMA, 36300 },
1614
}
1715

18-
player:showText(npc, ID.text.SILKE_SHOP_DIALOG)
16+
player:showText(npc, zones[xi.zone.BASTOK_MARKETS_S].text.SILKE_SHOP_DIALOG)
1917
xi.shop.general(player, stock)
2018
end
2119

‎scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
-- NPC: Pohka Chichiyowahl
44
-- !pos -415 -2 -430 4
55
-----------------------------------
6-
local ID = zones[xi.zone.BIBIKI_BAY]
7-
-----------------------------------
86
---@type TNpcEntity
97
local entity = {}
108

119
entity.onTrigger = function(player, npc)
1210
local stock =
1311
{
14-
{ 17388, 1238, 3, }, -- Fastwater F. Rod
15-
{ 17382, 11845, 3, }, -- S.H. Fishing Rod
16-
{ 4148, 290, 3, }, -- Antidote
12+
{ xi.item.FASTWATER_FISHING_ROD, 1238, 3 },
13+
{ xi.item.SINGLE_HOOK_FISHING_ROD, 11845, 3 },
14+
{ xi.item.ANTIDOTE, 290, 3 },
1715
}
1816

19-
player:showText(npc, ID.text.POHKA_SHOP_DIALOG)
17+
player:showText(npc, zones[xi.zone.BIBIKI_BAY].text.POHKA_SHOP_DIALOG)
2018
xi.shop.nation(player, stock, xi.nation.WINDURST)
2119
end
2220

‎scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22
-- Area: Fort Karugo-Narugo
33
-- NPC: Spondulix
44
-----------------------------------
5-
local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S]
6-
-----------------------------------
75
---@type TNpcEntity
86
local entity = {}
97

108
entity.onTrigger = function(player, npc)
119
local stock =
1210
{
13-
{ 4116, 4500, }, -- Hi-Potion
14-
{ 4132, 28000, }, -- Hi-Ether
15-
{ 2563, 3035, }, -- Karugo Clay
11+
{ xi.item.HI_POTION, 4500 },
12+
{ xi.item.HI_ETHER, 28000 },
13+
{ xi.item.LUMP_OF_KARUGO_NARUGO_CLAY, 3035 },
1614
}
1715

18-
player:showText(npc, ID.text.SPONDULIX_SHOP_DIALOG)
16+
player:showText(npc, zones[xi.zone.FORT_KARUGO_NARUGO_S].text.SPONDULIX_SHOP_DIALOG)
1917
xi.shop.general(player, stock)
2018
end
2119

‎scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ entity.onEventFinish = function(player, csid, option, npc)
3333
elseif csid == 1016 and option == 0xFFE00FF then -- Buy/Sell Things
3434
local stock =
3535
{
36-
{ 573, 280, }, -- Vegetable Seeds
37-
{ 574, 320, }, -- Fruit Seeds
38-
{ 575, 280, }, -- Grain Seeds
39-
{ 572, 280, }, -- Herb Seeds
40-
{ 1236, 1685, }, -- Cactus Stems
41-
{ 2235, 320, }, -- Wildgrass Seeds
42-
{ 3986, 1111, }, -- Chestnut Tree Sap (11th Anniversary Campaign)
43-
{ 3985, 1111, }, -- Monarch Beetle Saliva (11th Anniversary Campaign)
44-
{ 3984, 1111, }, -- Golden Seed Pouch (11th Anniversary Campaign)
36+
{ xi.item.BAG_OF_VEGETABLE_SEEDS, 280 },
37+
{ xi.item.BAG_OF_FRUIT_SEEDS, 320 },
38+
{ xi.item.BAG_OF_GRAIN_SEEDS, 280 },
39+
{ xi.item.BAG_OF_HERB_SEEDS, 280 },
40+
{ xi.item.BAG_OF_CACTUS_STEMS, 1685 },
41+
{ xi.item.BAG_OF_WILDGRASS_SEEDS, 320 },
42+
{ xi.item.CHESTNUT_TREE_SAP, 1111 }, -- (11th Anniversary Campaign)
43+
{ xi.item.MONARCH_BEETLE_SALIVA, 1111 }, -- (11th Anniversary Campaign)
44+
{ xi.item.GOLDEN_SEED_POUCH, 1111 }, -- (11th Anniversary Campaign)
4545
}
4646
xi.shop.general(player, stock)
4747

‎scripts/zones/Nashmau/npcs/Chichiroon.lua‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,26 @@
22
-- Area: Nashmau
33
-- NPC: Chichiroon
44
-----------------------------------
5-
local ID = zones[xi.zone.NASHMAU]
6-
-----------------------------------
75
---@type TNpcEntity
86
local entity = {}
97

108
entity.onTrigger = function(player, npc)
119
local stock =
1210
{
13-
{ 5497, 99224, }, -- Bolter's Die
14-
{ 5498, 85500, }, -- Caster's Die
15-
{ 5499, 97350, }, -- Courser's Die
16-
{ 5500, 100650, }, -- Blitzer's Die
17-
{ 5501, 109440, }, -- Tactician's Die
18-
{ 5502, 116568, }, -- Allies' Die
19-
{ 5503, 96250, }, -- Miser's Die
20-
{ 5504, 95800, }, -- Companion's Die
21-
{ 5505, 123744, }, -- Avenger's Die
22-
{ 6368, 69288, }, -- Geomancer Die
23-
{ 6369, 73920, }, -- Rune Fencer Die
11+
{ xi.item.BOLTERS_DIE, 99224 },
12+
{ xi.item.CASTERS_DIE, 85500 },
13+
{ xi.item.COURSERS_DIE, 97350 },
14+
{ xi.item.BLITZERS_DIE, 100650 },
15+
{ xi.item.TACTICIANS_DIE, 109440 },
16+
{ xi.item.ALLIES_DIE, 116568 },
17+
{ xi.item.MISERS_DIE, 96250 },
18+
{ xi.item.COMPANIONS_DIE, 95800 },
19+
{ xi.item.AVENGERS_DIE, 123744 },
20+
{ xi.item.GEOMANCER_DIE, 69288 },
21+
{ xi.item.RUNE_FENCER_DIE, 73920 },
2422
}
2523

26-
player:showText(npc, ID.text.CHICHIROON_SHOP_DIALOG)
24+
player:showText(npc, zones[xi.zone.NASHMAU].text.CHICHIROON_SHOP_DIALOG)
2725
xi.shop.general(player, stock)
2826
end
2927

‎scripts/zones/Nashmau/npcs/Jajaroon.lua‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,31 @@
22
-- Area: Nashmau
33
-- NPC: Jajaroon
44
-----------------------------------
5-
local ID = zones[xi.zone.NASHMAU]
6-
-----------------------------------
75
---@type TNpcEntity
86
local entity = {}
97

108
entity.onTrigger = function(player, npc)
119
local stock =
1210
{
13-
{ 2176, 48, }, -- Fire Card
14-
{ 2177, 48, }, -- Ice Card
15-
{ 2178, 48, }, -- Wind Card
16-
{ 2179, 48, }, -- Earth Card
17-
{ 2180, 48, }, -- Thunder Card
18-
{ 2181, 48, }, -- Water Card
19-
{ 2182, 48, }, -- Light Card
20-
{ 2183, 48, }, -- Dark Card
21-
{ 5870, 10000, }, -- Trump Card Case
22-
{ 5488, 35200, }, -- Samurai Die
23-
{ 5489, 600, }, -- Ninja Die
24-
{ 5490, 9216, }, -- Dragoon Die
25-
{ 5491, 40000, }, -- Summoner Die
26-
{ 5492, 3525, }, -- Blue Mage Die
27-
{ 5493, 316, }, -- Corsair Die
28-
{ 5494, 82500, }, -- Puppetmaster Die
11+
{ xi.item.FIRE_CARD, 48 },
12+
{ xi.item.ICE_CARD, 48 },
13+
{ xi.item.WIND_CARD, 48 },
14+
{ xi.item.EARTH_CARD, 48 },
15+
{ xi.item.THUNDER_CARD, 48 },
16+
{ xi.item.WATER_CARD, 48 },
17+
{ xi.item.LIGHT_CARD, 48 },
18+
{ xi.item.DARK_CARD, 48 },
19+
{ xi.item.TRUMP_CARD_CASE, 10000 },
20+
{ xi.item.SAMURAI_DIE, 35200 },
21+
{ xi.item.NINJA_DIE, 600 },
22+
{ xi.item.DRAGOON_DIE, 9216 },
23+
{ xi.item.SUMMONER_DIE, 40000 },
24+
{ xi.item.BLUE_MAGE_DIE, 3525 },
25+
{ xi.item.CORSAIR_DIE, 316 },
26+
{ xi.item.PUPPETMASTER_DIE, 82500 },
2927
}
3028

31-
player:showText(npc, ID.text.JAJAROON_SHOP_DIALOG)
29+
player:showText(npc, zones[xi.zone.NASHMAU].text.JAJAROON_SHOP_DIALOG)
3230
xi.shop.general(player, stock)
3331
end
3432

‎scripts/zones/Nashmau/npcs/Mamaroon.lua‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,27 @@
22
-- Area: Nashmau
33
-- NPC: Mamaroon
44
-----------------------------------
5-
local ID = zones[xi.zone.NASHMAU]
6-
-----------------------------------
75
---@type TNpcEntity
86
local entity = {}
97

108
entity.onTrigger = function(player, npc)
119
local stock =
1210
{
13-
{ 4860, 27000, }, -- Scroll of Stun
14-
{ 4708, 5160, }, -- Scroll of Enfire
15-
{ 4709, 4098, }, -- Scroll of Enblizzard
16-
{ 4710, 2500, }, -- Scroll of Enaero
17-
{ 4711, 2030, }, -- Scroll of Entone
18-
{ 4712, 1515, }, -- Scroll of Enthunder
19-
{ 4713, 7074, }, -- Scroll of Enwater
20-
{ 4859, 9000, }, -- Scroll of Shock Spikes
21-
{ 2502, 29950, }, -- White Puppet Turban
22-
{ 2501, 29950, }, -- Black Puppet Turban
23-
{ 4706, 100800, }, -- Scroll of Enlight
24-
{ 4707, 100800, }, -- Scroll of Endark
11+
{ xi.item.SCROLL_OF_STUN, 27000 },
12+
{ xi.item.SCROLL_OF_ENFIRE, 5160 },
13+
{ xi.item.SCROLL_OF_ENBLIZZARD, 4098 },
14+
{ xi.item.SCROLL_OF_ENAERO, 2500 },
15+
{ xi.item.SCROLL_OF_ENSTONE, 2030 },
16+
{ xi.item.SCROLL_OF_ENTHUNDER, 1515 },
17+
{ xi.item.SCROLL_OF_ENWATER, 7074 },
18+
{ xi.item.SCROLL_OF_SHOCK_SPIKES, 9000 },
19+
{ xi.item.WHITE_PUPPET_TURBAN, 29950 },
20+
{ xi.item.BLACK_PUPPET_TURBAN, 29950 },
21+
{ xi.item.SCROLL_OF_ENLIGHT, 100800 },
22+
{ xi.item.SCROLL_OF_ENDARK, 100800 },
2523
}
2624

27-
player:showText(npc, ID.text.MAMAROON_SHOP_DIALOG)
25+
player:showText(npc, zones[xi.zone.NASHMAU].text.MAMAROON_SHOP_DIALOG)
2826
xi.shop.general(player, stock)
2927
end
3028

0 commit comments

Comments
 (0)