From f79f5d23ea1fb067fadfe19fb7456c690edaef56 Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Tue, 7 Dec 2010 12:43:58 -0500 Subject: [PATCH] Rename the "none" damage class to "non-damaging". Also decapitalize the classes' names, because they make sense that way and they're not among the things the games always capitalize. --- pokedex/data/csv/move_damage_classes.csv | 6 +++--- .../chrome/damage-classes/{none.png => non-damaging.png} | Bin pokedex/db/tables.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename pokedex/data/media/chrome/damage-classes/{none.png => non-damaging.png} (100%) diff --git a/pokedex/data/csv/move_damage_classes.csv b/pokedex/data/csv/move_damage_classes.csv index 669693a..1baeeda 100644 --- a/pokedex/data/csv/move_damage_classes.csv +++ b/pokedex/data/csv/move_damage_classes.csv @@ -1,4 +1,4 @@ id,name,description -1,None,No damage -2,Physical,"Physical damage, controlled by Attack and Defense" -3,Special,"Special damage, controlled by Special Attack and Special Defense" +1,non-damaging,No damage +2,physical,"Physical damage, controlled by Attack and Defense" +3,special,"Special damage, controlled by Special Attack and Special Defense" diff --git a/pokedex/data/media/chrome/damage-classes/none.png b/pokedex/data/media/chrome/damage-classes/non-damaging.png similarity index 100% rename from pokedex/data/media/chrome/damage-classes/none.png rename to pokedex/data/media/chrome/damage-classes/non-damaging.png diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 177309a..59755a7 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -573,7 +573,7 @@ class MoveDamageClass(TableBase): __tablename__ = 'move_damage_classes' id = Column(Integer, primary_key=True, nullable=False, info=dict(description="A numeric ID")) - name = Column(Unicode(8), nullable=False, + name = Column(Unicode(16), nullable=False, info=dict(description="An English name of the class", format='plaintext')) description = Column(Unicode(64), nullable=False, info=dict(description="An English description of the class", format='plaintext')) -- 2.7.4