From ce4c4a5ecf4e7391ad3fa9bcc9fca82e5aaf958f Mon Sep 17 00:00:00 2001 From: Libavi Date: Tue, 12 May 2026 22:12:33 +0200 Subject: [PATCH 1/7] Removed aom civs from Data.lua In AoM, the civs are no factions, gods are. The civs are comparable to AoE2 architecture sets or aoe4 classical civilizations. --- lua/wikis/ageofempires/Faction/Data.lua | 94 +++++++------------------ 1 file changed, 24 insertions(+), 70 deletions(-) diff --git a/lua/wikis/ageofempires/Faction/Data.lua b/lua/wikis/ageofempires/Faction/Data.lua index ef2779ce233..dffd0cc3a35 100644 --- a/lua/wikis/ageofempires/Faction/Data.lua +++ b/lua/wikis/ageofempires/Faction/Data.lua @@ -703,168 +703,127 @@ local factionPropsAoE4 = { } local factionPropsAoM = { - atlanteans = { - index = 1, - name = 'Atlanteans', - faction = 'atlanteans', - }, - aztecs = { - index = 2, - name = 'Aztecs', - pageName = 'Aztecs' .. AOM_SUFFIX, - faction = 'aztecs', - }, - chinese = { - index = 3, - name = 'Chinese', - pageName = 'Chinese' .. AOM_SUFFIX, - faction = 'chinese', - }, - egyptians = { - index = 4, - name = 'Egyptians', - pageName = 'Egyptians' .. AOM_SUFFIX, - faction = 'egyptians', - }, - greeks = { - index = 5, - name = 'Greeks', - pageName = 'Greeks' .. AOM_SUFFIX, - faction = 'greeks', - }, - japanese = { - index = 6, - name = 'Japanese', - pageName = 'Japanese' .. AOM_SUFFIX, - faction = 'japanese', - }, - norse = { - index = 7, - name = 'Norse', - pageName = 'Norse' .. AOM_SUFFIX, - faction = 'norse', - }, amaterasu = { - index = 8, + index = 1, name = 'Amaterasu', faction = 'amaterasu', }, demeter = { - index = 9, + index = 2, name = 'Demeter', faction = 'demeter', }, freyr = { - index = 10, + index = 3, name = 'Freyr', faction = 'freyr', }, fuxi = { - index = 11, + index = 4, name = 'Fuxi', faction = 'fuxi', }, gaia = { - index = 12, + index = 5, name = 'Gaia', pageName = 'Gaia', faction = 'gaia', }, hades = { - index = 13, + index = 6, name = 'Hades', faction = 'hades', }, huitzilopochtli = { - index = 14, + index = 7, name = 'Huitzilopochtli', faction = 'huitzilopochtli', }, isis = { - index = 15, + index = 8, name = 'Isis', faction = 'isis', }, kronos = { - index = 16, + index = 9, name = 'Kronos', faction = 'kronos', }, loki = { - index = 17, + index = 10, name = 'Loki', faction = 'loki', }, nuwa = { - index = 18, + index = 11, name = 'Nüwa', faction = 'nuwa', }, odin = { - index = 19, + index = 12, name = 'Odin', faction = 'odin', }, oranos = { - index = 20, + index = 13, name = 'Oranos', faction = 'oranos', }, poseidon = { - index = 21, + index = 14, name = 'Poseidon', pageName = 'Poseidon (god)', faction = 'poseidon', }, quetzalcoatl = { - index = 22, + index = 15, name = 'Quetzalcoatl', faction = 'quetzalcoatl', }, ra = { - index = 23, + index = 16, name = 'Ra', pageName = 'Ra (god)', faction = 'ra', }, set = { - index = 24, + index = 17, name = 'Set', faction = 'set', }, shennong = { - index = 25, + index = 18, name = 'Shennong', faction = 'shennong', }, susanoo = { - index = 26, + index = 19, name = 'Susanoo', faction = 'susanoo', }, tezcatlipoca = { - index = 27, + index = 20, name = 'Tezcatlipoca', faction = 'tezcatlipoca', }, thor = { - index = 28, + index = 21, name = 'Thor', faction = 'thor', }, tsukuyomi = { - index = 29, + index = 22, name = 'Tsukuyomi', faction = 'tsukuyomi', }, zeus = { - index = 30, + index = 23, name = 'Zeus', faction = 'zeus', }, unknown = { - index = 31, + index = 24, name = 'Unknown', faction = 'unknown', }, @@ -1095,21 +1054,16 @@ return { }, aom = { ama = 'amaterasu', - atl = 'atlanteans', - chi = 'chinese', dem = 'demeter', egy = 'egyptians', fre = 'freyr', fux = 'fuxi', ['fu xi'] = 'fuxi', gai = 'gaia', - gre = 'greeks', had = 'hades', isi = 'isis', - jap = 'japanese', kro = 'kronos', lok = 'loki', - nor = 'norse', ['nu wa'] = 'nuwa', nuw = 'nuwa', odi = 'odin', From bca16fa1025e2db48f036930796c8385acb08d25 Mon Sep 17 00:00:00 2001 From: Libavi Date: Tue, 12 May 2026 22:13:07 +0200 Subject: [PATCH 2/7] Removed unused AOM_SUFFIX from Data.lua. --- lua/wikis/ageofempires/Faction/Data.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/wikis/ageofempires/Faction/Data.lua b/lua/wikis/ageofempires/Faction/Data.lua index dffd0cc3a35..ca51f6c8d1d 100644 --- a/lua/wikis/ageofempires/Faction/Data.lua +++ b/lua/wikis/ageofempires/Faction/Data.lua @@ -13,7 +13,6 @@ local AOE1_SUFFIX = '/Age of Empires I' local AOE2_SUFFIX = '/Age of Empires II' local AOE3_SUFFIX = '/Age of Empires III' local AOE4_SUFFIX = '/Age of Empires IV' -local AOM_SUFFIX = '/Age of Mythology' local AOEO_SUFFIX = '/Age of Empires Online' local factionPropsAoE1 = { From 19707d832eadf20135e19a3464476cfd434e31c3 Mon Sep 17 00:00:00 2001 From: Libavi Date: Tue, 12 May 2026 22:15:38 +0200 Subject: [PATCH 3/7] Removed aom civs from IconData.lua. --- lua/wikis/ageofempires/Faction/IconData.lua | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/lua/wikis/ageofempires/Faction/IconData.lua b/lua/wikis/ageofempires/Faction/IconData.lua index 8ffc111a483..b87064a8269 100644 --- a/lua/wikis/ageofempires/Faction/IconData.lua +++ b/lua/wikis/ageofempires/Faction/IconData.lua @@ -399,27 +399,6 @@ local byFactionAoE4 = { } local byFactionAoM = { - atlanteans = { - icon = 'File:Atlantean AoM R icon.png', - }, - aztecs = { - icon = 'File:Aztecs AoM R icon.png', - }, - chinese = { - icon = 'File:Chinese AoM R icon.png', - }, - egyptians = { - icon = 'File:Egyptian AoM R icon.png', - }, - greeks = { - icon = 'File:Greek AoM R icon.png', - }, - japanese = { - icon = 'File:Japanese AoM R icon.png', - }, - norse = { - icon = 'File:Norse AoM R icon.png', - }, amaterasu = { icon = 'File:Amaterasu AoM R icon.png', }, From c065146d042f463bc1fa19f5d3259b9f619f125a Mon Sep 17 00:00:00 2001 From: Libavi Date: Tue, 12 May 2026 22:16:36 +0200 Subject: [PATCH 4/7] Fixed alphabetical order of aom factions in IconData.lua. --- lua/wikis/ageofempires/Faction/IconData.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/wikis/ageofempires/Faction/IconData.lua b/lua/wikis/ageofempires/Faction/IconData.lua index b87064a8269..53e1ad42364 100644 --- a/lua/wikis/ageofempires/Faction/IconData.lua +++ b/lua/wikis/ageofempires/Faction/IconData.lua @@ -405,12 +405,12 @@ local byFactionAoM = { demeter = { icon = 'File:Demeter AoM R icon.png', }, - fuxi = { - icon = 'File:Fuxi AoM R icon.png', - }, freyr = { icon = 'File:Freyr AoM R icon.png', }, + fuxi = { + icon = 'File:Fuxi AoM R icon.png', + }, gaia = { icon = 'File:Gaia AoM R icon.png', }, From ce115290cd3a2ebee88c3e0af40c7e440c760753 Mon Sep 17 00:00:00 2001 From: Libavi Date: Tue, 12 May 2026 22:21:52 +0200 Subject: [PATCH 5/7] Fixed alphabetical order in aoe faction aliases in Data.lua. --- lua/wikis/ageofempires/Faction/Data.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/wikis/ageofempires/Faction/Data.lua b/lua/wikis/ageofempires/Faction/Data.lua index ca51f6c8d1d..8cd8895a5bd 100644 --- a/lua/wikis/ageofempires/Faction/Data.lua +++ b/lua/wikis/ageofempires/Faction/Data.lua @@ -913,6 +913,9 @@ return { egy = 'egyptians', gre = 'greeks', hit = 'hittites', + lac = 'lacviet', + lv = 'lacviet', + ['lac viet'] = 'lacviet', mac = 'macedonians', min = 'minoans', pal = 'palmyrans', @@ -922,9 +925,6 @@ return { sha = 'shang', sum = 'sumerians', yam = 'yamato', - lac = 'lacviet', - lv = 'lacviet', - ['lac viet'] = 'lacviet', }, aoe2 = { ach = 'achaemenids', @@ -1060,6 +1060,7 @@ return { ['fu xi'] = 'fuxi', gai = 'gaia', had = 'hades', + hui = 'huitzilopochtli', isi = 'isis', kro = 'kronos', lok = 'loki', @@ -1068,14 +1069,13 @@ return { odi = 'odin', ora = 'oranos', pos = 'poseidon', + que = 'quetzalcoatl', she = 'shennong', sus = 'susanoo', + tez = 'tezcatlipoca', tho = 'thor', tsu = 'tsukuyomi', zeu = 'zeus', - que = 'quetzalcoatl', - hui = 'huitzilopochtli', - tez = 'tezcatlipoca', }, aoeo = { bab = 'babylonians', From 608ec791b154e07b6220ff2d9b69b7082ce35732 Mon Sep 17 00:00:00 2001 From: Libavi Date: Tue, 12 May 2026 22:41:43 +0200 Subject: [PATCH 6/7] Removed aoe3 faction random. --- lua/wikis/ageofempires/Faction/Data.lua | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lua/wikis/ageofempires/Faction/Data.lua b/lua/wikis/ageofempires/Faction/Data.lua index 8cd8895a5bd..b1c98da24b4 100644 --- a/lua/wikis/ageofempires/Faction/Data.lua +++ b/lua/wikis/ageofempires/Faction/Data.lua @@ -432,6 +432,7 @@ local factionPropsAoE2 = { name = 'Wu', faction = 'wu', }, + unknown = { index = 61, name = 'Unknown', @@ -562,14 +563,9 @@ local factionPropsAoE3 = { name = 'United States', faction = 'unitedstates', }, - random = { - index = 23, - name = 'Random', - faction = 'random', - }, unknown = { - index = 24, + index = 23, name = 'Unknown', faction = 'unknown', }, @@ -1014,7 +1010,6 @@ return { ott = 'ottomans', por = 'portuguese', rus = 'russians', - ran = 'random', spa = 'spanish', swe = 'swedes', usa = 'unitedstates', From 4b3d5ed90998cefe05dcf6b70413a70c52bb65a1 Mon Sep 17 00:00:00 2001 From: Libavi Date: Tue, 12 May 2026 22:42:43 +0200 Subject: [PATCH 7/7] Removed aoe3 faction random from IconData.lua. --- lua/wikis/ageofempires/Faction/IconData.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/lua/wikis/ageofempires/Faction/IconData.lua b/lua/wikis/ageofempires/Faction/IconData.lua index 53e1ad42364..f3e671d6dc5 100644 --- a/lua/wikis/ageofempires/Faction/IconData.lua +++ b/lua/wikis/ageofempires/Faction/IconData.lua @@ -316,9 +316,6 @@ local byFactionAoE3 = { unitedstates = { icon = 'File:United States AoE3 icon.png', }, - random = { - icon = 'File:Random AoE3 icon.png', - }, unknown = { icon = 'File:Char head filler.png',