From 789a1bdc0e7400e2a2a904213c81c165913b7027 Mon Sep 17 00:00:00 2001
From: "Lynn \"Zhorken\" Vaughan" <zhorken@gmail.com>
Date: Sat, 4 Aug 2012 19:55:55 -0400
Subject: [PATCH] Add target counts for Conquest move ranges.

---
 pokedex/data/csv/conquest_move_ranges.csv | 44 +++++++++++------------
 pokedex/db/tables.py                      |  4 ++-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/pokedex/data/csv/conquest_move_ranges.csv b/pokedex/data/csv/conquest_move_ranges.csv
index c2f4335..e589723 100644
--- a/pokedex/data/csv/conquest_move_ranges.csv
+++ b/pokedex/data/csv/conquest_move_ranges.csv
@@ -1,22 +1,22 @@
-id,identifier
-1,user
-2,tile-1-ahead
-3,column-2-tiles
-4,column-3-tiles
-5,diamond-adjacent
-6,ring-adjacent
-7,row
-8,chevron
-9,plus
-10,x-shape
-11,tile-2-ahead
-12,tile-3-ahead
-13,diamond-2-ahead
-14,ring-2-ahead
-15,row-2-ahead
-16,2-rows-2-ahead
-17,column-2-ahead
-18,x-shape-2-ahead
-19,dai
-20,t-shape
-21,2-rows
+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
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index c9979c2..10236c3 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -293,13 +293,15 @@ create_translation_table('conquest_move_effect_prose', ConquestMoveEffect, 'pros
 )
 
 class ConquestMoveRange(TableBase):
-    u"""A range moves can have in Pokémon Conquest."""
+    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,