diff --git a/app/__pycache__/models.cpython-38.pyc b/app/__pycache__/models.cpython-38.pyc index c26df71..738b4e1 100644 Binary files a/app/__pycache__/models.cpython-38.pyc and b/app/__pycache__/models.cpython-38.pyc differ diff --git a/app/migrations/0008_auto_20200411_1255.py b/app/migrations/0008_auto_20200411_1255.py new file mode 100644 index 0000000..77d29f5 --- /dev/null +++ b/app/migrations/0008_auto_20200411_1255.py @@ -0,0 +1,29 @@ +# Generated by Django 3.0.5 on 2020-04-11 12:55 + +import app.models +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0007_auto_20200411_0302'), + ] + + operations = [ + migrations.AddField( + model_name='modifierability', + name='ability', + field=app.models.SingleChoiceField(blank=True, choices=[('War', (('ARCHERY', 'Archery'), ('ATHLETICS', 'Athletics'), ('AWARENESS', 'Awareness'), ('BRAWL', 'Brawl'), ('DODGE', 'Dodge'), ('INTEGRITY', 'Integrity'), ('MELEE', 'Melee'), ('RESISTANCE', 'Resistance'), ('THROWN', 'Thrown'), ('WAR', 'War'))), ('Life', (('CRAFT', 'Craft'), ('LARCENY', 'Larceny'), ('LINGUISTICS', 'Linguistics'), ('PERFORMANCE', 'Performance'), ('PRESENCE', 'Presence'), ('RIDE', 'Ride'), ('SAIL', 'Sail'), ('SOCIALISE', 'Socialise'), ('STEALTH', 'Stealth'), ('SURVIVAL', 'Survival'))), ('Wisdom', (('BUREAUCRACY', 'Bureaucracy'), ('INVESTIGATION', 'Investigation'), ('LORE', 'Lore'), ('MEDICINE', 'Medicine'), ('OCCULT', 'Occult')))], max_length=100, verbose_name='Ability'), + ), + migrations.AddField( + model_name='modifierattribute', + name='attribute', + field=app.models.SingleChoiceField(blank=True, choices=[('Physical', (('STR', 'Srength'), ('DEX', 'Dexterity'), ('STA', 'Stamina'))), ('Social', (('CHA', 'Charisma'), ('MAN', 'Manipulation'), ('APP', 'Appearance'))), ('Mental', (('PER', 'Perception'), ('INT', 'Intelligence'), ('WIT', 'Wits')))], max_length=100, verbose_name='Attribute'), + ), + migrations.AddField( + model_name='modifierstatic', + name='static', + field=app.models.SingleChoiceField(blank=True, choices=[('SOAK NATURAL', 'Natural Soak'), ('SOAK ARMORED', 'Armored Soak'), ('SOAK TOTAL', 'Total Soak'), ('HARDNESS', 'Hardness'), ('PARRY', 'Parry'), ('EVASION', 'Evasion'), ('RESOLVE', 'Resolve'), ('GUILE', 'Guile'), ('RUSH', 'Rush'), ('DISENGAGE', 'Disengage'), ('JOIN BATTLE', 'Join Battle')], max_length=100, verbose_name='Static'), + ), + ] diff --git a/app/migrations/__pycache__/0008_auto_20200411_1255.cpython-38.pyc b/app/migrations/__pycache__/0008_auto_20200411_1255.cpython-38.pyc new file mode 100644 index 0000000..0667841 Binary files /dev/null and b/app/migrations/__pycache__/0008_auto_20200411_1255.cpython-38.pyc differ diff --git a/app/models.py b/app/models.py index ace2208..fa7ff21 100644 --- a/app/models.py +++ b/app/models.py @@ -5,21 +5,21 @@ from django.db import models #==============================================================================# ATTRIBUTES = [ ( - "Physical" ( + "Physical", ( ("STR", "Srength"), ("DEX", "Dexterity"), ("STA", "Stamina"), ), ), ( - "Social" ( + "Social", ( ("CHA", "Charisma"), ("MAN", "Manipulation"), ("APP", "Appearance"), ), ), ( - "Mental" ( + "Mental", ( ("PER", "Perception"), ("INT", "Intelligence"), ("WIT", "Wits"), @@ -29,7 +29,7 @@ ATTRIBUTES = [ ABILITIES = [ ( - "War" ( + "War", ( ("ARCHERY", "Archery"), ("ATHLETICS", "Athletics"), ("AWARENESS", "Awareness"), @@ -43,7 +43,7 @@ ABILITIES = [ ), ), ( - "Life" ( + "Life", ( ("CRAFT", "Craft"), ("LARCENY", "Larceny"), ("LINGUISTICS", "Linguistics"), @@ -57,7 +57,7 @@ ABILITIES = [ ), ), ( - "Wisdom" ( + "Wisdom", ( ("BUREAUCRACY", "Bureaucracy"), ("INVESTIGATION", "Investigation"), ("LORE", "Lore"), @@ -89,7 +89,7 @@ CATEGORIES = [ TAGS_WEAPON = [ ( - "General" ( + "General", ( ("ONE HANDED", "One Handed"), ("TWO HANDED", "Two Handed"), ("BASHING", "Bashing"), @@ -101,7 +101,7 @@ TAGS_WEAPON = [ ), ), ( - "Melee" ( + "Melee", ( ("MELEE", "Melee"), ("BALANCED", "Balanced"), ("BRAWL", "Brawl"), @@ -119,7 +119,7 @@ TAGS_WEAPON = [ ), ), ( - "Thrown" ( + "Thrown", ( ("THROWN", "Occult"), ("CUTTING", "Cutting"), ("POISONABLE", "Poisonable"), @@ -127,7 +127,7 @@ TAGS_WEAPON = [ ), ), ( - "Archery" ( + "Archery", ( ("ARCHERY", "Archery"), ("CROSSBOW", "Crossbow"), ("FLAME", "Flame"), @@ -208,7 +208,7 @@ class modifierAttribute(modifierBase): attribute = SingleChoiceField("Attribute", ATTRIBUTES) class modifierAbility(modifierBase): - ability = SingleChoiceField("Ability", ABIILITIES) + ability = SingleChoiceField("Ability", ABILITIES) class modifierStatic(modifierBase): static = SingleChoiceField("Static", STATICS)