Merge branch 'conquest'

Conflicts:
	pokedex/data/csv/pokemon_dex_numbers.csv

pokedex/data/csv/abilities.csv

@@ -163,3 +163,63 @@ id,identifier,generation_id
 162,victory-star,5
 163,turboblaze,5
 164,teravolt,5
+10001,mountaineer,5
+10002,wave-rider,5
+10003,skater,5
+10004,thrust,5
+10005,perception,5
+10006,parry,5
+10007,instinct,5
+10008,dodge,5
+10009,jagged-edge,5
+10010,frostbite,5
+10011,tenacity,5
+10012,pride,5
+10013,deep-sleep,5
+10014,power-nap,5
+10015,spirit,5
+10016,warm-blanket,5
+10017,gulp,5
+10018,herbivore,5
+10019,sandpit,5
+10020,hot-blooded,5
+10021,medic,5
+10022,life-force,5
+10023,lunchbox,5
+10024,nurse,5
+10025,melee,5
+10026,sponge,5
+10027,bodyguard,5
+10028,hero,5
+10029,last-bastion,5
+10030,stealth,5
+10031,vanguard,5
+10032,nomad,5
+10033,sequence,5
+10034,grass-cloak,5
+10035,celebrate,5
+10036,lullaby,5
+10037,calming,5
+10038,daze,5
+10039,frighten,5
+10040,interference,5
+10041,mood-maker,5
+10042,confidence,5
+10043,fortune,5
+10044,bonanza,5
+10045,explode,5
+10046,omnipotent,5
+10047,share,5
+10048,black-hole,5
+10049,shadow-dash,5
+10050,sprint,5
+10051,disgust,5
+10052,high-rise,5
+10053,climber,5
+10054,flame-boost,5
+10055,aqua-boost,5
+10056,run-up,5
+10057,conqueror,5
+10058,shackle,5
+10059,decoy,5
+10060,shield,5

pokedex/data/csv/ability_names.csv

@@ -983,3 +983,63 @@ ability_id,local_language_id,name
 164,7,Terravoltaje
 164,8,Teravolt
 164,9,Teravolt
+10001,9,Mountaineer
+10002,9,Wave Rider
+10003,9,Skater
+10004,9,Thrust
+10005,9,Perception
+10006,9,Parry
+10007,9,Instinct
+10008,9,Dodge
+10009,9,Jagged Edge
+10010,9,Frostbite
+10011,9,Tenacity
+10012,9,Pride
+10013,9,Deep Sleep
+10014,9,Power Nap
+10015,9,Spirit
+10016,9,Warm Blanket
+10017,9,Gulp
+10018,9,Herbivore
+10019,9,Sandpit
+10020,9,Hot Blooded
+10021,9,Medic
+10022,9,Life Force
+10023,9,Lunchbox
+10024,9,Nurse
+10025,9,Melee
+10026,9,Sponge
+10027,9,Bodyguard
+10028,9,Hero
+10029,9,Last Bastion
+10030,9,Stealth
+10031,9,Vanguard
+10032,9,Nomad
+10033,9,Sequence
+10034,9,Grass Cloak
+10035,9,Celebrate
+10036,9,Lullaby
+10037,9,Calming
+10038,9,Daze
+10039,9,Frighten
+10040,9,Interference
+10041,9,Mood Maker
+10042,9,Confidence
+10043,9,Fortune
+10044,9,Bonanza
+10045,9,Explode
+10046,9,Omnipotent
+10047,9,Share
+10048,9,Black Hole
+10049,9,Shadow Dash
+10050,9,Sprint
+10051,9,Disgust
+10052,9,High-rise
+10053,9,Climber
+10054,9,Flame Boost
+10055,9,Aqua Boost
+10056,9,Run Up
+10057,9,Conqueror
+10058,9,Shackle
+10059,9,Decoy
+10060,9,Shield

pokedex/data/csv/conquest_episode_names.csv

@@ -0,0 +1,39 @@
+episode_id,local_language_id,name
+1,9,The Legend of Ransei
+2,9,The Road to Conquest
+3,9,Happily Ever After
+4,9,The Burden of Peace
+5,9,The Way of the Warrior
+6,9,The Joy of Battle
+7,9,Pride and Precociousness
+8,9,Tragic Determination
+9,9,A Shroud of Darkness
+10,9,Not Worth Fighting Over... 1
+11,9,Teaching Them a Lesson
+12,9,The Reluctant Genius
+13,9,The Unparalleled Warrior
+14,9,A Ninja amongst Ninjas
+15,9,Archenemies
+16,9,Time for Battle!
+17,9,Land of Love and Righteousness
+18,9,Love is a Battlefield
+19,9,The Final Gamble
+20,9,Blowing in the Wind
+21,9,Ransei's Legendary Beauty
+22,9,All Grown Up
+23,9,The Rebel
+24,9,That Which He Holds Dear
+25,9,Not Worth Fighting Over... 2
+26,9,The Rose of Ransei
+27,9,The Visionary's Quest
+28,9,Grace and Beauty
+29,9,Pokémari and Me
+30,9,The Dragon's Dream
+31,9,Putting the Books Down
+32,9,A Date with Destiny
+33,9,This One Goes Out to My Fans
+34,9,Simply the Best
+35,9,Not Worth Fighting Over... 3
+36,9,A Fate Born of Beauty
+37,9,The Free Spirit's Path
+38,9,Two Heroes of Ransei

pokedex/data/csv/conquest_episode_warriors.csv

@@ -0,0 +1,41 @@
+episode_id,warrior_id
+1,1
+1,2
+2,3
+3,5
+4,19
+5,26
+6,14
+7,7
+8,9
+9,18
+10,36
+11,11
+12,20
+13,33
+14,24
+15,12
+16,25
+17,28
+18,29
+19,10
+20,22
+21,17
+22,23
+23,6
+24,16
+25,37
+26,4
+27,21
+28,34
+29,15
+30,13
+31,8
+32,31
+33,27
+34,30
+35,38
+36,32
+37,35
+38,1
+38,2

pokedex/data/csv/conquest_episodes.csv

@@ -0,0 +1,39 @@
+id,identifier
+1,the-legend-of-ransei
+2,the-road-to-conquest
+3,happily-ever-after
+4,the-burden-of-peace
+5,the-way-of-the-warrior
+6,the-joy-of-battle
+7,pride-and-precociousness
+8,tragic-determination
+9,a-shroud-of-darkness
+10,not-worth-fighting-over-1
+11,teaching-them-a-lesson
+12,the-reluctant-genius
+13,the-unparalleled-warrior
+14,a-ninja-amongst-ninjas
+15,archenemies
+16,time-for-battle
+17,land-of-love-and-righteousness
+18,love-is-a-battlefield
+19,the-final-gamble
+20,blowing-in-the-wind
+21,ranseis-legendary-beauty
+22,all-grown-up
+23,the-rebel
+24,that-which-he-holds-dear
+25,not-worth-fighting-over-2
+26,the-rose-of-ransei
+27,the-visionarys-quest
+28,grace-and-beauty
+29,pokemari-and-me
+30,the-dragons-dream
+31,putting-the-books-down
+32,a-date-with-destiny
+33,this-one-goes-out-to-my-fans
+34,simply-the-best
+35,not-worth-fighting-over-3
+36,a-fate-born-of-beauty
+37,the-free-spirits-path
+38,two-heroes-of-ransei

pokedex/data/csv/conquest_kingdom_names.csv

@@ -0,0 +1,18 @@
+kingdom_id,local_language_id,name
+1,9,Aurora
+2,9,Ignis
+3,9,Fontaine
+4,9,Violight
+5,9,Greenleaf
+6,9,Nixtorm
+7,9,Pugilis
+8,9,Viperia
+9,9,Terrera
+10,9,Avia
+11,9,Illusio
+12,9,Chrysalia
+13,9,Cragspur
+14,9,Spectra
+15,9,Dragnor
+16,9,Yaksha
+17,9,Valora

pokedex/data/csv/conquest_kingdoms.csv

@@ -0,0 +1,18 @@
+id,identifier,type_id
+1,aurora,1
+2,ignis,10
+3,fontaine,11
+4,violight,13
+5,greenleaf,12
+6,nixtorm,15
+7,pugilis,2
+8,viperia,4
+9,terrera,5
+10,avia,3
+11,illusio,14
+12,chrysalia,7
+13,cragspur,6
+14,spectra,8
+15,dragnor,16
+16,yaksha,17
+17,valora,9

pokedex/data/csv/conquest_move_data.csv

@@ -0,0 +1,124 @@
+move_id,power,accuracy,effect_chance,effect_id,range_id,displacement_id
+1,26,100,,60,2,
+2,31,100,,9,2,
+3,10,90,,14,2,
+17,31,100,,60,2,
+22,24,100,,60,7,
+29,39,100,30,44,2,
+33,31,100,,60,2,
+34,45,100,30,37,11,1
+40,12,100,30,39,3,
+41,26,100,20,68,3,
+44,36,100,30,44,2,
+52,26,100,10,41,11,
+53,45,100,10,41,4,
+55,24,100,,60,3,
+56,51,80,,60,4,
+58,45,100,10,42,4,
+59,51,70,10,42,16,
+60,35,100,10,43,4,
+61,38,100,10,33,17,
+67,31,90,,60,2,
+71,20,100,,21,2,
+72,26,100,,21,2,
+75,31,95,,9,4,
+80,41,100,,64,5,
+82,40,75,,0,3,
+83,12,85,,15,14,
+84,24,100,10,37,3,
+85,45,100,10,37,15,
+87,51,70,30,37,12,
+91,41,100,,16,11,
+93,29,100,10,43,12,
+94,44,100,10,30,13,
+95,,60,100,38,3,
+98,31,100,,60,2,
+100,,,,22,1,
+122,14,100,30,37,2,
+126,51,85,10,41,19,
+136,65,90,,26,11,1
+138,48,100,,67,2,
+145,20,100,10,33,3,
+150,,,,69,1,
+154,10,90,,14,2,
+157,41,90,30,44,4,
+158,43,90,10,44,2,
+163,41,100,,9,2,
+172,32,100,10,62,11,1
+181,24,100,10,42,3,
+185,36,,,52,2,
+188,44,100,30,39,18,
+189,17,100,100,36,3,
+196,34,95,100,58,7,
+200,41,100,,64,5,
+209,39,100,30,37,2,
+210,12,95,,3,7,
+231,45,75,30,30,7,4
+232,31,95,10,28,2,
+238,45,80,,9,10,
+242,43,100,20,30,2,
+247,43,100,20,30,11,
+248,45,100,,18,16,
+276,55,100,100,59,2,4
+301,18,90,,3,11,1
+304,44,100,,60,6,
+305,31,100,30,40,2,
+309,48,85,20,28,2,4
+310,20,100,30,44,2,4
+317,31,80,100,58,11,
+337,43,100,,60,2,
+342,29,100,10,66,7,
+344,58,100,10,63,15,1
+348,45,100,,9,2,
+350,10,90,,14,11,
+352,36,100,20,43,3,
+358,36,100,,65,2,
+360,18,100,,6,11,1
+362,35,100,,48,3,
+372,31,100,,7,2,
+395,31,100,30,37,2,4
+396,45,,,52,11,4
+398,43,100,30,39,2,
+400,38,100,,9,7,
+401,44,90,,60,7,4
+404,41,100,,60,10,
+406,44,100,,60,4,
+407,45,75,20,44,13,2
+413,58,100,,25,8,1
+414,44,100,10,30,9,
+418,26,100,,60,2,
+424,39,95,10,61,2,
+425,26,100,,60,2,
+426,39,85,30,36,11,
+427,38,100,,9,3,
+430,41,100,10,30,9,
+435,41,100,30,37,6,
+437,52,90,100,29,6,
+439,58,90,,23,12,
+440,38,100,10,66,10,
+442,43,100,30,44,2,4
+444,45,80,,9,9,
+449,55,100,,60,6,
+450,36,100,,51,2,
+459,58,90,,23,21,
+473,43,100,,60,11,
+474,35,100,,49,15,
+481,38,100,,60,18,
+486,26,100,,5,11,
+492,47,100,,8,2,
+506,31,100,,2,2,
+507,36,100,,17,2,
+510,28,100,,47,4,
+521,41,100,,19,11,3
+523,33,100,100,58,5,
+525,33,90,,20,7,5
+529,41,95,,9,11,1
+533,45,100,,4,2,
+535,43,100,,60,11,1
+539,42,95,40,36,5,
+540,45,100,,60,20,
+541,23,85,,14,7,
+550,57,85,20,37,2,4
+551,55,85,20,41,9,
+552,41,100,50,28,13,2
+556,45,90,30,44,11,

pokedex/data/csv/conquest_move_displacement_prose.csv

@@ -0,0 +1,6 @@
+move_displacement_id,local_language_id,name,short_effect,effect
+1,9,Advance one tile,User advances one tile.,"The user moves to the tile directly in front of it.  If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used."
+2,9,Advance two tiles,User jumps ahead two tiles.,"The user jumps ahead two tiles without crossing the tile in-between.  If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used."
+3,9,Switch back,"User retreats one tile, switching places with any Pokémon already there.","The user moves to the tile behind it, if it can move to that tile.  If another Pokémon is already occupying that tile, the user switches places with it."
+4,9,Knockback,Deals knockback.,"$Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to and if no other Pokémon is already occupying that tile."
+5,9,Knockback & switch,"Deals knockback, switching $target with the Pokémon behind it if applicable.","$Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to.  If another Pokémon is already occupying that tile, the Pokémon switch places."

pokedex/data/csv/conquest_move_displacements.csv

@@ -0,0 +1,6 @@
+id,identifier,affects_target
+1,advance-1,0
+2,advance-2,0
+3,switch-back,0
+4,knockback,1
+5,knockback-switch,1

pokedex/data/csv/conquest_move_effect_prose.csv

@@ -0,0 +1,56 @@
+conquest_move_effect_id,local_language_id,short_effect,effect
+0,9,Inflicts exactly 40 HP in damage.,"Inflicts exactly 40 HP in damage, unaffected by stats or types."
+2,9,Has double power if $target has a major status ailment.,Inflicts regular damage.  Has double power if $target has a major status ailment.
+3,9,Doubles in power with each consecutive successful use.,"Inflicts regular damage.  Every time this move succeeds, its power doubles; if it fails or is not used for a turn, it resets."
+4,9,Ignores $target's stat modifiers.,"Inflicts damage, ignoring $target's stat modifiers."
+5,9,Power rises the faster the user is compared to $target.,"Inflicts regular damage.  The greater the user's Speed compared to $target's, the more power this move has."
+6,9,Power rises the slower the user is compared to $target.,"Inflicts regular damage.  The lower the user's Speed compared to $target's, the more power this move has."
+7,9,Has double power if $target has already taken damage this turn.,Inflicts regular damage.  Has double power if $target has already taken damage this turn.
+8,9,Inflicts damage based on $target's Attack stat instead of the user's.,Inflicts regular damage.  Damage is calculated using $target's Attack stat rather than the user's.
+9,9,Has an increased chance for a critical hit.,Inflicts regular damage.  This move's critical hit rate is higher than usual.
+14,9,Hits 2 to 5 times in one turn.,"Inflicts regular damage.  Hits two to five times in one turn, with damage calculated separately each time."
+15,9,Hits 4 to 5 times in one turn.,"Inflicts regular damage.  Hits four to five times in one turn, with damage calculated separately each time."
+16,9,Digs underground and hits at the beginning of the next turn.,"Inflicts regular damage.  The user digs underground, dodging all moves until it attacks.  At the beginning of the next turn, the user hits $target, even if $target has moved, and cannot move again that turn."
+17,9,Lifts $target into the sky and hits at the beginning of the next turn.,"Inflicts regular damage.  The user carries $target into the sky.  No moves can hit either Pokémon in this state.  At the beginning of the next turn, the user slams $target to the ground, inflicting regular damage.  The user cannot move again that turn."
+18,9,Hits $target at the beginning of the turn after next.,"Inflicts regular damage.  Hits $target at the beginning of the user's turn two turns after this one, even if the target has moved.
+
+In the turn in-between, the user can use this move again, but it will miss any target that already has a Future Sight pending."
+19,9,"User moves back one tile, switching places with any Pokémon already there.",Inflicts regular damage.
+20,9,Switches $target with the Pokémon behind it.,Inflicts regular damage.
+21,9,Heals the user by half the damage dealt.,Inflicts regular damage.  The user heals for half as many HP as it dealt in damage.
+22,9,Teleports randomly.,The user teleports randomly to another tile.
+23,9,Cannot be used the turn after hitting.,"Inflicts regular damage.  If the move succeeds, it cannot be used again on the next turn."
+25,9,Lowers the user's range and Defense until its next turn.,Inflicts regular damage.  The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn.
+26,9,Damages the user if it misses.,"Inflicts regular damage.  If this move misses, the user takes some damage."
+28,9,Has a $effect_chance% chance to raise the user's Attack.,Inflicts regular damage.  Has a $effect_chance% chance to raise the user's Attack afterward.
+29,9,Lowers the user's Attack.,Inflicts regular damage.  Lowers the user's Attack afterward.
+30,9,Has a $effect_chance% chance to lower $target's Defense.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's Defense afterward.
+33,9,Has a $effect_chance% chance to lower $target's Speed.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's Speed afterward.
+36,9,Has a $effect_chance% chance to lower $target's accuracy.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's accuracy.
+37,9,Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage.  Has a $effect_chance% chance to paralyze $target.
+38,9,Puts $target to sleep.,Puts $target to sleep.
+39,9,Has a $effect_chance% chance to poison $target.,Inflicts regular damage.  Has a $effect_chance% chance to poison $target.
+40,9,Has a $effect_chance% chance to badly poison $target.,Inflicts regular damage.  Has a $effect_chance% chance to badly poison $target.
+41,9,Has a $effect_chance% chance to burn $target.,Inflicts regular damage.  Has a $effect_chance% chance to burn $target.
+42,9,Has a $effect_chance% chance to freeze $target.,Inflicts regular damage.  Has a $effect_chance% chance to freeze $target.
+43,9,Has a $effect_chance% chance to confuse $target.,Inflicts regular damage.  Has a $effect_chance% chance to confuse $target.
+44,9,Has a $effect_chance% chance to make $target flinch.,Inflicts regular damage.  Has a $effect_chance% chance to make $target flinch.
+47,9,Permanently destroys $target's item if it is consumable.,Inflicts regular damage.  Permanently destroys $target's item if the item can be consumed in battle.
+48,9,Has double power against Pokémon with less than half their max HP remaining.,"Inflicts regular damage.  Has double power when calculating damage against a target with less than half its max HP remaining, on a target-by-target basis."
+49,9,Has double power against poisoned Pokémon.,"Inflicts regular damage.  Has double power when calculating damage against a poisoned target, on a target-by-target basis."
+51,9,Uses $target's item if it is consumable.,"Inflicts regular damage.  The user steals $target's item, if the item can be consumed in battle, and uses it on itself, or destroys it if it would have no effect."
+52,9,Never misses.,"Inflicts regular damage.  Always has 100% accuracy.
+
+This move still misses Pokémon under the effects of []{move:dig} or []{move:sky-drop} and can still be dodged by abilities such as []{ability:instinct}."
+58,9,Has a $effect_chance% chance to lower $target's range by one tile.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's range by one tile.
+59,9,Lowers the user's Attack and Defense.,Inflicts regular damage.  Lowers the user's Attack and Defense afterward.
+60,9,Inflicts regular damage with no additional effect.,Inflicts regular damage.
+61,9,Has a $effect_chance% chance each to burn $target or make it flinch.,"Inflicts regular damage.  Has a $effect_chance% chance to burn $target, and a $effect_chance% chance, separately rolled, to make $target flinch."
+62,9,Has a $effect_chance% chance to burn $target.  Thaws the user out if frozen.,"Inflicts regular damage.  Has a $effect_chance% chance to burn $target.  Can be used if the user is frozen, in which case it thaws out."
+63,9,Lowers the user's range and Defense until its next turn.  Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage.  The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn.  Has a $effect_chance% chance to paralyze $target.
+64,9,Hits 2 to 3 times in one turn.  User has 0 range on its next turn.,"Inflicts regular damage.  Hits two to three times in one turn, with damage calculated separately for each hit.  The user's range is lowered to 0 on its next turn."
+65,9,Has double power and wakes $target up if it is asleep.,"Inflicts regular damage.  If $target is asleep, this move has double power and wakes $target up."
+66,9,Has a $effect_chance% chance to poison $target and an increased chance for a critical hit.,Inflicts damage.  Has a $effect_chance% chance to poison $target.  This move's critical hit rate is higher than usual.
+67,9,Heals the user by half the damage inflicted.  Only works if $target is asleep.,"Inflicts damage if $target is asleep, and fails otherwise.  Heals the user for half as many HP as it dealt in damage."
+68,9,Hits twice in one turn.  Has a $effect_chance% chance to poison $target with each hit.,Inflicts regular damage.  Hits twice in one turn.  Has a $effect_chance% chance to poison $target with each hit.
+69,9,Does nothing.,Does nothing.

pokedex/data/csv/conquest_move_effects.csv

@@ -0,0 +1,71 @@
+id
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69

pokedex/data/csv/conquest_move_range_prose.csv

@@ -0,0 +1,22 @@
+conquest_move_range_id,local_language_id,name,description
+1,9,User,The user.
+2,9,Single tile,A single tile directly in front of the user.
+3,9,Two-tile column,Two tiles in a column in front of the user.
+4,9,Three-tile column,Three tiles in a column in front of the user.
+5,9,Adjacent diamond,The four tiles adjacent to the user.
+6,9,Adjacent ring,Eight tiles in a ring around the user.
+7,9,Row,Three tiles in a line centered directly in front of the user.
+8,9,Chevron,"Three tiles in the shape of a chevron (^), with the apex two tiles in front of the user."
+9,9,Plus,Five tiles in a plus shape centered two tiles in front of the user.
+10,9,X-shape,Five tiles in an X shape centered directly in front of the user.
+11,9,Two ahead,A single tile two tiles in front of the user.
+12,9,Three ahead,A single tile three tiles in front of the user.
+13,9,Diamond two ahead,Four tiles in a diamond centered two tiles in front of the user.
+14,9,Ring in front,Eight tiles in a ring centered two tiles in front of the user.
+15,9,Row two ahead,Three tiles in a line centered two tiles in front of the user.
+16,9,Two rows two ahead,"Six tiles in two rows of three, one centered two tiles in front of the user and the other three tiles."
+17,9,Column two ahead,A column of two tiles starting two tiles in front of the user.
+18,9,X-shape two ahead,Five tiles in an X shape centered two tiles in front of the user.
+19,9,Dai,"Seven tiles in the shape of the kanji 大 (dai), consisting of five squares in a plus shape in front of the user and one square on either side of the user."
+20,9,T-shape,"Four tiles in the shape of a T, consisting of the tile directly in front of the user and a row of three tiles centered two tiles in front of the user."
+21,9,Two rows,"Six tiles in two rows of three, one centered directly in front of the user and the other two tiles in front of the user."

pokedex/data/csv/conquest_move_ranges.csv

@@ -0,0 +1,22 @@
+id,identifier,targets
+1,user,1
+2,tile-1-ahead,1
+3,column-2-tiles,2
+4,column-3-tiles,3
+5,diamond-adjacent,4
+6,ring-adjacent,8
+7,row,3
+8,chevron,3
+9,plus,5
+10,x-shape,5
+11,tile-2-ahead,1
+12,tile-3-ahead,1
+13,diamond-2-ahead,4
+14,ring-2-ahead,8
+15,row-2-ahead,3
+16,2-rows-2-ahead,6
+17,column-2-ahead,2
+18,x-shape-2-ahead,5
+19,dai,7
+20,t-shape,4
+21,2-rows,6

pokedex/data/csv/conquest_pokemon_abilities.csv

@@ -0,0 +1,561 @@
+pokemon_species_id,slot,ability_id
+4,1,66
+4,2,10016
+4,3,10028
+5,1,66
+5,2,10016
+5,3,10028
+6,1,66
+6,2,10028
+6,3,10029
+15,1,10031
+15,2,10001
+15,3,68
+23,1,22
+23,2,61
+23,3,10039
+24,1,22
+24,2,61
+24,3,10039
+25,1,9
+25,2,10035
+25,3,31
+26,1,9
+26,2,10007
+26,3,31
+39,1,10036
+39,2,10041
+39,3,10042
+40,1,10036
+40,2,10041
+40,3,10042
+41,1,10025
+41,2,39
+41,3,10026
+42,1,10040
+42,2,39
+42,3,10026
+52,1,10001
+52,2,10043
+52,3,10044
+53,1,10001
+53,2,7
+53,3,10052
+63,1,10007
+63,2,10022
+63,3,10047
+64,1,10007
+64,2,10022
+64,3,10005
+65,1,10007
+65,2,10022
+65,3,39
+66,1,62
+66,2,10004
+66,3,10027
+67,1,62
+67,2,10004
+67,3,10027
+68,1,62
+68,2,10057
+68,3,10027
+92,1,26
+93,1,26
+94,1,26
+95,1,5
+95,2,10009
+95,3,10039
+111,1,31
+111,2,10027
+111,3,10009
+112,1,31
+112,2,10027
+112,3,10009
+123,1,68
+123,2,10006
+123,3,10031
+129,1,10017
+129,2,10041
+129,3,10059
+130,1,22
+130,2,10039
+130,3,10011
+131,1,75
+131,2,10002
+131,3,11
+133,1,10050
+133,2,10005
+133,3,10035
+134,1,10002
+134,2,10055
+134,3,11
+135,1,10050
+135,2,10031
+135,3,10
+136,1,10015
+136,2,10054
+136,3,18
+143,1,10013
+143,2,17
+143,3,47
+144,1,10010
+147,1,61
+147,2,10007
+147,3,10041
+148,1,61
+148,2,10007
+148,3,10001
+149,1,39
+149,2,10042
+149,3,10029
+150,1,10022
+169,1,10049
+169,2,39
+169,3,10026
+172,1,9
+172,2,10041
+172,3,10033
+174,1,10036
+174,2,10041
+174,3,10042
+179,1,9
+179,2,10040
+179,3,10037
+180,1,9
+180,2,10040
+180,3,10037
+181,1,9
+181,2,10040
+181,3,10042
+194,1,10017
+194,2,10013
+194,3,11
+195,1,10058
+195,2,10013
+195,3,11
+196,1,10001
+196,2,10007
+196,3,10047
+197,1,10058
+197,2,10025
+197,3,10008
+200,1,26
+204,1,5
+204,2,10009
+204,3,10045
+205,1,5
+205,2,10009
+205,3,10045
+208,1,5
+208,2,10009
+208,3,10039
+212,1,68
+212,2,10006
+212,3,10012
+215,1,39
+215,2,10052
+215,3,10025
+246,1,10019
+246,2,62
+246,3,10030
+247,1,61
+247,2,10009
+247,3,10060
+248,1,10039
+248,2,10011
+248,3,10029
+252,1,65
+252,2,10001
+252,3,10007
+253,1,65
+253,2,10001
+253,3,10006
+254,1,65
+254,2,10001
+254,3,10050
+280,1,10007
+280,2,10005
+280,3,10047
+281,1,10007
+281,2,10005
+281,3,10047
+282,1,10007
+282,2,10005
+282,3,10042
+304,1,5
+304,2,10027
+304,3,10056
+305,1,5
+305,2,10027
+305,3,10056
+306,1,5
+306,2,10027
+306,3,10056
+347,1,4
+347,2,10009
+347,3,10007
+348,1,4
+348,2,10009
+348,3,10006
+355,1,26
+356,1,10039
+356,2,10040
+356,3,10048
+358,1,26
+361,1,39
+361,2,10003
+361,3,10030
+362,1,39
+362,2,10039
+362,3,10010
+363,1,10013
+363,2,10003
+363,3,47
+364,1,10013
+364,2,10003
+364,3,47
+365,1,10011
+365,2,10003
+365,3,47
+374,1,29
+374,2,10027
+374,3,10056
+375,1,29
+375,2,10027
+375,3,10060
+376,1,29
+376,2,10027
+376,3,10004
+379,1,29
+383,1,10020
+384,1,10032
+390,1,66
+390,2,10001
+390,3,10015
+391,1,66
+391,2,10053
+391,3,10015
+392,1,66
+392,2,10053
+392,3,10057
+393,1,67
+393,2,10002
+393,3,10012
+394,1,67
+394,2,10002
+394,3,10012
+395,1,67
+395,2,10002
+395,3,10012
+396,1,51
+396,2,10028
+396,3,10035
+397,1,22
+397,2,10028
+397,3,10035
+398,1,22
+398,2,10028
+398,3,10031
+399,1,86
+399,2,10013
+399,3,109
+400,1,86
+400,2,10013
+400,3,109
+403,1,22
+403,2,10033
+403,3,10035
+404,1,22
+404,2,10033
+404,3,10056
+405,1,22
+405,2,10033
+405,3,10050
+410,1,10060
+410,2,10029
+410,3,5
+411,1,10060
+411,2,10029
+411,3,5
+425,1,10008
+425,2,10045
+425,3,10059
+426,1,10008
+426,2,10045
+426,3,10059
+429,1,26
+433,1,26
+442,1,10040
+442,2,10039
+442,3,10048
+443,1,10019
+443,2,10007
+443,3,10025
+444,1,10019
+444,2,10006
+444,3,10035
+445,1,10030
+445,2,10006
+445,3,10011
+446,1,10023
+446,2,10014
+446,3,47
+447,1,39
+447,2,10006
+447,3,10050
+448,1,39
+448,2,10006
+448,3,10050
+451,1,4
+451,2,97
+451,3,10058
+452,1,4
+452,2,97
+452,3,10031
+453,1,10008
+453,2,10025
+453,3,10051
+454,1,10008
+454,2,10025
+454,3,10028
+455,1,26
+461,1,10008
+461,2,10052
+461,3,10049
+464,1,31
+464,2,10027
+464,3,116
+470,1,10056
+470,2,10007
+470,3,10022
+471,1,10003
+471,2,10030
+471,3,10010
+475,1,10006
+475,2,10057
+475,3,154
+477,1,10039
+477,2,10040
+477,3,10048
+478,1,10001
+478,2,10008
+478,3,10010
+483,1,10011
+493,1,10046
+495,1,65
+495,2,10034
+495,3,10007
+496,1,65
+496,2,10034
+496,3,10007
+497,1,65
+497,2,10034
+497,3,10024
+498,1,66
+498,2,10015
+498,3,10035
+499,1,66
+499,2,10015
+499,3,10035
+500,1,66
+500,2,10015
+500,3,10054
+501,1,67
+501,2,10002
+501,3,10006
+502,1,67
+502,2,10002
+502,3,10006
+503,1,67
+503,2,10002
+503,3,10057
+511,1,10025
+511,2,10024
+511,3,10035
+512,1,10025
+512,2,10028
+512,3,10007
+513,1,10025
+513,2,10001
+513,3,10035
+514,1,10025
+514,2,10007
+514,3,10054
+515,1,10025
+515,2,10001
+515,3,10008
+516,1,10025
+516,2,10007
+516,3,10055
+517,1,10013
+517,2,10005
+517,3,10007
+518,1,10037
+518,2,10037
+518,3,10038
+522,1,31
+522,2,78
+522,3,10056
+523,1,31
+523,2,78
+523,3,10050
+524,1,5
+524,2,10027
+524,3,10045
+525,1,5
+525,2,10027
+525,3,10045
+526,1,5
+526,2,10027
+526,3,10045
+529,1,10019
+529,2,10030
+529,3,10006
+530,1,10019
+530,2,10030
+530,3,10056
+531,1,10022
+531,2,131
+531,3,10021
+532,1,10004
+532,2,62
+532,3,10015
+533,1,10004
+533,2,62
+533,3,10015
+534,1,10004
+534,2,62
+534,3,10015
+540,1,10034
+540,2,10030
+540,3,10018
+541,1,10034
+541,2,10030
+541,3,10058
+542,1,10024
+542,2,68
+542,3,10042
+543,1,38
+543,2,10009
+543,3,10018
+544,1,38
+544,2,10009
+544,3,10028
+545,1,38
+545,2,10009
+545,3,10031
+546,1,10025
+546,2,10001
+546,3,10008
+547,1,10025
+547,2,10001
+547,3,10008
+548,1,20
+548,2,10024
+548,3,10022
+549,1,20
+549,2,10024
+549,3,10022
+551,1,22
+551,2,153
+551,3,10035
+552,1,22
+552,2,153
+552,3,10051
+553,1,22
+553,2,153
+553,3,10051
+554,1,10056
+554,2,10015
+554,3,10035
+555,1,10028
+555,2,10015
+555,3,10057
+559,1,61
+559,2,153
+559,3,10051
+560,1,61
+560,2,153
+560,3,10015
+570,1,149
+570,2,10025
+570,3,10051
+571,1,149
+571,2,10012
+571,3,10049
+572,1,10041
+572,2,10005
+572,3,10042
+573,1,10008
+573,2,10005
+573,3,10042
+574,1,10007
+574,2,10005
+574,3,10008
+575,1,10007
+575,2,10005
+575,3,10037
+576,1,10007
+576,2,10005
+576,3,10037
+587,1,9
+587,2,10007
+587,3,10035
+595,1,14
+595,2,10033
+595,3,10026
+596,1,14
+596,2,10033
+596,3,10026
+607,1,49
+607,2,18
+607,3,10016
+608,1,49
+608,2,18
+608,3,10016
+609,1,49
+609,2,18
+609,3,10016
+610,1,104
+610,2,10007
+610,3,10039
+611,1,104
+611,2,10006
+611,3,10039
+612,1,104
+612,2,10012
+612,3,10011
+613,1,10030
+613,2,10003
+613,3,10041
+614,1,10030
+614,2,10011
+614,3,10039
+624,1,10006
+624,2,10058
+624,3,39
+625,1,10006
+625,2,10058
+625,3,39
+627,1,51
+627,2,10012
+627,3,10035
+628,1,51
+628,2,10012
+628,3,10028
+633,1,10028
+633,2,10012
+633,3,10025
+634,1,10028
+634,2,10012
+634,3,10035
+635,1,26
+636,1,49
+636,2,10056
+636,3,10026
+637,1,49
+637,2,10039
+637,3,10026
+639,1,154
+643,1,163
+644,1,164

pokedex/data/csv/conquest_pokemon_evolution.csv

@@ -0,0 +1,114 @@
+evolved_species_id,required_stat_id,minimum_stat,minimum_link,kingdom_id,warrior_gender_id,item_id,recruiting_ko_required
+5,2,50,,,,,0
+6,2,83,,,,,0
+24,2,59,,,,,0
+25,,,50,,,,0
+26,,,,,,83,0
+39,,,50,,,,0
+40,,,,,,81,0
+42,4,55,,,,,0
+53,4,96,,,,,0
+64,2,83,,,,,0
+65,,,55,,,,1
+67,2,86,,,,,0
+68,,,60,,,,1
+93,2,99,,,,,0
+94,,,60,,,,1
+112,2,108,,,,,0
+130,2,16,,,,,0
+134,,,,,,84,0
+135,,,,,,83,0
+136,,,,,,82,0
+143,,,50,,,,0
+148,2,60,,,,,0
+149,2,132,,,,,0
+169,,,65,,,,0
+180,2,53,,,,,0
+181,2,90,,,,,0
+195,1,94,,,,,0
+196,,,70,11,,,0
+197,,,70,16,,,0
+205,3,73,,,,,0
+208,,,,,,210,1
+212,,,,,,210,1
+247,2,74,,,,,0
+248,2,132,,,,,0
+253,4,58,,,,,0
+254,4,118,,,,,0
+281,2,44,,,,,0
+282,2,75,,,,,0
+305,3,83,,,,,0
+306,3,130,,,,,0
+348,2,116,,,,,0
+356,3,104,,,,,0
+358,,,50,,,,0
+362,1,128,,,,,0
+364,1,138,,,,,0
+365,1,195,,,,,0
+375,3,64,,,,,0
+376,2,111,,,,,0
+391,4,48,,,,,0
+392,4,102,,,,,0
+394,2,51,,,,,0
+395,2,102,,,,,0
+397,4,48,,,,,0
+398,2,92,,,,,0
+400,2,39,,,,,0
+404,2,35,,,,,0
+405,2,95,,,,,0
+411,3,113,,,,,0
+426,1,146,,,,,0
+429,,,,,,108,0
+444,2,44,,,,,0
+445,2,136,,,,,0
+448,,,50,,,,0
+452,3,90,,,,,0
+454,2,81,,,,,0
+461,4,175,,,,303,0
+464,,,,,,298,1
+470,3,94,,5,,,0
+471,2,91,,6,,,0
+475,,,,,2,109,0
+477,,,,,,302,1
+478,,,,,1,109,0
+496,4,54,,,,,0
+497,4,104,,,,,0
+499,2,41,,,,,0
+500,2,115,,,,,0
+502,2,54,,,,,0
+503,2,104,,,,,0
+512,,,,,,85,0
+514,,,,,,82,0
+516,,,,,,84,0
+518,,,,,,81,0
+523,4,81,,,,,0
+525,3,59,,,,,0
+526,,,60,,,,1
+530,2,97,,,,,0
+533,2,81,,,,,0
+534,,,60,,,,1
+541,3,60,,,,,0
+542,,,65,,,,0
+544,3,50,,,,,0
+545,4,57,,,,,0
+547,,,,,,80,0
+549,,,,,,80,0
+552,2,80,,,,,0
+553,2,110,,,,,0
+555,2,110,,,,,0
+560,3,86,,,,,0
+571,2,90,,,,,0
+573,,,,,,107,0
+575,3,70,,,,,0
+576,3,106,,,,,0
+596,4,84,,,,,0
+608,2,84,,,,,0
+609,,,,,,108,0
+611,2,113,,,,,0
+612,2,173,,,,,0
+614,2,73,,,,,0
+625,2,118,,,,,0
+628,2,119,,,,,0
+634,2,72,,,,,0
+635,2,143,,,,,0
+637,2,131,,,,,0

pokedex/data/csv/conquest_pokemon_moves.csv

@@ -0,0 +1,201 @@
+pokemon_species_id,move_id
+4,52
+5,424
+6,53
+15,41
+23,40
+24,474
+25,85
+26,344
+39,3
+40,304
+41,17
+42,305
+52,154
+53,163
+63,100
+64,60
+65,94
+66,2
+67,358
+68,238
+92,122
+93,506
+94,247
+95,317
+111,523
+112,529
+123,210
+129,150
+130,401
+131,58
+133,98
+134,56
+135,85
+136,424
+143,34
+144,59
+147,82
+148,525
+149,407
+150,540
+169,440
+172,84
+174,1
+179,84
+180,435
+181,87
+194,55
+195,426
+196,60
+197,372
+200,310
+204,450
+205,360
+208,231
+212,404
+215,185
+246,317
+247,157
+248,444
+252,71
+253,348
+254,437
+280,93
+281,473
+282,94
+304,232
+305,442
+306,231
+347,210
+348,404
+355,310
+356,425
+358,473
+361,181
+362,58
+363,181
+364,301
+365,59
+374,442
+375,418
+376,309
+379,430
+383,414
+384,406
+390,52
+391,172
+392,83
+393,145
+394,61
+395,56
+396,98
+397,17
+398,413
+399,29
+400,158
+403,209
+404,435
+405,87
+410,442
+411,157
+425,310
+426,247
+429,247
+433,93
+442,425
+443,82
+444,337
+445,407
+446,33
+447,395
+448,396
+451,398
+452,440
+453,398
+454,188
+455,22
+461,400
+464,439
+470,348
+471,196
+475,427
+477,247
+478,196
+483,459
+493,449
+495,22
+496,348
+497,437
+498,52
+499,535
+500,126
+501,55
+502,352
+503,401
+511,22
+512,437
+513,481
+514,510
+515,55
+516,362
+517,95
+518,138
+522,209
+523,435
+524,350
+525,157
+526,444
+529,91
+530,529
+531,1
+532,67
+533,358
+534,276
+540,450
+541,75
+542,404
+543,40
+544,342
+545,474
+546,71
+547,75
+548,72
+549,80
+551,189
+552,44
+553,242
+554,172
+555,126
+559,185
+560,136
+570,492
+571,539
+572,3
+573,541
+574,93
+575,60
+576,248
+587,521
+595,486
+596,435
+607,52
+608,481
+609,83
+610,82
+611,337
+612,200
+613,181
+614,556
+624,372
+625,400
+627,17
+628,507
+633,82
+634,242
+635,406
+636,172
+637,552
+639,533
+643,551
+644,550

pokedex/data/csv/conquest_stat_names.csv

@@ -0,0 +1,7 @@
+conquest_stat_id,local_language_id,name
+1,9,HP
+2,9,Attack
+3,9,Defense
+4,9,Speed
+5,9,Range
+6,9,Energy

pokedex/data/csv/conquest_stats.csv

@@ -0,0 +1,7 @@
+id,identifier,is_base
+1,hp,1
+2,attack,1
+3,defense,1
+4,speed,1
+5,range,0
+6,energy,0

pokedex/data/csv/conquest_transformation_pokemon.csv

@@ -0,0 +1,90 @@
+transformation_id,pokemon_species_id
+3,133
+3,134
+3,135
+3,136
+3,196
+3,197
+3,470
+3,471
+6,133
+6,134
+6,135
+6,136
+6,196
+6,197
+6,470
+6,471
+8,635
+8,644
+10,39
+10,40
+12,391
+12,392
+13,643
+15,502
+15,503
+17,404
+17,405
+19,496
+19,497
+21,131
+21,144
+23,533
+23,534
+25,42
+25,169
+27,383
+27,464
+29,627
+29,628
+31,150
+31,475
+33,204
+33,205
+35,525
+35,526
+37,200
+37,429
+39,570
+39,571
+41,306
+41,379
+43,25
+43,26
+45,608
+45,609
+47,397
+47,398
+49,575
+49,576
+51,93
+51,94
+53,215
+53,461
+55,5
+55,6
+57,253
+57,254
+59,64
+59,65
+61,361
+61,478
+63,554
+63,555
+65,636
+65,637
+67,447
+67,448
+69,376
+69,483
+71,394
+71,395
+73,411
+73,639
+75,624
+75,625
+77,611
+77,612
+79,552
+79,553

pokedex/data/csv/conquest_transformation_warriors.csv

@@ -0,0 +1,8 @@
+transformation_id,present_warrior_id
+43,21
+45,20
+55,12
+59,14
+67,3
+69,19
+69,34

pokedex/data/csv/conquest_warrior_archetypes.csv

@@ -0,0 +1,31 @@
+id,identifier
+1,armor-veteran
+2,armor-officer
+3,armor-helmet
+4,armor-headlight
+5,armor-sweatband
+6,armor-smarmy
+7,armor-buff
+8,armor-visor
+9,angular
+10,portly
+11,clever
+12,nervous
+13,professor
+14,woman-warrior
+15,princess
+16,messenger
+17,sailor
+18,adventurer
+19,alchemist
+20,merchant-m
+21,merchant-f
+22,monk
+23,ninja-armor
+24,ninja-visor
+25,ninja-scroll
+26,ninja-eyeliner
+27,ninja-ceiling
+28,farmer-m
+29,farmer-f
+30,nobleman

pokedex/data/csv/conquest_warrior_names.csv

@@ -0,0 +1,202 @@
+warrior_id,local_language_id,name
+1,9,Player ♂
+2,9,Player ♀
+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ū

pokedex/data/csv/conquest_warrior_rank_stat_map.csv

@@ -0,0 +1,969 @@
+warrior_rank_id,warrior_stat_id,base_stat
+1,1,65
+1,2,60
+1,3,65
+1,4,4
+2,1,75
+2,2,70
+2,3,80
+2,4,6
+3,1,80
+3,2,85
+3,3,100
+3,4,8
+4,1,65
+4,2,60
+4,3,65
+4,4,4
+5,1,75
+5,2,70
+5,3,80
+5,4,6
+6,1,80
+6,2,85
+6,3,100
+6,4,8
+7,1,89
+7,2,94
+7,3,92
+7,4,5
+8,1,96
+8,2,100
+8,3,100
+8,4,8
+9,1,48
+9,2,73
+9,3,90
+9,4,4
+10,1,54
+10,2,83
+10,3,98
+10,4,5
+11,1,66
+11,2,65
+11,3,78
+11,4,6
+12,1,76
+12,2,88
+12,3,88
+12,4,7
+13,1,80
+13,2,98
+13,3,98
+13,4,8
+14,1,82
+14,2,81
+14,3,81
+14,4,6
+15,1,90
+15,2,92
+15,3,91
+15,4,7
+16,1,74
+16,2,68
+16,3,72
+16,4,5
+17,1,84
+17,2,78
+17,3,82
+17,4,6
+18,1,69
+18,2,90
+18,3,86
+18,4,7
+19,1,79
+19,2,100
+19,3,96
+19,4,8
+20,1,77
+20,2,82
+20,3,82
+20,4,5
+21,1,88
+21,2,92
+21,3,92
+21,4,6
+22,1,90
+22,2,63
+22,3,62
+22,4,6
+23,1,98
+23,2,73
+23,3,72
+23,4,7
+24,1,65
+24,2,78
+24,3,75
+24,4,5
+25,1,75
+25,2,84
+25,3,85
+25,4,6
+26,1,82
+26,2,96
+26,3,86
+26,4,7
+27,1,92
+27,2,100
+27,3,96
+27,4,8
+28,1,86
+28,2,82
+28,3,80
+28,4,7
+29,1,96
+29,2,92
+29,3,90
+29,4,8
+30,1,90
+30,2,66
+30,3,81
+30,4,7
+31,1,99
+31,2,76
+31,3,91
+31,4,8
+32,1,64
+32,2,72
+32,3,79
+32,4,5
+33,1,75
+33,2,82
+33,3,88
+33,4,6
+34,1,80
+34,2,78
+34,3,84
+34,4,7
+35,1,90
+35,2,94
+35,3,94
+35,4,8
+36,1,48
+36,2,74
+36,3,90
+36,4,5
+37,1,54
+37,2,84
+37,3,97
+37,4,6
+38,1,82
+38,2,78
+38,3,52
+38,4,5
+39,1,92
+39,2,89
+39,3,62
+39,4,6
+40,1,80
+40,2,84
+40,3,87
+40,4,8
+41,1,88
+41,2,94
+41,3,97
+41,4,8
+42,1,36
+42,2,90
+42,3,70
+42,4,5
+43,1,42
+43,2,99
+43,3,80
+43,4,6
+44,1,60
+44,2,90
+44,3,62
+44,4,5
+45,1,70
+45,2,98
+45,3,70
+45,4,6
+46,1,84
+46,2,68
+46,3,73
+46,4,6
+47,1,94
+47,2,78
+47,3,83
+47,4,7
+48,1,42
+48,2,63
+48,3,78
+48,4,5
+49,1,52
+49,2,73
+49,3,87
+49,4,5
+50,1,87
+50,2,77
+50,3,62
+50,4,5
+51,1,94
+51,2,88
+51,3,72
+51,4,6
+52,1,60
+52,2,63
+52,3,70
+52,4,5
+53,1,70
+53,2,73
+53,3,80
+53,4,5
+54,1,87
+54,2,78
+54,3,80
+54,4,6
+55,1,95
+55,2,84
+55,3,90
+55,4,7
+56,1,89
+56,2,79
+56,3,74
+56,4,6
+57,1,95
+57,2,88
+57,3,84
+57,4,7
+58,1,65
+58,2,88
+58,3,79
+58,4,7
+59,1,75
+59,2,97
+59,3,89
+59,4,7
+60,1,39
+60,2,71
+60,3,75
+60,4,5
+61,1,49
+61,2,81
+61,3,86
+61,4,5
+62,1,73
+62,2,62
+62,3,70
+62,4,5
+63,1,83
+63,2,72
+63,3,80
+63,4,6
+64,1,65
+64,2,63
+64,3,79
+64,4,3
+65,1,75
+65,2,73
+65,3,88
+65,4,4
+66,1,69
+66,2,72
+66,3,66
+66,4,4
+67,1,79
+67,2,82
+67,3,76
+67,4,5
+68,1,92
+68,2,68
+68,3,81
+68,4,6
+69,1,100
+69,2,77
+69,3,89
+69,4,6
+70,1,78
+70,2,56
+70,3,68
+70,4,5
+71,1,88
+71,2,63
+71,3,79
+71,4,6
+72,1,92
+72,2,40
+72,3,73
+72,4,6
+73,1,100
+73,2,50
+73,3,86
+73,4,7
+74,1,46
+74,2,85
+74,3,72
+74,4,5
+75,1,55
+75,2,96
+75,3,84
+75,4,5
+76,1,82
+76,2,64
+76,3,67
+76,4,5
+77,1,92
+77,2,74
+77,3,77
+77,4,6
+78,1,88
+78,2,37
+78,3,63
+78,4,5
+79,1,97
+79,2,50
+79,3,73
+79,4,6
+80,1,52
+80,2,95
+80,3,90
+80,4,7
+81,1,70
+81,2,95
+81,3,79
+81,4,6
+82,1,82
+82,2,70
+82,3,66
+82,4,6
+83,1,88
+83,2,59
+83,3,82
+83,4,7
+84,1,84
+84,2,84
+84,3,81
+84,4,7
+85,1,73
+85,2,81
+85,3,82
+85,4,7
+86,1,34
+86,2,69
+86,3,78
+86,4,2
+87,1,33
+87,2,55
+87,3,75
+87,4,4
+88,1,32
+88,2,55
+88,3,74
+88,4,4
+89,1,79
+89,2,80
+89,3,65
+89,4,6
+90,1,75
+90,2,73
+90,3,68
+90,4,5
+91,1,74
+91,2,55
+91,3,61
+91,4,6
+92,1,7
+92,2,5
+92,3,71
+92,4,2
+93,1,79
+93,2,33
+93,3,66
+93,4,5
+94,1,96
+94,2,21
+94,3,83
+94,4,6
+95,1,70
+95,2,42
+95,3,73
+95,4,6
+96,1,26
+96,2,79
+96,3,67
+96,4,5
+97,1,79
+97,2,31
+97,3,75
+97,4,5
+98,1,54
+98,2,72
+98,3,79
+98,4,2
+99,1,48
+99,2,61
+99,3,72
+99,4,2
+100,1,68
+100,2,78
+100,3,77
+100,4,5
+101,1,75
+101,2,74
+101,3,69
+101,4,4
+102,1,70
+102,2,87
+102,3,72
+102,4,6
+103,1,72
+103,2,86
+103,3,64
+103,4,6
+104,1,31
+104,2,72
+104,3,70
+104,4,6
+105,1,68
+105,2,66
+105,3,75
+105,4,5
+106,1,20
+106,2,26
+106,3,68
+106,4,3
+107,1,34
+107,2,47
+107,3,70
+107,4,3
+108,1,48
+108,2,51
+108,3,62
+108,4,5
+109,1,68
+109,2,61
+109,3,63
+109,4,5
+110,1,14
+110,2,42
+110,3,57
+110,4,2
+111,1,23
+111,2,23
+111,3,23
+111,4,3
+112,1,62
+112,2,54
+112,3,60
+112,4,4
+113,1,50
+113,2,55
+113,3,50
+113,4,2
+114,1,57
+114,2,73
+114,3,50
+114,4,3
+115,1,30
+115,2,67
+115,3,67
+115,4,4
+116,1,62
+116,2,55
+116,3,73
+116,4,3
+117,1,79
+117,2,66
+117,3,70
+117,4,5
+118,1,73
+118,2,78
+118,3,72
+118,4,6
+119,1,77
+119,2,35
+119,3,83
+119,4,5
+120,1,87
+120,2,21
+120,3,63
+120,4,4
+121,1,78
+121,2,45
+121,3,52
+121,4,4
+122,1,49
+122,2,80
+122,3,62
+122,4,5
+123,1,16
+123,2,76
+123,3,28
+123,4,3
+124,1,85
+124,2,86
+124,3,76
+124,4,7
+125,1,90
+125,2,70
+125,3,66
+125,4,7
+126,1,69
+126,2,78
+126,3,83
+126,4,6
+127,1,38
+127,2,88
+127,3,80
+127,4,6
+128,1,58
+128,2,40
+128,3,61
+128,4,4
+129,1,56
+129,2,43
+129,3,45
+129,4,5
+130,1,15
+130,2,13
+130,3,78
+130,4,3
+131,1,92
+131,2,71
+131,3,80
+131,4,7
+132,1,69
+132,2,90
+132,3,84
+132,4,7
+133,1,41
+133,2,26
+133,3,82
+133,4,5
+134,1,80
+134,2,66
+134,3,62
+134,4,5
+135,1,6
+135,2,80
+135,3,68
+135,4,2
+136,1,71
+136,2,72
+136,3,82
+136,4,6
+137,1,48
+137,2,80
+137,3,68
+137,4,5
+138,1,78
+138,2,44
+138,3,72
+138,4,5
+139,1,68
+139,2,68
+139,3,68
+139,4,5
+140,1,60
+140,2,36
+140,3,64
+140,4,3
+141,1,65
+141,2,40
+141,3,58
+141,4,3
+142,1,52
+142,2,55
+142,3,55
+142,4,3
+143,1,76
+143,2,72
+143,3,78
+143,4,6
+144,1,70
+144,2,85
+144,3,80
+144,4,6
+145,1,38
+145,2,63
+145,3,66
+145,4,5
+146,1,78
+146,2,56
+146,3,60
+146,4,5
+147,1,73
+147,2,56
+147,3,70
+147,4,5
+148,1,66
+148,2,87
+148,3,85
+148,4,7
+149,1,71
+149,2,69
+149,3,60
+149,4,5
+150,1,70
+150,2,48
+150,3,58
+150,4,4
+151,1,30
+151,2,55
+151,3,57
+151,4,3
+152,1,56
+152,2,65
+152,3,61
+152,4,4
+153,1,87
+153,2,89
+153,3,34
+153,4,3
+154,1,68
+154,2,47
+154,3,61
+154,4,3
+155,1,42
+155,2,69
+155,3,53
+155,4,3
+156,1,80
+156,2,62
+156,3,66
+156,4,5
+157,1,60
+157,2,40
+157,3,43
+157,4,3
+158,1,82
+158,2,56
+158,3,79
+158,4,6
+159,1,41
+159,2,92
+159,3,69
+159,4,5
+160,1,88
+160,2,66
+160,3,70
+160,4,6
+161,1,70
+161,2,76
+161,3,70
+161,4,5
+162,1,80
+162,2,50
+162,3,70
+162,4,5
+163,1,74
+163,2,93
+163,3,74
+163,4,7
+164,1,58
+164,2,94
+164,3,70
+164,4,6
+165,1,32
+165,2,50
+165,3,50
+165,4,3
+166,1,60
+166,2,67
+166,3,68
+166,4,4
+167,1,65
+167,2,48
+167,3,69
+167,4,5
+168,1,70
+168,2,90
+168,3,72
+168,4,6
+169,1,85
+169,2,53
+169,3,66
+169,4,5
+170,1,66
+170,2,69
+170,3,60
+170,4,4
+171,1,48
+171,2,44
+171,3,56
+171,4,3
+172,1,76
+172,2,53
+172,3,60
+172,4,5
+173,1,71
+173,2,56
+173,3,63
+173,4,5
+174,1,38
+174,2,76
+174,3,50
+174,4,4
+175,1,58
+175,2,59
+175,3,50
+175,4,4
+176,1,82
+176,2,71
+176,3,64
+176,4,6
+177,1,81
+177,2,65
+177,3,73
+177,4,6
+178,1,74
+178,2,76
+178,3,68
+178,4,5
+179,1,90
+179,2,12
+179,3,59
+179,4,5
+180,1,79
+180,2,44
+180,3,61
+180,4,5
+181,1,55
+181,2,92
+181,3,74
+181,4,5
+182,1,92
+182,2,2
+182,3,55
+182,4,4
+183,1,37
+183,2,77
+183,3,61
+183,4,4
+184,1,70
+184,2,57
+184,3,50
+184,4,5
+185,1,27
+185,2,61
+185,3,48
+185,4,4
+186,1,73
+186,2,89
+186,3,71
+186,4,7
+187,1,6
+187,2,8
+187,3,62
+187,4,1
+188,1,50
+188,2,92
+188,3,77
+188,4,6
+189,1,44
+189,2,52
+189,3,62
+189,4,5
+190,1,71
+190,2,58
+190,3,59
+190,4,6
+191,1,18
+191,2,60
+191,3,55
+191,4,3
+192,1,50
+192,2,58
+192,3,63
+192,4,4
+193,1,48
+193,2,74
+193,3,50
+193,4,2
+194,1,69
+194,2,93
+194,3,85
+194,4,7
+195,1,90
+195,2,79
+195,3,76
+195,4,7
+196,1,2
+196,2,83
+196,3,80
+196,4,5
+197,1,63
+197,2,78
+197,3,79
+197,4,7
+198,1,74
+198,2,70
+198,3,78
+198,4,7
+199,1,77
+199,2,62
+199,3,73
+199,4,6
+200,1,42
+200,2,35
+200,3,79
+200,4,4
+201,1,62
+201,2,41
+201,3,62
+201,4,4
+202,1,58
+202,2,50
+202,3,62
+202,4,3
+203,1,73
+203,2,93
+203,3,82
+203,4,8
+204,1,87
+204,2,75
+204,3,63
+204,4,5
+205,1,70
+205,2,72
+205,3,70
+205,4,5
+206,1,62
+206,2,52
+206,3,68
+206,4,6
+207,1,46
+207,2,70
+207,3,66
+207,4,4
+208,1,20
+208,2,60
+208,3,62
+208,4,5
+209,1,57
+209,2,68
+209,3,50
+209,4,3
+210,1,79
+210,2,81
+210,3,43
+210,4,3
+211,1,79
+211,2,75
+211,3,48
+211,4,3
+212,1,79
+212,2,89
+212,3,48
+212,4,3
+213,1,80
+213,2,77
+213,3,57
+213,4,3
+214,1,72
+214,2,68
+214,3,63
+214,4,3
+215,1,72
+215,2,74
+215,3,71
+215,4,6
+216,1,87
+216,2,72
+216,3,68
+216,4,6
+217,1,83
+217,2,51
+217,3,70
+217,4,6
+218,1,6
+218,2,95
+218,3,53
+218,4,3
+219,1,18
+219,2,73
+219,3,75
+219,4,5
+220,1,51
+220,2,78
+220,3,72
+220,4,5
+221,1,2
+221,2,62
+221,3,71
+221,4,2
+222,1,1
+222,2,91
+222,3,72
+222,4,2
+223,1,90
+223,2,80
+223,3,66
+223,4,3
+224,1,62
+224,2,73
+224,3,55
+224,4,4
+225,1,44
+225,2,68
+225,3,50
+225,4,4
+226,1,80
+226,2,76
+226,3,68
+226,4,4
+227,1,81
+227,2,72
+227,3,70
+227,4,4
+228,1,53
+228,2,48
+228,3,72
+228,4,4
+229,1,81
+229,2,80
+229,3,62
+229,4,4
+230,1,75
+230,2,43
+230,3,72
+230,4,4
+231,1,66
+231,2,52
+231,3,61
+231,4,4
+232,1,76
+232,2,48
+232,3,80
+232,4,4
+233,1,84
+233,2,57
+233,3,79
+233,4,4
+234,1,82
+234,2,53
+234,3,65
+234,4,4
+235,1,80
+235,2,43
+235,3,65
+235,4,4
+236,1,92
+236,2,45
+236,3,92
+236,4,6
+237,1,14
+237,2,86
+237,3,80
+237,4,3
+238,1,62
+238,2,92
+238,3,65
+238,4,6
+239,1,91
+239,2,32
+239,3,50
+239,4,5
+240,1,95
+240,2,42
+240,3,70
+240,4,5
+241,1,95
+241,2,30
+241,3,50
+241,4,4
+242,1,67
+242,2,51
+242,3,50
+242,4,3

pokedex/data/csv/conquest_warrior_ranks.csv

@@ -0,0 +1,243 @@
+id,warrior_id,rank,skill_id
+1,1,1,3
+2,1,2,24
+3,1,3,25
+4,2,1,3
+5,2,2,24
+6,2,3,25
+7,3,1,26
+8,3,2,27
+9,4,1,6
+10,4,2,28
+11,5,1,15
+12,5,2,29
+13,5,3,30
+14,6,1,4
+15,6,2,31
+16,7,1,5
+17,7,2,32
+18,8,1,8
+19,8,2,33
+20,9,1,10
+21,9,2,34
+22,10,1,7
+23,10,2,35
+24,11,1,4
+25,11,2,36
+26,12,1,4
+27,12,2,37
+28,13,1,5
+29,13,2,38
+30,14,1,5
+31,14,2,39
+32,15,1,17
+33,15,2,40
+34,16,1,8
+35,16,2,41
+36,17,1,13
+37,17,2,42
+38,18,1,15
+39,18,2,43
+40,19,1,8
+41,19,2,44
+42,20,1,13
+43,20,2,45
+44,21,1,14
+45,21,2,46
+46,22,1,11
+47,22,2,47
+48,23,1,13
+49,23,2,48
+50,24,1,11
+51,24,2,49
+52,25,1,18
+53,25,2,50
+54,26,1,7
+55,26,2,51
+56,27,1,10
+57,27,2,52
+58,28,1,4
+59,28,2,53
+60,29,1,6
+61,29,2,54
+62,30,1,15
+63,30,2,55
+64,31,1,18
+65,31,2,56
+66,32,1,16
+67,32,2,57
+68,33,1,14
+69,33,2,58
+70,34,1,10
+71,34,2,59
+72,35,1,7
+73,35,2,60
+74,36,1,11
+75,36,2,61
+76,37,1,16
+77,37,2,62
+78,38,1,14
+79,38,2,63
+80,39,1,19
+81,40,1,15
+82,41,1,7
+83,42,1,21
+84,43,1,8
+85,44,1,20
+86,45,1,19
+87,46,1,2
+88,47,1,20
+89,48,1,11
+90,49,1,16
+91,50,1,4
+92,51,1,9
+93,52,1,5
+94,53,1,14
+95,54,1,3
+96,55,1,21
+97,56,1,1
+98,57,1,6
+99,58,1,10
+100,59,1,18
+101,60,1,7
+102,61,1,13
+103,62,1,16
+104,63,1,17
+105,64,1,20
+106,65,1,19
+107,66,1,19
+108,67,1,17
+109,68,1,1
+110,69,1,10
+111,70,1,2
+112,71,1,22
+113,72,1,9
+114,73,1,13
+115,74,1,6
+116,75,1,3
+117,76,1,10
+118,77,1,8
+119,78,1,9
+120,79,1,21
+121,80,1,5
+122,81,1,2
+123,82,1,17
+124,83,1,11
+125,84,1,4
+126,85,1,4
+127,86,1,17
+128,87,1,2
+129,88,1,3
+130,89,1,22
+131,90,1,7
+132,91,1,1
+133,92,1,2
+134,93,1,9
+135,94,1,18
+136,95,1,8
+137,96,1,9
+138,97,1,21
+139,98,1,14
+140,99,1,16
+141,100,1,19
+142,101,1,22
+143,102,1,7
+144,103,1,2
+145,104,1,20
+146,105,1,2
+147,106,1,3
+148,107,1,14
+149,108,1,12
+150,109,1,5
+151,110,1,8
+152,111,1,23
+153,112,1,5
+154,113,1,5
+155,114,1,9
+156,115,1,10
+157,116,1,12
+158,117,1,7
+159,118,1,15
+160,119,1,17
+161,120,1,8
+162,121,1,17
+163,122,1,18
+164,123,1,14
+165,124,1,12
+166,125,1,10
+167,126,1,1
+168,127,1,2
+169,128,1,5
+170,129,1,1
+171,130,1,12
+172,131,1,17
+173,132,1,9
+174,133,1,20
+175,134,1,13
+176,135,1,11
+177,136,1,4
+178,137,1,21
+179,138,1,7
+180,139,1,23
+181,140,1,19
+182,141,1,14
+183,142,1,20
+184,143,1,22
+185,144,1,8
+186,145,1,22
+187,146,1,13
+188,147,1,15
+189,148,1,4
+190,149,1,7
+191,150,1,23
+192,151,1,3
+193,152,1,9
+194,153,1,15
+195,154,1,11
+196,155,1,22
+197,156,1,1
+198,157,1,21
+199,158,1,8
+200,159,1,23
+201,160,1,4
+202,161,1,16
+203,162,1,15
+204,163,1,23
+205,164,1,4
+206,165,1,13
+207,166,1,5
+208,167,1,19
+209,168,1,6
+210,169,1,21
+211,170,1,3
+212,171,1,10
+213,172,1,9
+214,173,1,3
+215,174,1,16
+216,175,1,18
+217,176,1,11
+218,177,1,19
+219,178,1,19
+220,179,1,23
+221,180,1,13
+222,181,1,20
+223,182,1,14
+224,183,1,10
+225,184,1,13
+226,185,1,20
+227,186,1,5
+228,187,1,15
+229,188,1,16
+230,189,1,20
+231,190,1,9
+232,191,1,3
+233,192,1,12
+234,193,1,12
+235,194,1,1
+236,195,1,18
+237,196,1,23
+238,197,1,15
+239,198,1,14
+240,199,1,7
+241,200,1,4
+242,201,1,6

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

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

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

pokedex/data/csv/conquest_warrior_stat_names.csv

@@ -0,0 +1,5 @@
+warrior_stat_id,local_language_id,name
+1,9,Power
+2,9,Wisdom
+3,9,Charisma
+4,9,Capacity

pokedex/data/csv/conquest_warrior_stats.csv

@@ -0,0 +1,5 @@
+id,identifier
+1,power
+2,wisdom
+3,charisma
+4,capacity

pokedex/data/csv/conquest_warrior_transformation.csv

@@ -0,0 +1,42 @@
+transformed_warrior_rank_id,is_automatic,required_link,completed_episode_id,current_episode_id,distant_warrior_id,female_warlord_count,pokemon_count,collection_type_id,warrior_count
+2,1,,,,,,,,
+3,0,80,,38,,,,,
+5,1,,,,,,,,
+6,0,80,,38,,,,,
+8,0,80,,2,,,,,
+10,0,55,,,,,,,
+12,0,60,,,,,,,
+13,0,70,,,,,,,
+15,0,65,,,,,,,
+17,0,60,,,22,,,,
+19,0,60,,,,,100,,
+21,0,70,8,,,,,,
+23,0,60,,,,,,,
+25,0,60,,,,,,4,
+27,0,75,6,,,,,,
+29,0,60,,30,,,,,
+31,0,75,15,,,,,,
+33,0,55,,,,,,,
+35,0,60,,,,,,,
+37,0,60,,,,,,8,
+39,0,60,,,,,,,
+41,0,70,,,,,,,50
+43,0,60,,,,,,,
+45,0,60,,,,,,,
+47,0,60,,,7,,,,
+49,0,60,,,,,,,
+51,0,60,,,,,,,
+53,0,60,,,,,,,
+55,0,65,,,,,,,
+57,0,60,,,,3,,,
+59,0,60,,,,,,,
+61,0,55,,,,,,,
+63,0,55,,,,,,,
+65,0,65,,,,,,,
+67,0,60,,,,,,,
+69,0,80,,,,,,,
+71,0,65,,,,,,,
+73,0,70,,,,,,,
+75,0,60,,,,,,,
+77,0,60,,,,,,,
+79,0,60,,,,,,,

pokedex/data/csv/conquest_warriors.csv

@@ -0,0 +1,202 @@
+id,identifier,gender_id,archetype_id
+1,player-m,2,
+2,player-f,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,13
+40,naoie,2,9
+41,harutaka,2,4
+42,takanobu,2,3
+43,naoshige,2,2
+44,ujisato,2,19
+45,chacha,1,15
+46,go,1,14
+47,hatsu,1,15
+48,kazumasu,2,23
+49,nagahide,2,2
+50,yoshitaka,2,17
+51,urakusai,2,19
+52,narimasa,2,3
+53,tomonori,2,30
+54,murashige,2,19
+55,masahide,2,9
+56,nagayoshi,2,6
+57,kitsuno,1,14
+58,gotoku,1,14
+59,hidenaga,2,5
+60,koroku,2,18
+61,takatora,2,11
+62,yoshitsugu,2,9
+63,yukinaga,2,20
+64,rikyu,2,19
+65,hideyori,2,6
+66,asahi,1,15
+67,kazutoyo,2,11
+68,nagayasu,2,7
+69,harunaga,2,10
+70,hideaki,2,12
+71,naka,1,29
+72,tatsuko,1,14
+73,maa,1,15
+74,chiyo,1,14
+75,hatsume,1,27
+76,nobuchika,2,11
+77,chikayasu,2,4
+78,morichika,2,6
+79,chikamasa,2,7
+80,norishige,2,4
+81,takayori,2,11
+82,tadasumi,2,12
+83,dosetsu,2,1
+84,shoun,2,3
+85,sorin,2,9
+86,sekiso,2,22
+87,akizane,2,19
+88,takatane,2,12
+89,kiyo,1,15
+90,motoharu,2,5
+91,takakage,2,8
+92,terumoto,2,5
+93,takeyoshi,2,17
+94,ekei,2,22
+95,takamoto,2,12
+96,sadatoshi,2,10
+97,hidemitsu,2,5
+98,toshimitsu,2,2
+99,shigemoto,2,4
+100,mitsutada,2,7
+101,yukimasa,2,10
+102,tadaoki,2,6
+103,fujitaka,2,30
+104,hiroko,1,15
+105,tadamoto,2,2
+106,tadatsune,2,7
+107,takahisa,2,1
+108,hisaaki,2,8
+109,masatoshi,2,7
+110,kanemori,2,8
+111,tokitaka,2,13
+112,sandayu,2,23
+113,morikiyo,2,23
+114,kashinkoji,2,13
+115,yasunaga,2,24
+116,seikuro,2,25
+117,katsuyori,2,5
+118,haruyuki,2,9
+119,masakage,2,3
+120,masatoyo,2,1
+121,nobufusa,2,4
+122,masayuki,2,2
+123,yukitaka,2,1
+124,ume,1,15
+125,chiyome,1,26
+126,kei,1,14
+127,kagetsuna,2,9
+128,shigezane,2,3
+129,tsunamoto,2,1
+130,tsunenaga,2,17
+131,munetoki,2,7
+132,munezane,2,8
+133,yoshi,1,26
+134,iroha,1,14
+135,kagekatsu,2,3
+136,yoshikiyo,2,2
+137,tomonobu,2,5
+138,kageie,2,3
+139,takahiro,2,6
+140,sadamitsu,2,13
+141,yataro,2,7
+142,saneyori,2,13
+143,hana,1,14
+144,sen,1,15
+145,ujichika,2,30
+146,ujizane,2,30
+147,sessai,2,22
+148,masatsuna,2,4
+149,yasutomo,2,5
+150,ujihiro,2,10
+151,motozane,2,10
+152,sena,1,26
+153,soun,2,1
+154,tsunashige,2,2
+155,genan,2,22
+156,ujimasa,2,4
+157,ujiteru,2,6
+158,ujikuni,2,5
+159,ujinao,2,8
+160,shizuka,1,14
+161,madoka,1,14
+162,dosan,2,20
+163,yoshitatsu,2,3
+164,ittetsu,2,5
+165,bokuzen,2,8
+166,morinari,2,12
+167,omi,1,15
+168,asa,1,15
+169,shimoyama,2,25
+170,genba,2,24
+171,danzo,2,25
+172,yazaemon,2,24
+173,isuke,2,24
+174,tadatsugu,2,1
+175,naomasa,2,3
+176,yasumasa,2,3
+177,masanobu,2,9
+178,hidetada,2,6
+179,kazumasa,2,9
+180,choan,2,20
+181,tenkai,2,22
+182,munenori,2,4
+183,kame,1,27
+184,toku,1,15
+185,saizo,2,23
+186,sasuke,2,25
+187,katsu,1,27
+188,juzo,2,24
+189,tsuru,1,14
+190,ise,1,27
+191,jinpachi,2,17
+192,kamanosuke,2,18
+193,seikai,2,18
+194,isa,2,18
+195,yoshiteru,2,30
+196,yoshiaki,2,30
+197,hisahide,2,2
+198,jubei,2,4
+199,nobutsuna,2,2
+200,bokuden,2,2
+201,otsu,1,27

pokedex/data/csv/genders.csv

@@ -0,0 +1,4 @@
+id,identifier
+1,female
+2,male
+3,genderless

pokedex/data/csv/pokedex_prose.csv

@@ -8,3 +8,4 @@ pokedex_id,local_language_id,name,description
 7,9,Updated Johto,"HeartGold/SoulSilver Johto dex—Gold/Silver/Crystal's, extended to add move-based Generation IV evolutions"
 8,9,Original Unova,Black/White Unova dex
 9,9,Updated Unova,Black 2/White 2 Unova dex
+11,9,Gallery,Pokémon Conquest gallery order

pokedex/data/csv/pokedexes.csv

@@ -1,10 +1,11 @@
-id,region_id,identifier
-1,,national
-2,1,kanto
-3,2,original-johto
-4,3,hoenn
-5,4,original-sinnoh
-6,4,extended-sinnoh
-7,2,updated-johto
-8,5,original-unova
-9,5,updated-unova
+id,region_id,identifier,is_main_series
+1,,national,1
+2,1,kanto,1
+3,2,original-johto,1
+4,3,hoenn,1
+5,4,original-sinnoh,1
+6,4,extended-sinnoh,1
+7,2,updated-johto,1
+8,5,original-unova,1
+9,5,updated-unova,1
+11,,conquest-gallery,0

pokedex/data/csv/pokemon_evolution.csv

@@ -1,4 +1,4 @@
-id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender,location_id,held_item_id,time_of_day,known_move_id,minimum_happiness,minimum_beauty,relative_physical_stats,party_species_id,trade_species_id
+id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_id,location_id,held_item_id,time_of_day,known_move_id,minimum_happiness,minimum_beauty,relative_physical_stats,party_species_id,trade_species_id
 1,2,1,,16,,,,,,,,,,
 2,3,1,,32,,,,,,,,,,
 3,5,1,,16,,,,,,,,,,
@@ -205,9 +205,9 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender,
 204,407,3,107,,,,,,,,,,,
 205,409,1,,30,,,,,,,,,,
 206,411,1,,30,,,,,,,,,,
-207,413,1,,20,female,,,,,,,,,
-208,414,1,,20,male,,,,,,,,,
-209,416,1,,21,female,,,,,,,,,
+207,413,1,,20,1,,,,,,,,,
+208,414,1,,20,2,,,,,,,,,
+209,416,1,,21,1,,,,,,,,,
 210,419,1,,26,,,,,,,,,,
 211,421,1,,25,,,,,,,,,,
 212,423,1,,30,,,,,,,,,,
@@ -241,10 +241,10 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender,
 240,472,1,,,,,304,night,,,,,,
 241,473,1,,,,,,,246,,,,,
 242,474,2,,,,,301,,,,,,,
-243,475,3,109,,male,,,,,,,,,
+243,475,3,109,,2,,,,,,,,,
 244,476,1,,,,10,,,,,,,,
 245,477,2,,,,,302,,,,,,,
-246,478,3,109,,female,,,,,,,,,
+246,478,3,109,,1,,,,,,,,,
 247,496,1,,17,,,,,,,,,,
 248,497,1,,36,,,,,,,,,,
 249,499,1,,17,,,,,,,,,,

pokedex/db/markdown.py

@@ -101,8 +101,24 @@ def _markdownify_effect_text(move, effect_text, language=None):
         unicode(move.effect_chance),
     )
 
+    # "The target" vs "each target"; for Conquest, but hopefully main series
+    # moves too eventually
+    if hasattr(move, 'range'):
+        effect_text = effect_text.replace(
+            u'$target',
+            _target_labels[move.range.targets > 1]
+        ).replace(
+            u'$Target',
+            _target_labels[move.range.targets > 1].capitalize()
+        )
+
     return MarkdownString(effect_text, session, language)
 
+_target_labels = {
+    False: 'the target',
+    True: 'each target'
+}
+
 class MoveEffectProperty(object):
     """Property that wraps move effects.  Used like this:
 
@@ -117,15 +133,17 @@ class MoveEffectProperty(object):
     Use `MoveEffectPropertyMap` for dict-like association proxies.
     """
 
-    def __init__(self, effect_column):
+    def __init__(self, effect_column, relationship='move_effect'):
         self.effect_column = effect_column
+        self.relationship = relationship
 
     def __get__(self, obj, cls):
         if obj is None:
             return self
         if obj.move_effect is None:
             return None
-        prop = getattr(obj.move_effect, self.effect_column)
+        thing = getattr(obj, self.relationship)
+        prop = getattr(thing, self.effect_column)
         return _markdownify_effect_text(obj, prop)
 
 class MoveEffectPropertyMap(MoveEffectProperty):

pokedex/db/tables.py

@@ -217,6 +217,407 @@ class BerryFlavor(TableBase):
     flavor = Column(Integer, nullable=False,
         info=dict(description="The level of the flavor in the berry"))
 
+class ConquestEpisode(TableBase):
+    u"""An episode from Pokémon Conquest: one of a bunch of mini-stories
+    featuring a particular warrior.
+
+    The main story, "The Legend of Ransei", also counts, even though it's not
+    in the episode select menu and there's no way to replay it.
+    """
+    __tablename__ = 'conquest_episodes'
+    __singlename__ = 'episode'
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(description=u'An ID for this episode.'))
+    identifier = Column(Unicode(30), nullable=False,
+        info=dict(description=u'A readable identifier for this episode.', format='identifier'))
+
+create_translation_table('conquest_episode_names', ConquestEpisode, 'names',
+    relation_lazy='joined',
+    name=Column(Unicode(30), nullable=False, index=True,
+        info=dict(description='The name.', format='plaintext', official=True))
+)
+
+class ConquestEpisodeWarrior(TableBase):
+    u"""A warrior featured in an episode in Pokémon Conquest.
+
+    This needs its own table because of the player having two episodes and
+    there being two players.
+    """
+    __tablename__ = 'conquest_episode_warriors'
+    episode_id = Column(Integer, ForeignKey('conquest_episodes.id'), primary_key=True,
+        info=dict(description=u'The ID of the episode.'))
+    warrior_id = Column(Integer, ForeignKey('conquest_warriors.id'), primary_key=True,
+        info=dict(description=u'The ID of the warrior.'))
+
+class ConquestKingdom(TableBase):
+    u"""A kingdom in Pokémon Conquest.
+    """
+    __tablename__ = 'conquest_kingdoms'
+    __singlename__ = 'kingdom'
+    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'))
+    type_id = Column(Integer, ForeignKey('types.id'), nullable=False,
+        info=dict(description="The type associated with this kingdom in-game."))
+
+create_translation_table('conquest_kingdom_names', ConquestKingdom, 'names',
+    relation_lazy='joined',
+    name=Column(Unicode(9), nullable=False, index=True,
+        info=dict(description='The name.', format='plaintext', official=True))
+)
+
+class ConquestMaxLink(TableBase):
+    u"""The maximum link a warrior rank can reach with a Pokémon in Pokémon
+    Conquest.
+    """
+    __tablename__ = 'conquest_max_links'
+    warrior_rank_id = Column(Integer, ForeignKey('conquest_warrior_ranks.id'), primary_key=True,
+        info=dict(description="The ID of the warrior rank."))
+    pokemon_species_id = Column(Integer, ForeignKey('pokemon_species.id'), primary_key=True,
+        info=dict(description='The ID of the Pokémon species.'))
+    max_link = Column(Integer, nullable=False,
+        info=dict(description='The maximum link percentage this warrior rank and Pokémon can reach.'))
+
+class ConquestMoveData(TableBase):
+    u"""Data about a move in Pokémon Conquest.
+    """
+    __tablename__ = 'conquest_move_data'
+    move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, autoincrement=False,
+        info=dict(description=u'The ID of the move.'))
+    power = Column(Integer, nullable=True,
+        info=dict(description=u"The move's power, null if it does no damage."))
+    accuracy = Column(Integer, nullable=True,
+        info=dict(description=u"The move's base accuracy, null if it is self-targetted or never misses."))
+    effect_chance = Column(Integer, nullable=True,
+        info=dict(description=u"The chance as a percentage that the move's secondary effect will trigger."))
+    effect_id = Column(Integer, ForeignKey('conquest_move_effects.id'), nullable=False,
+        info=dict(description=u"The ID of the move's effect."))
+    range_id = Column(Integer, ForeignKey('conquest_move_ranges.id'), nullable=False,
+        info=dict(description=u"The ID of the move's range."))
+    displacement_id = Column(Integer, ForeignKey('conquest_move_displacements.id'), nullable=True,
+        info=dict(description=u"The ID of the move's displacement."))
+
+    @property
+    def star_rating(self):
+        """Return the move's in-game power rating as a number of stars."""
+        if not self.power:
+            return 0
+        else:
+            stars = (self.power - 1) // 10
+            stars = min(stars, 5)  # i.e. maximum of 5 stars
+            stars = max(stars, 1)  # And minimum of 1
+            return stars
+
+class ConquestMoveEffect(TableBase):
+    u"""An effect moves can have in Pokémon Conquest.
+    """
+    __tablename__ = 'conquest_move_effects'
+    __singlename__ = 'conquest_move_effect'
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(description=u'An ID for this effect.'))
+
+create_translation_table('conquest_move_effect_prose', ConquestMoveEffect, 'prose',
+    short_effect = Column(Unicode(256), nullable=True,
+        info=dict(description="A short summary of the effect", format='markdown')),
+    effect = Column(Unicode(5120), nullable=True,
+        info=dict(description="A detailed description of the effect", format='markdown')),
+)
+
+class ConquestMoveRange(TableBase):
+    u"""A set of tiles moves can target in Pokémon Conquest."""
+    __tablename__ = 'conquest_move_ranges'
+    __singlename__ = 'conquest_move_range'
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(description=u'An ID for this range.'))
+    identifier = Column(Unicode(16), nullable=False,
+        info=dict(description=u'A readable identifier for this range.'))
+    targets = Column(Integer, nullable=False,
+        info=dict(description=u'The number of tiles this range targets.'))
+
+create_translation_table('conquest_move_range_prose', ConquestMoveRange, 'prose',
+    name = Column(Unicode(20), nullable=True,
+        info=dict(description="A short name briefly describing the range", format='plaintext')),
+    description = Column(Unicode(256), nullable=True,
+        info=dict(description="A detailed description of the range", format='plaintext')),
+)
+
+class ConquestMoveDisplacement(TableBase):
+    u"""A way in which a move can cause the user or target to move to a
+    different tile.
+
+    If a move displaces its user, the move's range is relative to the user's
+    original position.
+    """
+    __tablename__ = 'conquest_move_displacements'
+    __singlename__ = 'move_displacement'
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(description=u'An ID for this displacement.'))
+    identifier = Column(Unicode(18), nullable=False,
+        info=dict(description=u'A readable identifier for this displacement.'))
+    affects_target = Column(Boolean, nullable=False,
+        info=dict(description=u'True iff the move displaces its target(s) and not its user.'))
+
+create_translation_table('conquest_move_displacement_prose', ConquestMoveDisplacement, 'prose',
+    name = Column(Unicode(20), nullable=True,
+        info=dict(description='A name for the displacement.', format='plaintext')),
+    short_effect = Column(Unicode(128), nullable=True,
+        info=dict(description="A short summary of how the displacement works, to be used in the move's short effect.", format='markdown')),
+    effect = Column(Unicode(256), nullable=True,
+        info=dict(description="A detailed description of how the displacement works, to be used alongside the move's long effect.", format='markdown')),
+)
+
+class ConquestPokemonAbility(TableBase):
+    u"""An ability a Pokémon species has in Pokémon Conquest.
+    """
+    __tablename__ = 'conquest_pokemon_abilities'
+    pokemon_species_id = Column(Integer, ForeignKey('pokemon_species.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u'The ID of the Pokémon species with this ability.'))
+    slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u"The order abilities are listed in.  Upon evolution, if a Pokémon's abilities change, it will receive the one in the same slot."))
+    ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False,
+        info=dict(description=u'The ID of the ability.'))
+
+class ConquestPokemonEvolution(TableBase):
+    u"""The conditions under which a Pokémon must successfully complete an
+    action to evolve in Pokémon Conquest.
+
+    Any condition may be null if it does not apply for a particular Pokémon.
+    """
+    __tablename__ = 'conquest_pokemon_evolution'
+    evolved_species_id = Column(Integer, ForeignKey('pokemon_species.id'), primary_key=True, nullable=False,
+        info=dict(description=u"The ID of the post-evolution species."))
+    required_stat_id = Column(Integer, ForeignKey('conquest_stats.id'), nullable=True,
+        info=dict(description=u"The ID of the stat which minimum_stat applies to."))
+    minimum_stat = Column(Integer, nullable=True,
+        info=dict(description=u"The minimum value the Pokémon must have in a particular stat."))
+    minimum_link = Column(Integer, nullable=True,
+        info=dict(description=u"The minimum link percentage the Pokémon must have with its warrior."))
+    kingdom_id = Column(Integer, ForeignKey('conquest_kingdoms.id'), nullable=True,
+        info=dict(description=u"The ID of the kingdom in which this Pokémon must complete an action after meeting all other requirements."))
+    warrior_gender_id = Column(Integer, ForeignKey('genders.id'), nullable=True,
+        info=dict(description=u"The ID of the gender the Pokémon's warrior must be."))
+    item_id = Column(Integer, ForeignKey('items.id'), nullable=True,
+        info=dict(description=u"The ID of the item the Pokémon's warrior must have equipped."))
+    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 ConquestPokemonMove(TableBase):
+    u"""A Pokémon's move in Pokémon Conquest.
+
+    Yes, "move"; each Pokémon has exactly one.
+    """
+    __tablename__ = 'conquest_pokemon_moves'
+    pokemon_species_id = Column(Integer, ForeignKey('pokemon_species.id'), primary_key=True, autoincrement=False,
+        info=dict(description=u'The ID of the Pokémon species.'))
+    move_id = Column(Integer, ForeignKey('moves.id'), nullable=False,
+        info=dict(description=u'The ID of the move.'))
+
+class ConquestPokemonStat(TableBase):
+    u"""A Pokémon's base stat in Pokémon Conquest.
+
+    The main four base stats in Conquest are derived from level 100 stats in
+    the main series (ignoring effort, genes, and natures).  Attack matches
+    either Attack or Special Attack, and Defense matches the average of Defense
+    and Special Defense.  HP and Speed are the same.
+    """
+    __tablename__ = 'conquest_pokemon_stats'
+    pokemon_species_id = Column(Integer, ForeignKey('pokemon_species.id'), primary_key=True, autoincrement=False,
+        info=dict(description=u'The ID of the Pokémon species.'))
+    conquest_stat_id = Column(Integer, ForeignKey('conquest_stats.id'), primary_key=True, autoincrement=False,
+        info=dict(description=u'The ID of the stat.'))
+    base_stat = Column(Integer, nullable=False,
+        info=dict(description=u'The base stat.'))
+
+class ConquestStat(TableBase):
+    u"""A stat Pokémon have in Pokémon Conquest.
+    """
+    __tablename__ = 'conquest_stats'
+    __singlename__ = 'conquest_stat'  # To be safe
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(desription=u'An ID for this stat.'))
+    identifier = Column(Unicode(7), nullable=False,
+        info=dict(description=u'A readable identifier for this stat.', format='identifier'))
+    is_base = Column(Boolean, nullable=False,
+        info=dict(description=u'True iff this is one of the main stats, calculated for individual Pokémon.'))
+
+create_translation_table('conquest_stat_names', ConquestStat, 'names',
+    relation_lazy='joined',
+    name=Column(Unicode(10), nullable=False, index=True,
+        info=dict(description='The name.', format='plaintext', official=True))
+)
+
+class ConquestTransformationPokemon(TableBase):
+    u"""A Pokémon that satisfies a warrior transformation's link condition.
+
+    If a warrior has one or more Pokémon listed here, they only need to raise
+    one of them to the required link.
+    """
+    __tablename__ = 'conquest_transformation_pokemon'
+    transformation_id = Column(Integer, ForeignKey('conquest_warrior_transformation.transformed_warrior_rank_id'), primary_key=True,
+        info=dict(description=u'The ID of the corresponding transformation, in turn a warrior rank ID.'))
+    pokemon_species_id = Column(Integer, ForeignKey('pokemon_species.id'), primary_key=True,
+        info=dict(description=u'The ID of the Pokémon species.'))
+
+class ConquestTransformationWarrior(TableBase):
+    u"""A warrior who must be present in the same nation as another warrior for
+    the latter to transform into their next rank.
+
+    If a warrior has one or more other warriors listed here, they *all* need to
+    gather in the same nation for the transformation to take place.
+    """
+    __tablename__ = 'conquest_transformation_warriors'
+    transformation_id = Column(Integer, ForeignKey('conquest_warrior_transformation.transformed_warrior_rank_id'), primary_key=True,
+        info=dict(description=u'The ID of the corresponding transformation, in turn a warrior rank ID.'))
+    present_warrior_id = Column(Integer, ForeignKey('conquest_warriors.id'), primary_key=True,
+        info=dict(description=u'The ID of the other warrior who must be present.'))
+
+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(10), 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."))
+    archetype_id = Column(Integer, ForeignKey('conquest_warrior_archetypes.id'), nullable=True,
+        info=dict(description="The ID of this warrior's archetype.  Null for unique warriors."))
+
+create_translation_table('conquest_warrior_names', ConquestWarrior, 'names',
+    relation_lazy='joined',
+    name=Column(Unicode(10), nullable=False, index=True,
+        info=dict(description='The name.', format='plaintext', official=True))
+)
+
+class ConquestWarriorArchetype(TableBase):
+    u"""An archetype that generic warriors in Pokémon Conquest can have.  All
+    warriors of a particular archetype share sprites and dialogue.
+
+    Some of these are unused as warriors because they exist only as NPCs.  They
+    should still be kept because we have their sprites and may eventually get
+    their dialogue.
+    """
+    __tablename__ = 'conquest_warrior_archetypes'
+    __singlename__ = 'archetype'
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(description='An ID for this archetype.'))
+    identifier = Column(Unicode(15), nullable=False,
+        info=dict(description='A readable identifier describing this archetype.', format='identifier'))
+
+class ConquestWarriorRank(TableBase):
+    u"""A warrior at a particular 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'
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(description=u'An ID for this warrior rank.'))
+    warrior_id = Column(Integer, ForeignKey('conquest_warriors.id'), nullable=False,
+        info=dict(description=u'The ID of the warrior.'))
+    rank = Column(Integer, 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."))
+
+    __table_args__ = (
+        UniqueConstraint(warrior_id, rank),
+        {},
+    )
+
+class ConquestWarriorRankStatMap(TableBase):
+    u"""Any of a warrior rank's warrior stats in Pokémon Conquest."""
+    __tablename__ = 'conquest_warrior_rank_stat_map'
+    warrior_rank_id = Column(Integer, ForeignKey('conquest_warrior_ranks.id'), primary_key=True, autoincrement=False,
+        info=dict(description=u'The ID of the warrior rank.'))
+    warrior_stat_id = Column(Integer, ForeignKey('conquest_warrior_stats.id'), primary_key=True, autoincrement=False,
+        info=dict(description=u'The ID of the warrior stat.'))
+    base_stat = Column(Integer, nullable=False,
+        info=dict(description=u'The stat.'))
+
+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 ConquestWarriorStat(TableBase):
+    u"""A stat that warriors have in Pokémon Conquest."""
+    __tablename__ = 'conquest_warrior_stats'
+    __singlename__ = 'warrior_stat'
+    id = Column(Integer, primary_key=True, autoincrement=True,
+        info=dict(description=u'An ID for this stat.'))
+    identifier = Column(Unicode(8), nullable=False,
+        info=dict(description=u'A readable identifier for this stat.'))
+
+create_translation_table('conquest_warrior_stat_names', ConquestWarriorStat, 'names',
+    relation_lazy='joined',
+    name=Column(Unicode(15), nullable=False, index=True,
+        info=dict(description='The name.', format='plaintext', official=True))
+)
+
+class ConquestWarriorTransformation(TableBase):
+    u"""The conditions under which a warrior must perform an action in order
+    to transform to the next rank.
+
+    Or most of them, anyway.  See also ConquestTransformationPokemon and
+    ConquestTransformationWarrior.
+    """
+    __tablename__ = 'conquest_warrior_transformation'
+    transformed_warrior_rank_id = Column(Integer, ForeignKey('conquest_warrior_ranks.id'), primary_key=True,
+        info=dict(description=u'The ID of the post-transformation warrior rank.'))
+    is_automatic = Column(Boolean, nullable=False,
+        info=dict(description=u'True iff the transformation happens automatically in the story with no further requirements.'))
+    required_link = Column(Integer, nullable=True,
+        info=dict(description=u'The link percentage the warrior must reach with one of several specific Pokémon, if any.'))
+    completed_episode_id = Column(Integer, ForeignKey('conquest_episodes.id'), nullable=True,
+        info=dict(description=u'The ID of the episode the player must have completed, if any.'))
+    current_episode_id = Column(Integer, ForeignKey('conquest_episodes.id'), nullable=True,
+        info=dict(description=u'The ID of the episode the player must currently be playing, if any.'))
+    distant_warrior_id = Column(Integer, ForeignKey('conquest_warriors.id'), nullable=True,
+        info=dict(description=u'The ID of another warrior who must be in the army, but not in the same kingdom or in any adjacent kingdom.'))
+    female_warlord_count = Column(Integer, nullable=True,
+        info=dict(description=u'The number of female warlords who must be in the same nation.'))
+    pokemon_count = Column(Integer, nullable=True,
+        info=dict(description=u'The number of Pokémon that must be registered in the gallery.'))
+    collection_type_id = Column(Integer, ForeignKey('types.id'), nullable=True,
+        info=dict(description=u'The ID of a type all Pokémon of which must be registered in the gallery.'))
+    warrior_count = Column(Integer, nullable=True,
+        info=dict(description=u'The number of warriors that must be registered in the gallery.'))
+
 class ContestCombo(TableBase):
     u"""Combo of two moves in a Contest.
     """
@@ -438,6 +839,16 @@ class Experience(TableBase):
     experience = Column(Integer, nullable=False,
         info=dict(description="The number of EXP points needed to get to that level"))
 
+class Gender(TableBase):
+    u"""A gender.
+    """
+    __tablename__ = 'genders'
+    __singlename__ = 'gender'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=True,
+        info=dict(description='An ID for this gender.'))
+    identifier = Column(Unicode(10), nullable=False,
+        info=dict(description='A readable identifier for this gender.'))
+
 class Generation(TableBase):
     u"""A Generation of the Pokémon franchise
     """
@@ -1079,6 +1490,8 @@ class Pokedex(TableBase):
         info=dict(description=u"ID of the region this Pokédex is used in, or None if it's global"))
     identifier = Column(Unicode(16), nullable=False,
         info=dict(description=u"An identifier", format='identifier'))
+    is_main_series = Column(Boolean, nullable=False,
+        info=dict(description=u'True if this Pokédex appears in the main series.'))
 
 create_translation_table('pokedex_prose', Pokedex, 'prose',
     relation_lazy='joined',
@@ -1226,8 +1639,8 @@ class PokemonEvolution(TableBase):
         info=dict(description=u"The ID of the item that must be used on the Pokémon."))
     minimum_level = Column(Integer, nullable=True,
         info=dict(description=u"The minimum level for the Pokémon."))
-    gender = Column(Enum('male', 'female', name='pokemon_evolution_gender'), nullable=True,
-        info=dict(description=u"The Pokémon's required gender, or None if gender doesn't matter"))
+    gender_id = Column(Integer, ForeignKey('genders.id'), nullable=True,
+        info=dict(description=u"The ID of the Pokémon's required gender, or None if gender doesn't matter"))
     location_id = Column(Integer, ForeignKey('locations.id'), nullable=True,
         info=dict(description=u"The ID of the location the evolution must be triggered at."))
     held_item_id = Column(Integer, ForeignKey('items.id'), nullable=True,
@@ -1448,6 +1861,8 @@ class PokemonSpecies(TableBase):
         info=dict(description=u"True iff a particular individual of this species can switch beween its different forms."))
     order = Column(Integer, nullable=False, index=True,
         info=dict(description=u'The order in which species should be sorted.  Based on National Dex order, except families are grouped together and sorted by stage.'))
+    conquest_order = Column(Integer, nullable=True, index=True,
+        info=dict(description=u'The order in which species should be sorted for Pokémon Conquest-related tables.  Matches gallery order.'))
 
 create_translation_table('pokemon_species_names', PokemonSpecies, 'names',
     relation_lazy='joined',
@@ -1702,6 +2117,114 @@ Berry.natural_gift_type = relationship(Type, innerjoin=True)
 BerryFlavor.contest_type = relationship(ContestType, innerjoin=True)
 
 
+ConquestEpisode.warriors = relationship(ConquestWarrior,
+    secondary=ConquestEpisodeWarrior.__table__,
+    innerjoin=True,
+    backref='episodes')
+
+ConquestKingdom.type = relationship(Type,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref=backref('conquest_kingdom', uselist=False))
+
+ConquestMaxLink.pokemon = relationship(PokemonSpecies,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref=backref('conquest_max_links', lazy='dynamic',
+                    order_by=ConquestMaxLink.warrior_rank_id))
+ConquestMaxLink.warrior_rank = relationship(ConquestWarriorRank,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref=backref('max_links', lazy='dynamic'))
+ConquestMaxLink.warrior = association_proxy('warrior_rank', 'warrior')
+
+ConquestMoveData.move_displacement = relationship(ConquestMoveDisplacement,
+    uselist=False,
+    backref='move_data')
+ConquestMoveData.move = relationship(Move,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref=backref('conquest_data', uselist=False))
+ConquestMoveData.move_effect = relationship(ConquestMoveEffect,
+    innerjoin=True, lazy='joined',
+    backref='move_data')
+ConquestMoveData.range = relationship(ConquestMoveRange,
+    innerjoin=True, lazy='joined',
+    backref='move_data')
+
+ConquestMoveData.effect = markdown.MoveEffectProperty('effect')
+ConquestMoveData.effect_map = markdown.MoveEffectPropertyMap('effect_map')
+ConquestMoveData.short_effect = markdown.MoveEffectProperty('short_effect')
+ConquestMoveData.short_effect_map = markdown.MoveEffectPropertyMap('short_effect_map')
+ConquestMoveData.displacement = markdown.MoveEffectProperty('effect', relationship='move_displacement')
+
+ConquestPokemonEvolution.gender = relationship(Gender,
+    backref='conquest_evolutions')
+ConquestPokemonEvolution.item = relationship(Item,
+    backref='conquest_evolutions')
+ConquestPokemonEvolution.kingdom = relationship(ConquestKingdom,
+    backref='evolutions')
+ConquestPokemonEvolution.stat = relationship(ConquestStat,
+    backref='evolutions')
+
+ConquestPokemonStat.pokemon = relationship(PokemonSpecies,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref='conquest_stats')
+ConquestPokemonStat.stat = relationship(ConquestStat,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref='pokemon_stats')
+
+ConquestWarrior.archetype = relationship(ConquestWarriorArchetype,
+    uselist=False,
+    backref=backref('warriors'))
+ConquestWarrior.ranks = relationship(ConquestWarriorRank,
+    order_by=ConquestWarriorRank.rank,
+    innerjoin=True,
+    backref=backref('warrior', uselist=False))
+ConquestWarrior.types = relationship(Type,
+    secondary=ConquestWarriorSpecialty.__table__,
+    order_by=ConquestWarriorSpecialty.slot,
+    innerjoin=True,
+    backref='conquest_warriors')
+
+ConquestWarriorRank.skill = relationship(ConquestWarriorSkill,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref=backref('warrior_ranks', order_by=ConquestWarriorRank.id))
+ConquestWarriorRank.stats = relationship(ConquestWarriorRankStatMap,
+    innerjoin=True,
+    order_by=ConquestWarriorRankStatMap.warrior_stat_id,
+    backref=backref('warrior_rank', uselist=False, innerjoin=True, lazy='joined'))
+
+ConquestWarriorRankStatMap.stat = relationship(ConquestWarriorStat,
+    innerjoin=True, lazy='joined',
+    uselist=False,
+    backref='stat_map')
+
+ConquestWarriorTransformation.completed_episode = relationship(ConquestEpisode,
+    primaryjoin=ConquestWarriorTransformation.completed_episode_id==ConquestEpisode.id,
+    uselist=False)
+ConquestWarriorTransformation.current_episode = relationship(ConquestEpisode,
+    primaryjoin=ConquestWarriorTransformation.current_episode_id==ConquestEpisode.id,
+    uselist=False)
+ConquestWarriorTransformation.distant_warrior = relationship(ConquestWarrior,
+    uselist=False)
+ConquestWarriorTransformation.pokemon = relationship(PokemonSpecies,
+    secondary=ConquestTransformationPokemon.__table__,
+    order_by=PokemonSpecies.conquest_order)
+ConquestWarriorTransformation.present_warriors = relationship(ConquestWarrior,
+    secondary=ConquestTransformationWarrior.__table__,
+    order_by=ConquestWarrior.id)
+ConquestWarriorTransformation.type = relationship(Type,
+    uselist=False)
+ConquestWarriorTransformation.warrior_rank = relationship(ConquestWarriorRank,
+    uselist=False,
+    innerjoin=True, lazy='joined',
+    backref=backref('transformation', uselist=False, innerjoin=True))
+
+
 ContestCombo.first = relationship(Move,
     primaryjoin=ContestCombo.first_move_id==Move.id,
     innerjoin=True, lazy='joined',
@@ -1863,7 +2386,7 @@ Move.target = relationship(MoveTarget,
     innerjoin=True,
     backref='moves')
 Move.type = relationship(Type,
-    innerjoin=True,
+    innerjoin=True, lazy='joined',
     backref='moves')
 
 Move.effect = markdown.MoveEffectProperty('effect')
@@ -2028,6 +2551,8 @@ PokemonEvolution.party_species = relationship(PokemonSpecies,
     backref='triggered_evolutions')
 PokemonEvolution.trade_species = relationship(PokemonSpecies,
     primaryjoin=PokemonEvolution.trade_species_id==PokemonSpecies.id)
+PokemonEvolution.gender = relationship(Gender,
+    backref='required_for_evolutions')
 
 PokemonForm.pokemon = relationship(Pokemon,
     primaryjoin=PokemonForm.pokemon_id==Pokemon.id,
@@ -2136,6 +2661,19 @@ PokemonSpecies.pal_park = relationship(PalPark,
     uselist=False,
     backref='species')
 
+PokemonSpecies.conquest_abilities = relationship(Ability,
+    secondary=ConquestPokemonAbility.__table__,
+    order_by=ConquestPokemonAbility.slot,
+    backref=backref('conquest_pokemon', order_by=PokemonSpecies.conquest_order,
+                    innerjoin=True))
+PokemonSpecies.conquest_move = relationship(Move,
+    secondary=ConquestPokemonMove.__table__,
+    uselist=False,
+    backref=backref('conquest_pokemon', order_by=PokemonSpecies.conquest_order))
+PokemonSpecies.conquest_evolution = relationship(ConquestPokemonEvolution,
+    uselist=False,
+    backref=backref('evolved_species', innerjoin=True, lazy='joined', uselist=False))
+
 PokemonSpeciesFlavorText.version = relationship(Version, innerjoin=True, lazy='joined')
 PokemonSpeciesFlavorText.language = relationship(Language, innerjoin=True, lazy='joined')
 

pokedex/lookup.py

@@ -87,6 +87,9 @@ _table_order = dict(
     types=5,
     locations=6,
     natures=7,
+    conquest_warriors=8,
+    conquest_warrior_skills=9,
+    conquest_kingdoms=10,
 )
 def _table_facet_impl(searcher, docnum):
     u"""Implements a sort that puts different "types" of results in a
@@ -116,6 +119,10 @@ class PokedexLookup(object):
             tables.PokemonSpecies,
             tables.PokemonForm,
             tables.Type,
+
+            tables.ConquestKingdom,
+            tables.ConquestWarrior,
+            tables.ConquestWarriorSkill,
         )
     )