Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 32 additions & 84 deletions lua/wikis/ageofempires/Faction/Data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -433,6 +432,7 @@ local factionPropsAoE2 = {
name = 'Wu',
faction = 'wu',
},

unknown = {
index = 61,
name = 'Unknown',
Expand Down Expand Up @@ -563,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',
},
Expand Down Expand Up @@ -703,168 +698,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',
},
Expand Down Expand Up @@ -955,6 +909,9 @@ return {
egy = 'egyptians',
gre = 'greeks',
hit = 'hittites',
lac = 'lacviet',
lv = 'lacviet',
['lac viet'] = 'lacviet',
mac = 'macedonians',
min = 'minoans',
pal = 'palmyrans',
Expand All @@ -964,9 +921,6 @@ return {
sha = 'shang',
sum = 'sumerians',
yam = 'yamato',
lac = 'lacviet',
lv = 'lacviet',
['lac viet'] = 'lacviet',
},
aoe2 = {
ach = 'achaemenids',
Expand Down Expand Up @@ -1056,7 +1010,6 @@ return {
ott = 'ottomans',
por = 'portuguese',
rus = 'russians',
ran = 'random',
spa = 'spanish',
swe = 'swedes',
usa = 'unitedstates',
Expand Down Expand Up @@ -1095,34 +1048,29 @@ 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',
hui = 'huitzilopochtli',
isi = 'isis',
jap = 'japanese',
kro = 'kronos',
lok = 'loki',
nor = 'norse',
['nu wa'] = 'nuwa',
nuw = 'nuwa',
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',
Expand Down
30 changes: 3 additions & 27 deletions lua/wikis/ageofempires/Faction/IconData.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -399,39 +396,18 @@ 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',
},
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',
},
Expand Down
Loading