From 47410a9e9cf3c02d1de3e198074f5fb7b279b75c Mon Sep 17 00:00:00 2001
From: "Lynn \"Zhorken\" Vaughan" <zhorken@gmail.com>
Date: Sun, 29 Jul 2012 17:58:30 -0400
Subject: [PATCH] Add generic warrior archetypes.

---
 .../data/csv/conquest_warrior_archetypes.csv  |  31 ++
 pokedex/data/csv/conquest_warriors.csv        | 404 +++++++++---------
 pokedex/db/tables.py                          |  17 +
 3 files changed, 250 insertions(+), 202 deletions(-)
 create mode 100644 pokedex/data/csv/conquest_warrior_archetypes.csv

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