Skip to content

[lua] Expeditionary Force Battle Logic #10510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nobutadas wants to merge 1 commit into
base: base
Choose a base branch
from
+1,323 −93
Open

[lua] Expeditionary Force Battle Logic #10510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
995 changes: 995 additions & 0 deletions scripts/globals/expeditionary_force.lua
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 23 additions & 6 deletions scripts/zones/Beaucedine_Glacier/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ zones[xi.zone.BEAUCEDINE_GLACIER] =
text =
{
CONQUEST_BASE = 0, -- Tallying conquest results...
REGION_POINTS_SANDORIA = 65, -- San d'Oria's region points have increased!
EXP_FORCE_KILL_SANDORIA = 68, -- San d'Orian E.F. defeats beastmen hordes... Maintain current momentum.
BEASTMEN_BANNER_CURSE = 79, -- There was a curse on the beastmen's banner!
BEASTMEN_BANNER_LIFTED = 80, -- The curse of the beastmen's banner has been lifted!
BEASTMEN_BANNER = 81, -- There is a beastmen's banner.
ITEM_CANNOT_BE_OBTAINED = 6569, -- You cannot obtain the item. Come back after sorting your inventory.
FULL_INVENTORY_AFTER_TRADE = 6571, -- You cannot obtain the <item>. Try trading again after sorting your inventory.
Expand Down Expand Up @@ -50,10 +54,22 @@ zones[xi.zone.BEAUCEDINE_GLACIER] =
},
mob =
{
GARGANTUA = GetFirstID('Gargantua'),
HUMBABA = GetFirstID('Humbaba'),
KIRATA = GetFirstID('Kirata'),
NUE = GetFirstID('Nue'),
GARGANTUA = GetFirstID('Gargantua'),
GIGAS_BEASTMASTER = GetFirstID('Gigas_Beastmaster'),
GIGAS_MONK = GetFirstID('Gigas_Monk'),
GIGAS_RANGER = GetFirstID('Gigas_Ranger'),
GIGAS_WARRIOR = GetFirstID('Gigas_Warrior'),
HOBGOBLIN_BEASTMASTER = GetFirstID('Hobgoblin_Beastmaster'),
HOBGOBLIN_BLACK_MAGE = GetFirstID('Hobgoblin_Black_Mage'),
HOBGOBLIN_DARK_KNIGHT = GetFirstID('Hobgoblin_Dark_Knight'),
HOBGOBLIN_RANGER = GetFirstID('Hobgoblin_Ranger'),
HOBGOBLIN_RED_MAGE = GetFirstID('Hobgoblin_Red_Mage'),
HOBGOBLIN_THIEF = GetFirstID('Hobgoblin_Thief'),
HOBGOBLIN_WARRIOR = GetFirstID('Hobgoblin_Warrior'),
HOBGOBLIN_WHITE_MAGE = GetFirstID('Hobgoblin_White_Mage'),
HUMBABA = GetFirstID('Humbaba'),
KIRATA = GetFirstID('Kirata'),
NUE = GetFirstID('Nue'),

VOIDWALKER =
{
Expand Down Expand Up @@ -89,8 +105,9 @@ zones[xi.zone.BEAUCEDINE_GLACIER] =

npc =
{
MIRROR_POND_J8 = GetFirstID('Mirror_Pond_1'),
OVERSEER_BASE = GetFirstID('Parledaire_RK'),
BEASTMENS_BANNER = GetFirstID('Beastmens_Banner'),
MIRROR_POND_J8 = GetFirstID('Mirror_Pond_1'),
OVERSEER_BASE = GetFirstID('Parledaire_RK'),
},
}

Expand Down
26 changes: 23 additions & 3 deletions scripts/zones/Buburimu_Peninsula/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ zones[xi.zone.BUBURIMU_PENINSULA] =
LOGIN_NUMBER = 7042, -- In celebration of your most recent login (login no. <number>), we have provided you with <number> points! You currently have a total of <number> points.
MEMBERS_LEVELS_ARE_RESTRICTED = 7062, -- Your party is unable to participate because certain members' levels are restricted.
CONQUEST_BASE = 7107, -- Tallying conquest results...
REGION_POINTS_SANDORIA = 7172, -- San d'Oria's region points have increased!
EXP_FORCE_KILL_SANDORIA = 7175, -- San d'Orian E.F. defeats beastmen hordes... Maintain current momentum.
BEASTMEN_BANNER_CURSE = 7186, -- There was a curse on the beastmen's banner!
BEASTMEN_BANNER_LIFTED = 7187, -- The curse of the beastmen's banner has been lifted!
BEASTMEN_BANNER = 7188, -- There is a beastmen's banner.
FIVEOFSPADES_DIALOG = 7266, -- GiMme★fIvE! FiVe is★A cArdIan★OF WiN-DuRst! FIvE★iS On★pA-tRol!
FISHING_MESSAGE_OFFSET = 7272, -- You can't fish here.
Expand Down Expand Up @@ -61,12 +65,28 @@ zones[xi.zone.BUBURIMU_PENINSULA] =
},
mob =
{
BACKOO = GetFirstID('Backoo'),
BUBURIMBOO = GetFirstID('Buburimboo'),
HELLDIVER = GetFirstID('Helldiver'),
BACKOO = GetFirstID('Backoo'),
BUBURIMBOO = GetFirstID('Buburimboo'),
HELLDIVER = GetFirstID('Helldiver'),
HOBGOBLIN_BEASTMASTER = GetFirstID('Hobgoblin_Beastmaster'),
HOBGOBLIN_BLACK_MAGE = GetFirstID('Hobgoblin_Black_Mage'),
HOBGOBLIN_DARK_KNIGHT = GetFirstID('Hobgoblin_Dark_Knight'),
HOBGOBLIN_RANGER = GetFirstID('Hobgoblin_Ranger'),
HOBGOBLIN_RED_MAGE = GetFirstID('Hobgoblin_Red_Mage'),
HOBGOBLIN_THIEF = GetFirstID('Hobgoblin_Thief'),
HOBGOBLIN_WARRIOR = GetFirstID('Hobgoblin_Warrior'),
HOBGOBLIN_WHITE_MAGE = GetFirstID('Hobgoblin_White_Mage'),
THEOYAGUDO_BARD = GetFirstID('Theoyagudo_Bard'),
THEOYAGUDO_BLACK_MAGE = GetFirstID('Theoyagudo_Black_Mage'),
THEOYAGUDO_MONK = GetFirstID('Theoyagudo_Monk'),
THEOYAGUDO_NINJA = GetFirstID('Theoyagudo_Ninja'),
THEOYAGUDO_SAMURAI = GetFirstID('Theoyagudo_Samurai'),
THEOYAGUDO_SUMMONER = GetFirstID('Theoyagudo_Summoner'),
THEOYAGUDO_WHITE_MAGE = GetFirstID('Theoyagudo_White_Mage'),
},
npc =
{
BEASTMENS_BANNER = GetFirstID('Beastmens_Banner'),
BRIGAND_CHART_HUME = GetFirstID('Brigand_Chart_Hume'),
BRIGAND_CHART_QM = GetFirstID('qm1'),
JADE_ETUI_TABLE = GetTableOfIDs('Jade_Etui'),
Expand Down
19 changes: 16 additions & 3 deletions scripts/zones/Cape_Teriggan/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ zones[xi.zone.CAPE_TERIGGAN] =
LOGIN_NUMBER = 7007, -- In celebration of your most recent login (login no. <number>), we have provided you with <number> points! You currently have a total of <number> points.
MEMBERS_LEVELS_ARE_RESTRICTED = 7027, -- Your party is unable to participate because certain members' levels are restricted.
CONQUEST_BASE = 7072, -- Tallying conquest results...
REGION_POINTS_SANDORIA = 7137, -- San d'Oria's region points have increased!
EXP_FORCE_KILL_SANDORIA = 7140, -- San d'Orian E.F. defeats beastmen hordes... Maintain current momentum.
BEASTMEN_BANNER_CURSE = 7151, -- There was a curse on the beastmen's banner!
BEASTMEN_BANNER_LIFTED = 7152, -- The curse of the beastmen's banner has been lifted!
BEASTMEN_BANNER = 7153, -- There is a beastmen's banner.
CONQUEST = 7240, -- You've earned conquest points!
FISHING_MESSAGE_OFFSET = 7573, -- You can't fish here.
Expand All @@ -46,17 +50,26 @@ zones[xi.zone.CAPE_TERIGGAN] =
},
mob =
{
AXESARION_THE_WANDERER = GetFirstID('Axesarion_the_Wanderer'),
FROSTMANE = GetFirstID('Frostmane'),
HOBGOBLIN_BEASTMASTER = GetFirstID('Hobgoblin_Beastmaster'),
HOBGOBLIN_BLACK_MAGE = GetFirstID('Hobgoblin_Black_Mage'),
HOBGOBLIN_DARK_KNIGHT = GetFirstID('Hobgoblin_Dark_Knight'),
HOBGOBLIN_RANGER = GetFirstID('Hobgoblin_Ranger'),
HOBGOBLIN_RED_MAGE = GetFirstID('Hobgoblin_Red_Mage'),
HOBGOBLIN_THIEF = GetFirstID('Hobgoblin_Thief'),
HOBGOBLIN_WARRIOR = GetFirstID('Hobgoblin_Warrior'),
HOBGOBLIN_WHITE_MAGE = GetFirstID('Hobgoblin_White_Mage'),
KILLER_JONNY = GetFirstID('Killer_Jonny'),
KREUTZET = GetFirstID('Kreutzet'),
AXESARION_THE_WANDERER = GetFirstID('Axesarion_the_Wanderer'),
STOLAS = GetFirstID('Stolas'),
ZMEY_GORYNYCH = GetFirstID('Zmey_Gorynych')
ZMEY_GORYNYCH = GetFirstID('Zmey_Gorynych'),
},
npc =
{
OVERSEER_BASE = GetFirstID('Salimardi_RK'),
BEASTMENS_BANNER = GetFirstID('Beastmens_Banner'),
CERMET_HEADSTONE = 17240498,
OVERSEER_BASE = GetFirstID('Salimardi_RK'),
},
}

Expand Down
33 changes: 25 additions & 8 deletions scripts/zones/Eastern_Altepa_Desert/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ zones[xi.zone.EASTERN_ALTEPA_DESERT] =
LOGIN_NUMBER = 7007, -- In celebration of your most recent login (login no. <number>), we have provided you with <number> points! You currently have a total of <number> points.
MEMBERS_LEVELS_ARE_RESTRICTED = 7027, -- Your party is unable to participate because certain members' levels are restricted.
CONQUEST_BASE = 7072, -- Tallying conquest results...
REGION_POINTS_SANDORIA = 7137, -- San d'Oria's region points have increased!
EXP_FORCE_KILL_SANDORIA = 7140, -- San d'Orian E.F. defeats beastmen hordes... Maintain current momentum.
BEASTMEN_BANNER_CURSE = 7151, -- There was a curse on the beastmen's banner!
BEASTMEN_BANNER_LIFTED = 7152, -- The curse of the beastmen's banner has been lifted!
BEASTMEN_BANNER = 7153, -- There is a beastmen's banner.
CONQUEST = 7240, -- You've earned conquest points!
FISHING_MESSAGE_OFFSET = 7573, -- You can't fish here.
Expand All @@ -42,17 +46,30 @@ zones[xi.zone.EASTERN_ALTEPA_DESERT] =
},
mob =
{
DUNE_WIDOW = GetFirstID('Dune_Widow'),
DONNERGUGI = GetFirstID('Donnergugi'),
CENTURIO_XII_I = GetFirstID('Centurio_XII-I'),
NANDI = GetFirstID('Nandi'),
DECURIO_I_III = GetFirstID('Decurio_I-III'),
TSUCHIGUMO_OFFSET = GetFirstID('Tsuchigumo'),
CACTROT_RAPIDO = GetFirstID('Cactrot_Rapido'),
CACTROT_RAPIDO = GetFirstID('Cactrot_Rapido'),
CENTURIO_XII_I = GetFirstID('Centurio_XII-I'),
CONTANTICAN_BLACK_MAGE = GetFirstID('Contantican_Black_Mage'),
CONTANTICAN_PALADIN = GetFirstID('Contantican_Paladin'),
CONTANTICAN_RANGER = GetFirstID('Contantican_Ranger'),
CONTANTICAN_WARRIOR = GetFirstID('Contantican_Warrior'),
DECURIO_I_III = GetFirstID('Decurio_I-III'),
DONNERGUGI = GetFirstID('Donnergugi'),
DUNE_WIDOW = GetFirstID('Dune_Widow'),
HOBGOBLIN_BEASTMASTER = GetFirstID('Hobgoblin_Beastmaster'),
HOBGOBLIN_BLACK_MAGE = GetFirstID('Hobgoblin_Black_Mage'),
HOBGOBLIN_DARK_KNIGHT = GetFirstID('Hobgoblin_Dark_Knight'),
HOBGOBLIN_RANGER = GetFirstID('Hobgoblin_Ranger'),
HOBGOBLIN_RED_MAGE = GetFirstID('Hobgoblin_Red_Mage'),
HOBGOBLIN_THIEF = GetFirstID('Hobgoblin_Thief'),
HOBGOBLIN_WARRIOR = GetFirstID('Hobgoblin_Warrior'),
HOBGOBLIN_WHITE_MAGE = GetFirstID('Hobgoblin_White_Mage'),

@Xaver-DaRed Xaver-DaRed Jul 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, applied to the whole PR: mobs and npcs should be in alphabetical order. Easier to read or find a concrete mob

@Nobutadas Nobutadas Jul 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed. And updated alphabetical order for those files except for HARVESTING and LOGGING which in their own space below and OPTION_ONE, OPTION_TWO, OPTION_THREE.

NANDI = GetFirstID('Nandi'),
TSUCHIGUMO_OFFSET = GetFirstID('Tsuchigumo'),
},
npc =
{
OVERSEER_BASE = GetFirstID('Eaulevisat_RK'),
BEASTMENS_BANNER = GetFirstID('Beastmens_Banner'),
OVERSEER_BASE = GetFirstID('Eaulevisat_RK'),
},
}

Expand Down
44 changes: 32 additions & 12 deletions scripts/zones/Jugner_Forest/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ zones[xi.zone.JUGNER_FOREST] =
LOGIN_NUMBER = 7029, -- In celebration of your most recent login (login no. <number>), we have provided you with <number> points! You currently have a total of <number> points.
MEMBERS_LEVELS_ARE_RESTRICTED = 7049, -- Your party is unable to participate because certain members' levels are restricted.
CONQUEST_BASE = 7094, -- Tallying conquest results...
REGION_POINTS_SANDORIA = 7159, -- San d'Oria's region points have increased!
EXP_FORCE_KILL_SANDORIA = 7162, -- San d'Orian E.F. defeats beastmen hordes... Maintain current momentum.
BEASTMEN_BANNER_CURSE = 7173, -- There was a curse on the beastmen's banner!
BEASTMEN_BANNER_LIFTED = 7174, -- The curse of the beastmen's banner has been lifted!
BEASTMEN_BANNER = 7175, -- There is a beastmen's banner.
FISHING_MESSAGE_OFFSET = 7727, -- You can't fish here.
DIG_THROW_AWAY = 7740, -- You dig up <item>, but your inventory is full. You regretfully throw the <item> away.
Expand Down Expand Up @@ -59,14 +63,29 @@ zones[xi.zone.JUGNER_FOREST] =

mob =
{
CERNUNNOS = GetFirstID('Cernunnos'),
FRAELISSA = GetFirstID('Fraelissa'),
FRADUBIO = GetFirstID('Fradubio'),
GIOLLEMITTE = GetFirstID('Giollemitte_B_Feroun'),
KING_ARTHRO = GetFirstID('King_Arthro'),
METEORMAULER = GetFirstID('Meteormauler_Zhagtegg'),
PANZER_PERCIVAL = GetTableOfIDs('Panzer_Percival'), -- 2 NMs
SUPPLESPINE_MUJWUJ = GetFirstID('Supplespine_Mujwuj'),
CERNUNNOS = GetFirstID('Cernunnos'),
FRADUBIO = GetFirstID('Fradubio'),
FRAELISSA = GetFirstID('Fraelissa'),
GIOLLEMITTE = GetFirstID('Giollemitte_B_Feroun'),
HALFORC_BLACK_MAGE = GetFirstID('Halforc_Black_Mage'),
HALFORC_DARK_KNIGHT = GetFirstID('Halforc_Dark_Knight'),
HALFORC_DRAGOON = GetFirstID('Halforc_Dragoon'),
HALFORC_MONK = GetFirstID('Halforc_Monk'),
HALFORC_PALADIN = GetFirstID('Halforc_Paladin'),
HALFORC_RANGER = GetFirstID('Halforc_Ranger'),
HALFORC_WARRIOR = GetFirstID('Halforc_Warrior'),
HOBGOBLIN_BEASTMASTER = GetFirstID('Hobgoblin_Beastmaster'),
HOBGOBLIN_BLACK_MAGE = GetFirstID('Hobgoblin_Black_Mage'),
HOBGOBLIN_DARK_KNIGHT = GetFirstID('Hobgoblin_Dark_Knight'),
HOBGOBLIN_RANGER = GetFirstID('Hobgoblin_Ranger'),
HOBGOBLIN_RED_MAGE = GetFirstID('Hobgoblin_Red_Mage'),
HOBGOBLIN_THIEF = GetFirstID('Hobgoblin_Thief'),
HOBGOBLIN_WARRIOR = GetFirstID('Hobgoblin_Warrior'),
HOBGOBLIN_WHITE_MAGE = GetFirstID('Hobgoblin_White_Mage'),
KING_ARTHRO = GetFirstID('King_Arthro'),
METEORMAULER = GetFirstID('Meteormauler_Zhagtegg'),
PANZER_PERCIVAL = GetTableOfIDs('Panzer_Percival'), -- 2 NMs
SUPPLESPINE_MUJWUJ = GetFirstID('Supplespine_Mujwuj'),

VOIDWALKER =
{
Expand Down Expand Up @@ -103,10 +122,11 @@ zones[xi.zone.JUGNER_FOREST] =

npc =
{
OVERSEER_BASE = GetFirstID('Chaplion_RK'),
LOGGING = GetTableOfIDs('Logging_Point'),
SIGNPOST = GetTableOfIDs('Signpost'),
TIMELYVISITQM = GetFirstID('qm1'),
BEASTMENS_BANNER = GetFirstID('Beastmens_Banner'),
LOGGING = GetTableOfIDs('Logging_Point'),
OVERSEER_BASE = GetFirstID('Chaplion_RK'),
SIGNPOST = GetTableOfIDs('Signpost'),
TIMELYVISITQM = GetFirstID('qm1'),
},
}

Expand Down
26 changes: 23 additions & 3 deletions scripts/zones/Meriphataud_Mountains/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ zones[xi.zone.MERIPHATAUD_MOUNTAINS] =
LOGIN_NUMBER = 7029, -- In celebration of your most recent login (login no. <number>), we have provided you with <number> points! You currently have a total of <number> points.
MEMBERS_LEVELS_ARE_RESTRICTED = 7049, -- Your party is unable to participate because certain members' levels are restricted.
CONQUEST_BASE = 7094, -- Tallying conquest results...
REGION_POINTS_SANDORIA = 7159, -- San d'Oria's region points have increased!
EXP_FORCE_KILL_SANDORIA = 7162, -- San d'Orian E.F. defeats beastmen hordes... Maintain current momentum.
BEASTMEN_BANNER_CURSE = 7173, -- There was a curse on the beastmen's banner!
BEASTMEN_BANNER_LIFTED = 7174, -- The curse of the beastmen's banner has been lifted!
BEASTMEN_BANNER = 7175, -- There is a beastmen's banner.
FISHING_MESSAGE_OFFSET = 7253, -- You can't fish here.
DIG_THROW_AWAY = 7266, -- You dig up <item>, but your inventory is full. You regretfully throw the <item> away.
Expand Down Expand Up @@ -52,11 +56,26 @@ zones[xi.zone.MERIPHATAUD_MOUNTAINS] =

mob =
{
COO_KEJA_THE_UNSEEN = GetFirstID('Coo_Keja_the_Unseen'),
DAGGERCLAW_DRACOS = GetFirstID('Daggerclaw_Dracos'),
HOBGOBLIN_BEASTMASTER = GetFirstID('Hobgoblin_Beastmaster'),
HOBGOBLIN_BLACK_MAGE = GetFirstID('Hobgoblin_Black_Mage'),
HOBGOBLIN_DARK_KNIGHT = GetFirstID('Hobgoblin_Dark_Knight'),
HOBGOBLIN_RANGER = GetFirstID('Hobgoblin_Ranger'),
HOBGOBLIN_RED_MAGE = GetFirstID('Hobgoblin_Red_Mage'),
HOBGOBLIN_THIEF = GetFirstID('Hobgoblin_Thief'),
HOBGOBLIN_WARRIOR = GetFirstID('Hobgoblin_Warrior'),
HOBGOBLIN_WHITE_MAGE = GetFirstID('Hobgoblin_White_Mage'),
NAA_ZEKU_THE_UNWAITING = GetFirstID('Naa_Zeku_the_Unwaiting'),
PATRIPATAN = GetFirstID('Patripatan'),
DAGGERCLAW_DRACOS = GetFirstID('Daggerclaw_Dracos'),
THEOYAGUDO_BARD = GetFirstID('Theoyagudo_Bard'),
THEOYAGUDO_BLACK_MAGE = GetFirstID('Theoyagudo_Black_Mage'),
THEOYAGUDO_MONK = GetFirstID('Theoyagudo_Monk'),
THEOYAGUDO_NINJA = GetFirstID('Theoyagudo_Ninja'),
THEOYAGUDO_SAMURAI = GetFirstID('Theoyagudo_Samurai'),
THEOYAGUDO_SUMMONER = GetFirstID('Theoyagudo_Summoner'),
THEOYAGUDO_WHITE_MAGE = GetFirstID('Theoyagudo_White_Mage'),
WARAXE_BEAK = GetFirstID('Waraxe_Beak'),
COO_KEJA_THE_UNSEEN = GetFirstID('Coo_Keja_the_Unseen'),

VOIDWALKER =
{
Expand Down Expand Up @@ -92,7 +111,8 @@ zones[xi.zone.MERIPHATAUD_MOUNTAINS] =

npc =
{
OVERSEER_BASE = GetFirstID('Chegourt_RK'),
BEASTMENS_BANNER = GetFirstID('Beastmens_Banner'),
OVERSEER_BASE = GetFirstID('Chegourt_RK'),
},
}

Expand Down
Loading
Loading