diff --git a/pokedex/data/csv/conquest_warrior_names.csv b/pokedex/data/csv/conquest_warrior_names.csv
new file mode 100644
index 0000000..aeea20d
--- /dev/null
+++ b/pokedex/data/csv/conquest_warrior_names.csv
@@ -0,0 +1,202 @@
+warrior_id,local_language_id,name
+1,9,Player (male)
+2,9,Player (female)
+3,9,Nobunaga
+4,9,Oichi
+5,9,Hideyoshi
+6,9,Motochika
+7,9,Ginchiyo
+8,9,Motonari
+9,9,Mitsuhide
+10,9,Yoshihiro
+11,9,Nene
+12,9,Shingen
+13,9,Masamune
+14,9,Kenshin
+15,9,Yoshimoto
+16,9,Ujiyasu
+17,9,Nō
+18,9,Kotarō
+19,9,Ieyasu
+20,9,Hanbei
+21,9,Kanbei
+22,9,Muneshige
+23,9,Gracia
+24,9,Hanzō
+25,9,Kunoichi
+26,9,Yukimura
+27,9,Magoichi
+28,9,Kanetsugu
+29,9,Aya
+30,9,Kai
+31,9,Okuni
+32,9,Ranmaru
+33,9,Tadakatsu
+34,9,Ina
+35,9,Keiji
+36,9,Mitsunari
+37,9,Kiyomasa
+38,9,Masanori
+39,9,Tsunehisa
+40,9,Naoie
+41,9,Harutaka
+42,9,Takanobu
+43,9,Naoshige
+44,9,Ujisato
+45,9,Chacha
+46,9,Gō
+47,9,Hatsu
+48,9,Kazumasu
+49,9,Nagahide
+50,9,Yoshitaka
+51,9,Urakusai
+52,9,Narimasa
+53,9,Tomonori
+54,9,Murashige
+55,9,Masahide
+56,9,Nagayoshi
+57,9,Kitsuno
+58,9,Gotoku
+59,9,Hidenaga
+60,9,Koroku
+61,9,Takatora
+62,9,Yoshitsugu
+63,9,Yukinaga
+64,9,Rikyū
+65,9,Hideyori
+66,9,Asahi
+67,9,Kazutoyo
+68,9,Nagayasu
+69,9,Harunaga
+70,9,Hideaki
+71,9,Naka
+72,9,Tatsuko
+73,9,Maa
+74,9,Chiyo
+75,9,Hatsume
+76,9,Nobuchika
+77,9,Chikayasu
+78,9,Morichika
+79,9,Chikamasa
+80,9,Norishige
+81,9,Takayori
+82,9,Tadasumi
+83,9,Dōsetsu
+84,9,Shōun
+85,9,Sōrin
+86,9,Sekisō
+87,9,Akizane
+88,9,Takatane
+89,9,Kiyo
+90,9,Motoharu
+91,9,Takakage
+92,9,Terumoto
+93,9,Takeyoshi
+94,9,Ekei
+95,9,Takamoto
+96,9,Sadatoshi
+97,9,Hidemitsu
+98,9,Toshimitsu
+99,9,Shigemoto
+100,9,Mitsutada
+101,9,Yukimasa
+102,9,Tadaoki
+103,9,Fujitaka
+104,9,Hiroko
+105,9,Tadamoto
+106,9,Tadatsune
+107,9,Takahisa
+108,9,Hisaaki
+109,9,Masatoshi
+110,9,Kanemori
+111,9,Tokitaka
+112,9,Sandayū
+113,9,Morikiyo
+114,9,Kashinkoji
+115,9,Yasunaga
+116,9,Seikurō
+117,9,Katsuyori
+118,9,Haruyuki
+119,9,Masakage
+120,9,Masatoyo
+121,9,Nobufusa
+122,9,Masayuki
+123,9,Yukitaka
+124,9,Ume
+125,9,Chiyome
+126,9,Kei
+127,9,Kagetsuna
+128,9,Shigezane
+129,9,Tsunamoto
+130,9,Tsunenaga
+131,9,Munetoki
+132,9,Munezane
+133,9,Yoshi
+134,9,Iroha
+135,9,Kagekatsu
+136,9,Yoshikiyo
+137,9,Tomonobu
+138,9,Kageie
+139,9,Takahiro
+140,9,Sadamitsu
+141,9,Yatarō
+142,9,Saneyori
+143,9,Hana
+144,9,Sen
+145,9,Ujichika
+146,9,Ujizane
+147,9,Sessai
+148,9,Masatsuna
+149,9,Yasutomo
+150,9,Ujihiro
+151,9,Motozane
+152,9,Sena
+153,9,Sōun
+154,9,Tsunashige
+155,9,Gen'an
+156,9,Ujimasa
+157,9,Ujiteru
+158,9,Ujikuni
+159,9,Ujinao
+160,9,Shizuka
+161,9,Madoka
+162,9,Dōsan
+163,9,Yoshitatsu
+164,9,Ittetsu
+165,9,Bokuzen
+166,9,Morinari
+167,9,Omi
+168,9,Asa
+169,9,Shimoyama
+170,9,Genba
+171,9,Danzō
+172,9,Yazaemon
+173,9,Isuke
+174,9,Tadatsugu
+175,9,Naomasa
+176,9,Yasumasa
+177,9,Masanobu
+178,9,Hidetada
+179,9,Kazumasa
+180,9,Chōan
+181,9,Tenkai
+182,9,Munenori
+183,9,Kame
+184,9,Toku
+185,9,Saizō
+186,9,Sasuke
+187,9,Katsu
+188,9,Jūzō
+189,9,Tsuru
+190,9,Ise
+191,9,Jinpachi
+192,9,Kamanosuke
+193,9,Seikai
+194,9,Isa
+195,9,Yoshiteru
+196,9,Yoshiaki
+197,9,Hisahide
+198,9,Jūbei
+199,9,Nobutsuna
+200,9,Bokuden
+201,9,Otsū
diff --git a/pokedex/data/csv/conquest_warrior_ranks.csv b/pokedex/data/csv/conquest_warrior_ranks.csv
new file mode 100644
index 0000000..44ddee3
--- /dev/null
+++ b/pokedex/data/csv/conquest_warrior_ranks.csv
@@ -0,0 +1,243 @@
+warrior_id,rank,skill_id,capacity
+1,1,3,4
+1,2,24,6
+1,3,25,8
+2,1,3,4
+2,2,24,6
+2,3,25,8
+3,1,26,5
+3,2,27,8
+4,1,6,4
+4,2,28,5
+5,1,15,6
+5,2,29,7
+5,3,30,8
+6,1,4,6
+6,2,31,7
+7,1,5,5
+7,2,32,6
+8,1,8,7
+8,2,33,8
+9,1,10,5
+9,2,34,6
+10,1,7,6
+10,2,35,7
+11,1,4,5
+11,2,36,6
+12,1,4,7
+12,2,37,8
+13,1,5,7
+13,2,38,8
+14,1,5,7
+14,2,39,8
+15,1,17,5
+15,2,40,6
+16,1,8,7
+16,2,41,8
+17,1,13,5
+17,2,42,6
+18,1,15,5
+18,2,43,6
+19,1,8,8
+19,2,44,8
+20,1,13,5
+20,2,45,6
+21,1,14,5
+21,2,46,6
+22,1,11,6
+22,2,47,7
+23,1,13,5
+23,2,48,5
+24,1,11,5
+24,2,49,6
+25,1,18,5
+25,2,50,5
+26,1,7,6
+26,2,51,7
+27,1,10,6
+27,2,52,7
+28,1,4,7
+28,2,53,7
+29,1,6,5
+29,2,54,5
+30,1,15,5
+30,2,55,6
+31,1,18,3
+31,2,56,4
+32,1,16,4
+32,2,57,5
+33,1,14,6
+33,2,58,6
+34,1,10,5
+34,2,59,6
+35,1,7,6
+35,2,60,7
+36,1,11,5
+36,2,61,5
+37,1,16,5
+37,2,62,6
+38,1,14,5
+38,2,63,6
+39,1,19,7
+40,1,15,6
+41,1,7,6
+42,1,21,7
+43,1,8,7
+44,1,20,7
+45,1,19,2
+46,1,2,4
+47,1,20,4
+48,1,11,6
+49,1,16,5
+50,1,4,6
+51,1,9,2
+52,1,5,5
+53,1,14,6
+54,1,3,6
+55,1,21,5
+56,1,1,5
+57,1,6,2
+58,1,10,2
+59,1,18,5
+60,1,7,4
+61,1,13,6
+62,1,16,6
+63,1,17,6
+64,1,20,5
+65,1,19,3
+66,1,19,3
+67,1,17,5
+68,1,1,5
+69,1,10,2
+70,1,2,3
+71,1,22,4
+72,1,9,2
+73,1,13,3
+74,1,6,4
+75,1,3,3
+76,1,10,5
+77,1,8,6
+78,1,9,5
+79,1,21,4
+80,1,5,4
+81,1,2,5
+82,1,17,3
+83,1,11,7
+84,1,4,7
+85,1,4,6
+86,1,17,6
+87,1,2,4
+88,1,3,5
+89,1,22,3
+90,1,7,7
+91,1,1,7
+92,1,2,5
+93,1,9,5
+94,1,18,2
+95,1,8,6
+96,1,9,5
+97,1,21,5
+98,1,14,5
+99,1,16,3
+100,1,19,3
+101,1,22,3
+102,1,7,6
+103,1,2,6
+104,1,20,5
+105,1,2,5
+106,1,3,5
+107,1,14,7
+108,1,12,5
+109,1,5,4
+110,1,8,3
+111,1,23,4
+112,1,5,3
+113,1,5,3
+114,1,9,3
+115,1,10,5
+116,1,12,3
+117,1,7,6
+118,1,15,5
+119,1,17,6
+120,1,8,5
+121,1,17,5
+122,1,18,7
+123,1,14,6
+124,1,12,3
+125,1,10,4
+126,1,1,5
+127,1,2,6
+128,1,5,5
+129,1,1,4
+130,1,12,3
+131,1,17,5
+132,1,9,5
+133,1,20,4
+134,1,13,4
+135,1,11,6
+136,1,4,6
+137,1,21,5
+138,1,7,5
+139,1,23,5
+140,1,19,5
+141,1,14,4
+142,1,20,4
+143,1,22,5
+144,1,8,4
+145,1,22,7
+146,1,13,1
+147,1,15,6
+148,1,4,5
+149,1,7,6
+150,1,23,3
+151,1,3,4
+152,1,9,2
+153,1,15,7
+154,1,11,7
+155,1,22,5
+156,1,1,7
+157,1,21,7
+158,1,8,6
+159,1,23,4
+160,1,4,4
+161,1,16,3
+162,1,15,8
+163,1,23,5
+164,1,4,5
+165,1,13,6
+166,1,5,4
+167,1,19,5
+168,1,6,3
+169,1,21,3
+170,1,3,3
+171,1,10,3
+172,1,9,3
+173,1,3,3
+174,1,16,6
+175,1,18,6
+176,1,11,6
+177,1,19,3
+178,1,19,5
+179,1,23,5
+180,1,13,2
+181,1,20,2
+182,1,14,3
+183,1,10,4
+184,1,13,4
+185,1,20,4
+186,1,5,4
+187,1,15,4
+188,1,16,4
+189,1,20,4
+190,1,9,4
+191,1,3,4
+192,1,12,4
+193,1,12,4
+194,1,1,4
+195,1,18,6
+196,1,23,3
+197,1,15,6
+198,1,14,5
+199,1,7,5
+200,1,4,4
+201,1,6,3
diff --git a/pokedex/data/csv/conquest_warrior_skill_names.csv b/pokedex/data/csv/conquest_warrior_skill_names.csv
new file mode 100644
index 0000000..5696a03
--- /dev/null
+++ b/pokedex/data/csv/conquest_warrior_skill_names.csv
@@ -0,0 +1,64 @@
+skill_id,local_language_id,name
+1,9,Adrenaline
+2,9,Fortify
+3,9,Top Speed
+4,9,Rally
+5,9,Bustle
+6,9,Sweet Song
+7,9,Mighty Blow
+8,9,Brotherhood
+9,9,Eagle Eye
+10,9,Crack Shot
+11,9,Marksman
+12,9,High Jump
+13,9,Added Bonus
+14,9,Impact
+15,9,Quick Strike
+16,9,Empathy
+17,9,Deep Breath
+18,9,Convalesce
+19,9,Salve
+20,9,Detox
+21,9,Shout
+22,9,Temperate
+23,9,Greed
+24,9,Courage
+25,9,Motivate
+26,9,Desire
+27,9,Ambition
+28,9,Soft Light
+29,9,Grand Dream
+30,9,Great Uniter
+31,9,Rebellion
+32,9,Thunderclap
+33,9,Strategist
+34,9,Cold Eyes
+35,9,Chesto!
+36,9,Nene Ninpō
+37,9,Fūrin Kazan
+38,9,One-Eyed Dragon
+39,9,Inspiration
+40,9,Grace
+41,9,Father Figure
+42,9,Viper's Bite
+43,9,Mayhem
+44,9,Resolution
+45,9,Lazybones
+46,9,Extinguish
+47,9,Typhoon
+48,9,Bewilder
+49,9,Ninjutsu
+50,9,Trickster
+51,9,Willpower
+52,9,Cupid
+53,9,Love & Honor
+54,9,Compassion
+55,9,Warrior Woman
+56,9,Kabuki Dance
+57,9,Faith
+58,9,Unrivaled
+59,9,Elegance
+60,9,Carefree
+61,9,Cunning
+62,9,Belief
+63,9,Sacrifice
diff --git a/pokedex/data/csv/conquest_warrior_skills.csv b/pokedex/data/csv/conquest_warrior_skills.csv
new file mode 100644
index 0000000..bd2bf32
--- /dev/null
+++ b/pokedex/data/csv/conquest_warrior_skills.csv
@@ -0,0 +1,64 @@
+id,identifier
+1,adrenaline
+2,fortify
+3,top-speed
+4,rally
+5,bustle
+6,sweet-song
+7,mighty-blow
+8,brotherhood
+9,eagle-eye
+10,crack-shot
+11,marksman
+12,high-jump
+13,added-bonus
+14,impact
+15,quick-strike
+16,empathy
+17,deep-breath
+18,convalesce
+19,salve
+20,detox
+21,shout
+22,temperate
+23,greed
+24,courage
+25,motivate
+26,desire
+27,ambition
+28,soft-light
+29,grand-dream
+30,great-uniter
+31,rebellion
+32,thunderclap
+33,strategist
+34,cold-eyes
+35,chesto
+36,nene-ninpo
+37,furin-kazan
+38,one-eyed-dragon
+39,inspiration
+40,grace
+41,father-figure
+42,vipers-bite
+43,mayhem
+44,resolution
+45,lazybones
+46,extinguish
+47,typhoon
+48,bewilder
+49,ninjutsu
+50,trickster
+51,willpower
+52,cupid
+53,love-and-honor
+54,compassion
+55,warrior-woman
+56,kabuki-dance
+57,faith
+58,unrivaled
+59,elegance
+60,carefree
+61,cunning
+62,belief
+63,sacrifice
diff --git a/pokedex/data/csv/conquest_warrior_specialties.csv b/pokedex/data/csv/conquest_warrior_specialties.csv
new file mode 100644
index 0000000..8919cee
--- /dev/null
+++ b/pokedex/data/csv/conquest_warrior_specialties.csv
@@ -0,0 +1,298 @@
+warrior_id,type_id,slot
+1,1,1
+2,1,1
+3,13,2
+3,16,1
+4,1,1
+4,16,2
+5,2,2
+5,10,1
+6,11,1
+7,13,1
+8,12,1
+9,3,2
+9,15,1
+10,2,1
+11,3,2
+11,4,1
+12,5,1
+12,6,2
+13,3,1
+14,2,2
+14,14,1
+15,7,1
+15,9,2
+16,6,1
+17,8,1
+17,16,2
+18,17,1
+19,6,2
+19,9,1
+20,10,2
+20,13,1
+21,8,1
+21,10,2
+22,1,2
+22,3,1
+23,14,1
+23,15,2
+24,4,2
+24,8,1
+25,15,2
+25,17,1
+26,3,2
+26,10,1
+27,3,2
+27,12,1
+28,14,1
+29,8,2
+29,15,1
+30,6,2
+30,10,1
+31,7,1
+31,10,2
+32,2,1
+32,9,2
+33,9,1
+33,16,2
+34,9,2
+34,11,1
+35,2,2
+35,6,1
+36,9,1
+36,17,2
+37,5,2
+37,16,1
+38,5,1
+38,17,2
+39,1,1
+40,17,1
+41,1,2
+41,5,1
+42,1,2
+42,2,1
+43,1,1
+44,1,2
+44,12,1
+45,1,1
+46,1,2
+46,11,1
+47,1,1
+48,11,1
+48,16,2
+49,16,1
+50,11,1
+50,16,2
+51,12,1
+51,16,2
+52,16,1
+53,9,1
+53,16,2
+54,12,1
+54,16,2
+55,16,1
+56,2,1
+56,16,2
+57,16,1
+58,16,1
+59,10,1
+60,2,1
+60,10,2
+61,3,1
+61,10,2
+62,10,2
+62,14,1
+63,1,1
+63,10,2
+64,10,2
+64,12,1
+65,10,1
+66,5,1
+66,10,2
+67,10,1
+68,10,1
+69,10,1
+70,7,1
+70,10,2
+71,5,1
+71,10,2
+72,10,1
+73,8,1
+73,10,2
+74,1,1
+75,9,1
+75,10,2
+76,11,1
+77,11,1
+78,11,1
+79,11,1
+80,11,2
+80,13,1
+81,11,2
+81,13,1
+82,11,2
+82,13,1
+83,13,1
+84,13,1
+85,13,2
+85,17,1
+86,13,1
+87,13,1
+88,13,1
+89,13,1
+90,12,2
+90,16,1
+91,12,1
+92,12,1
+93,11,1
+93,12,2
+94,12,1
+95,12,1
+96,12,1
+97,15,1
+98,15,1
+99,15,1
+100,15,1
+101,15,1
+102,14,1
+102,15,2
+103,14,1
+103,15,2
+104,15,1
+105,2,1
+106,2,1
+107,2,1
+108,2,1
+109,2,1
+110,2,1
+111,2,2
+111,10,1
+112,4,1
+113,4,1
+114,4,1
+115,4,1
+116,4,1
+117,5,2
+117,6,1
+118,3,1
+118,5,2
+119,5,2
+119,10,1
+120,5,1
+121,5,1
+122,5,2
+122,10,1
+123,5,2
+123,10,1
+124,5,1
+125,5,2
+125,17,1
+126,5,2
+126,10,1
+127,3,2
+127,16,1
+128,3,2
+128,7,1
+129,3,2
+129,15,1
+130,3,1
+131,3,2
+131,16,1
+132,3,1
+133,3,1
+134,3,1
+135,14,1
+136,14,2
+136,15,1
+137,14,1
+138,6,1
+138,14,2
+139,14,2
+139,17,1
+140,14,1
+141,12,1
+141,14,2
+142,14,1
+143,14,1
+144,14,1
+145,7,1
+146,7,1
+147,7,2
+147,15,1
+148,7,1
+149,7,1
+150,7,1
+151,7,1
+152,7,1
+153,6,1
+154,2,1
+154,6,2
+155,6,1
+156,6,1
+157,6,1
+158,6,1
+159,6,1
+160,6,1
+161,6,1
+162,4,1
+162,8,2
+163,4,1
+163,8,2
+164,8,2
+164,9,1
+165,8,1
+166,8,1
+167,4,1
+167,8,2
+168,4,1
+168,8,2
+169,17,1
+170,3,1
+170,17,2
+171,3,1
+171,17,2
+172,4,1
+172,17,2
+173,17,1
+174,9,1
+175,9,2
+175,10,1
+176,9,2
+176,16,1
+177,8,1
+177,10,2
+178,9,1
+179,9,1
+180,1,1
+180,9,2
+181,8,1
+181,9,2
+182,7,1
+182,9,2
+183,7,1
+183,9,2
+184,9,1
+185,8,1
+185,10,2
+186,3,1
+186,10,2
+187,9,1
+188,10,1
+189,8,1
+190,14,1
+191,8,1
+191,10,2
+192,7,1
+192,10,2
+193,2,1
+193,10,2
+194,2,1
+195,9,1
+196,12,1
+196,16,2
+197,17,1
+198,9,2
+198,14,1
+199,9,1
+200,9,1
+201,3,1
diff --git a/pokedex/data/csv/conquest_warriors.csv b/pokedex/data/csv/conquest_warriors.csv
new file mode 100644
index 0000000..eab2155
--- /dev/null
+++ b/pokedex/data/csv/conquest_warriors.csv
@@ -0,0 +1,202 @@
+id,identifier,gender_id
+1,player-male,2
+2,player-female,1
+3,nobunaga,2
+4,oichi,1
+5,hideyoshi,2
+6,motochika,2
+7,ginchiyo,1
+8,motonari,2
+9,mitsuhide,2
+10,yoshihiro,2
+11,nene,1
+12,shingen,2
+13,masamune,2
+14,kenshin,2
+15,yoshimoto,2
+16,ujiyasu,2
+17,no,1
+18,kotaro,2
+19,ieyasu,2
+20,hanbei,2
+21,kanbei,2
+22,muneshige,2
+23,gracia,1
+24,hanzo,2
+25,kunoichi,1
+26,yukimura,2
+27,magoichi,2
+28,kanetsugu,2
+29,aya,1
+30,kai,1
+31,okuni,1
+32,ranmaru,2
+33,tadakatsu,2
+34,ina,1
+35,keiji,2
+36,mitsunari,2
+37,kiyomasa,2
+38,masanori,2
+39,tsunehisa,2
+40,naoie,2
+41,harutaka,2
+42,takanobu,2
+43,naoshige,2
+44,ujisato,2
+45,chacha,1
+46,go,1
+47,hatsu,1
+48,kazumasu,2
+49,nagahide,2
+50,yoshitaka,2
+51,urakusai,2
+52,narimasa,2
+53,tomonori,2
+54,murashige,2
+55,masahide,2
+56,nagayoshi,2
+57,kitsuno,1
+58,gotoku,1
+59,hidenaga,2
+60,koroku,2
+61,takatora,2
+62,yoshitsugu,2
+63,yukinaga,2
+64,rikyu,2
+65,hideyori,2
+66,asahi,1
+67,kazutoyo,2
+68,nagayasu,2
+69,harunaga,2
+70,hideaki,2
+71,naka,1
+72,tatsuko,1
+73,maa,1
+74,chiyo,1
+75,hatsume,1
+76,nobuchika,2
+77,chikayasu,2
+78,morichika,2
+79,chikamasa,2
+80,norishige,2
+81,takayori,2
+82,tadasumi,2
+83,dosetsu,2
+84,shoun,2
+85,sorin,2
+86,sekiso,2
+87,akizane,2
+88,takatane,2
+89,kiyo,1
+90,motoharu,2
+91,takakage,2
+92,terumoto,2
+93,takeyoshi,2
+94,ekei,2
+95,takamoto,2
+96,sadatoshi,2
+97,hidemitsu,2
+98,toshimitsu,2
+99,shigemoto,2
+100,mitsutada,2
+101,yukimasa,2
+102,tadaoki,2
+103,fujitaka,2
+104,hiroko,1
+105,tadamoto,2
+106,tadatsune,2
+107,takahisa,2
+108,hisaaki,2
+109,masatoshi,2
+110,kanemori,2
+111,tokitaka,2
+112,sandayu,2
+113,morikiyo,2
+114,kashinkoji,2
+115,yasunaga,2
+116,seikuro,2
+117,katsuyori,2
+118,haruyuki,2
+119,masakage,2
+120,masatoyo,2
+121,nobufusa,2
+122,masayuki,2
+123,yukitaka,2
+124,ume,1
+125,chiyome,1
+126,kei,1
+127,kagetsuna,2
+128,shigezane,2
+129,tsunamoto,2
+130,tsunenaga,2
+131,munetoki,2
+132,munezane,2
+133,yoshi,1
+134,iroha,1
+135,kagekatsu,2
+136,yoshikiyo,2
+137,tomonobu,2
+138,kageie,2
+139,takahiro,2
+140,sadamitsu,2
+141,yataro,2
+142,saneyori,2
+143,hana,1
+144,sen,1
+145,ujichika,2
+146,ujizane,2
+147,sessai,2
+148,masatsuna,2
+149,yasutomo,2
+150,ujihiro,2
+151,motozane,2
+152,sena,1
+153,soun,2
+154,tsunashige,2
+155,genan,2
+156,ujimasa,2
+157,ujiteru,2
+158,ujikuni,2
+159,ujinao,2
+160,shizuka,1
+161,madoka,1
+162,dosan,2
+163,yoshitatsu,2
+164,ittetsu,2
+165,bokuzen,2
+166,morinari,2
+167,omi,1
+168,asa,1
+169,shimoyama,2
+170,genba,2
+171,danzo,2
+172,yazaemon,2
+173,isuke,2
+174,tadatsugu,2
+175,naomasa,2
+176,yasumasa,2
+177,masanobu,2
+178,hidetada,2
+179,kazumasa,2
+180,choan,2
+181,tenkai,2
+182,munenori,2
+183,kame,1
+184,toku,1
+185,saizo,2
+186,sasuke,2
+187,katsu,1
+188,juzo,2
+189,tsuru,1
+190,ise,1
+191,jinpachi,2
+192,kamanosuke,2
+193,seikai,2
+194,isa,2
+195,yoshiteru,2
+196,yoshiaki,2
+197,hisahide,2
+198,jubei,2
+199,nobutsuna,2
+200,bokuden,2
+201,otsu,1
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 2d6f859..a2e649c 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -222,7 +222,7 @@ class ConquestKingdom(TableBase):
     """
     __tablename__ = 'conquest_kingdoms'
     __singlename__ = 'kingdom'
-    id = Column(Integer, primary_key=True,
+    id = Column(Integer, primary_key=True, autoincrement=True,
         info=dict(description="An ID for this kingdom."))
     identifier = Column(Unicode(9), nullable=False,
         info=dict(description="A readable identifier for this kingdom.", format='identifier'))
@@ -259,6 +259,76 @@ class ConquestPokemonEvolution(TableBase):
     recruiting_ko_required = Column(Boolean, nullable=False, server_default='False',
         info=dict(description=u"If true, the Pokémon must KO a Pokémon under the right conditions to recruit that Pokémon's warrior."))
 
+class ConquestWarrior(TableBase):
+    u"""A warrior in Pokémon Conquest.
+    """
+    __tablename__ = 'conquest_warriors'
+    __singlename__ = 'warrior'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=True,
+        info=dict(description='An ID for this warrior.'))
+    identifier = Column(Unicode(13), nullable=False,
+        info=dict(description='A readable identifier for this warrior.', format='identifier'))
+    gender_id = Column(Integer, ForeignKey('genders.id'), nullable=False,
+        info=dict(description="The ID of the warrior's gender."))
+
+create_translation_table('conquest_warrior_names', ConquestWarrior, 'names',
+    relation_lazy='joined',
+    name=Column(Unicode(15), nullable=False, index=True,
+        info=dict(description='The name.', format='plaintext', official=True))
+)
+
+class ConquestWarriorRank(TableBase):
+    u"""A warrior rank in Pokémon Conquest.
+
+    These are used for whatever changes between ranks, much like Pokémon forms.
+    Generic warriors who have only one rank are also represented here, with a
+    single row.
+
+    To clarify, each warrior's ranks are individually called "warrior ranks"
+    here; for example, "Rank 2 Nobunaga" is an example of a warrior rank, not
+    just "Rank 2".
+    """
+    __tablename__ = 'conquest_warrior_ranks'
+    __singlename__ = 'warrior_rank'
+    warrior_id = Column(Integer, ForeignKey('conquest_warriors.id'), primary_key=True, nullable=False,
+        info=dict(description=u'The ID of the warrior.'))
+    rank = Column(Integer, primary_key=True, nullable=False,
+        info=dict(description=u'The rank number.'))
+    skill_id = Column(Integer, ForeignKey('conquest_warrior_skills.id'), nullable=False,
+        info=dict(description=u"The ID of this warrior rank's warrior skill."))
+    capacity = Column(Integer, nullable=False,
+        info=dict(description=u'The number of Pokémon this warrior rank can be linked with at a time.'))
+
+class ConquestWarriorSkill(TableBase):
+    u"""A warrior skill in Pokémon Conquest.
+    """
+    __tablename__ = 'conquest_warrior_skills'
+    __singlename__ = 'skill'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=True,
+        info=dict(description='An ID for this skill.'))
+    identifier = Column(Unicode(15), nullable=False,
+        info=dict(description='A readable identifier for this skill.', format='identifier'))
+
+create_translation_table('conquest_warrior_skill_names', ConquestWarriorSkill, 'names',
+    relation_lazy='joined',
+    name=Column(Unicode(15), nullable=False, index=True,
+        info=dict(description='The name.', format='plaintext', official=True))
+)
+
+class ConquestWarriorSpecialty(TableBase):
+    u"""A warrior's specialty types in Pokémon Conquest.
+
+    These have no actual effect on gameplay; they just indicate which types of
+    Pokémon each warrior generally has strong maximum links with.
+    """
+    __tablename__ = 'conquest_warrior_specialties'
+    warrior_id = Column(Integer, ForeignKey('conquest_warriors.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u'The ID of the warrior.'))
+    type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u'The ID of the type.'))
+    slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u"The order in which the warrior's types are listed."))
+
 class ContestCombo(TableBase):
     u"""Combo of two moves in a Contest.
     """