Added global attacks for strange app. Added link to Admin from index.

Author: Michael Bird

cyphercore/models.py

@@ -428,6 +428,8 @@ class Character(baseCharacter):
     equipment = models.ManyToManyField(Equipment, through='CharacterEquipment')
     cyphers = models.ManyToManyField(Cypher, through='CharacterCypher')
     artifacts = models.ManyToManyField(Artifact, through='CharacterArtifact')
+    def get_absolute_url(self):
+        return "/strange/characters/%s/" % self.slug
 
 class CharacterAbility(baseCharacterAbility):
     character = models.ForeignKey(Character, on_delete=models.CASCADE)

cyphercore/templates/cyphercore/base_character_detail.html

@@ -317,7 +317,7 @@ <h2>Advancement</h2>
     <!-- Attacks -->
     {% if character.attack_set.all %}
     <section id="attacks" class="avoid-break">
-        <h2>Attacks</h2>
+        {% block attacks_header %}<h2>Attacks</h2>{% endblock %}
         {% for item in character.attack_set.all %}
             {% block attack_item %}<span class="bubble-item">{{ item.name }} (Mod: {{ item.modifier }}, Dmg: {{ item.damage }})</span>{% endblock %}
         {% endfor %}

numenera/models.py

@@ -49,6 +49,8 @@ class Character(baseCharacter):
     equipment = models.ManyToManyField(Equipment, through='CharacterEquipment')
     cyphers = models.ManyToManyField(Cypher, through='CharacterCypher')
     artifacts = models.ManyToManyField(Artifact, through='CharacterArtifact')
+    def get_absolute_url(self):
+        return "/strange/characters/%s/" % self.slug
 
 class CharacterAbility(baseCharacterAbility):
     character = models.ForeignKey(Character, on_delete=models.CASCADE)

strange/admin.py

@@ -13,7 +13,7 @@ def edit_link(self, instance):
         else:
             return ''
 
-from .models import Sourcebook, Descriptor, Type, Focus, Ability, Skill, Equipment, Cypher, Artifact, FocusAbility, TypeAbility, Character, CharacterAbility, CharacterSkill, CharacterEquipment, CharacterCypher, CharacterArtifact, Attack, Recursion, RecursionAbility, RecursionSkill
+from .models import Sourcebook, Descriptor, Type, Focus, Ability, Skill, Equipment, Cypher, Artifact, FocusAbility, TypeAbility, Character, CharacterAbility, CharacterSkill, CharacterEquipment, CharacterCypher, CharacterArtifact, Attack, Recursion, RecursionAbility, RecursionSkill, RecursionAttack
 
 class SourcebookAdmin(admin.ModelAdmin):
     list_display = ('name',)
@@ -115,6 +115,11 @@ class AttackInline(admin.TabularInline):
     extra = 0
     fields = ('name', 'modifier', 'damage')
 
+class RecursionAttackInline(admin.TabularInline):
+    model = RecursionAttack
+    extra = 0
+    fields = ('name', 'modifier', 'damage')
+
 class CharacterEquipmentInline(admin.TabularInline):
     model = CharacterEquipment
     autocomplete_fields = ['equipment']
@@ -169,7 +174,7 @@ class CharacterAdmin(admin.ModelAdmin):
         ('DAMAGE TRACK', {'fields': [('recovery_roll', 'one_action', 'ten_minutes', 'one_hour', 'ten_hours', 'impaired', 'debilitated')]}),
         ('ADVANCEMENT', {'fields': [('tier_1_edge', 'tier_1_effort', 'tier_1_pools', 'tier_1_skills', 'tier_1_other', 'tier_2_edge', 'tier_2_effort', 'tier_2_pools', 'tier_2_skills', 'tier_2_other'), ('tier_3_edge', 'tier_3_effort', 'tier_3_pools', 'tier_3_skills', 'tier_3_other', 'tier_4_edge', 'tier_4_effort', 'tier_4_pools', 'tier_4_skills', 'tier_4_other'), ('tier_5_edge', 'tier_5_effort', 'tier_5_pools', 'tier_5_skills', 'tier_5_other', 'tier_6_edge', 'tier_6_effort', 'tier_6_pools', 'tier_6_skills', 'tier_6_other')]}),
     ]
-    inlines = [CharacterAbilitiesInline, CharacterSkillsInline, CharacterCyphersInline, RecursionsInline]
+    inlines = [CharacterAbilitiesInline, AttackInline, CharacterSkillsInline, CharacterCyphersInline, RecursionsInline]
     list_display = ('name', 'descriptor', 'type', 'tier', 'slug')
     prepopulated_fields = {'slug': ('name',)}
     search_fields = ['name']
@@ -189,7 +194,7 @@ class RecursionAdmin(admin.ModelAdmin):
         ('RECURSION DEFINITION', {'fields': [('name', 'character', 'focus'), 'notes']}),
         ('STATS', {'fields': [('armor', 'money'), ('might_pool_adjust', 'might_edge_adjust'), ('speed_pool_adjust', 'speed_edge_adjust'), ('intellect_pool_adjust', 'intellect_edge_adjust')]}),
     ]
-    inlines = [RecursionAbilitiesInline, AttackInline, CharacterEquipmentInline, RecursionSkillsInline, CharacterArtifactsInline]
+    inlines = [RecursionAbilitiesInline, RecursionAttackInline, CharacterEquipmentInline, RecursionSkillsInline, CharacterArtifactsInline]
     list_display = ('character', 'name')
     readonly_fields = ('name', 'character', 'focus', )
     search_fields = ['name', 'character']

strange/migrations/0034_auto_20180819_0408.py

@@ -0,0 +1,31 @@
+# Generated by Django 2.1 on 2018-08-19 04:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('strange', '0033_merge_20180819_0355'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CharacterAttack',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+                ('modifier', models.IntegerField(default=0)),
+                ('damage', models.IntegerField(default=0)),
+                ('character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='strange.Character')),
+            ],
+            options={
+                'ordering': ['name'],
+            },
+        ),
+        migrations.AlterModelOptions(
+            name='attack',
+            options={'ordering': ['name']},
+        ),
+    ]

strange/migrations/0035_auto_20180819_0410.py

@@ -0,0 +1,44 @@
+# Generated by Django 2.1 on 2018-08-19 04:10
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('strange', '0034_auto_20180819_0408'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RecursionAttack',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+                ('modifier', models.IntegerField(default=0)),
+                ('damage', models.IntegerField(default=0)),
+                ('recursion', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='strange.Recursion')),
+            ],
+            options={
+                'ordering': ['name'],
+            },
+        ),
+        migrations.RemoveField(
+            model_name='characterattack',
+            name='character',
+        ),
+        migrations.RemoveField(
+            model_name='attack',
+            name='recursion',
+        ),
+        migrations.AddField(
+            model_name='attack',
+            name='character',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='strange.Character'),
+            preserve_default=False,
+        ),
+        migrations.DeleteModel(
+            name='CharacterAttack',
+        ),
+    ]

strange/models.py

@@ -47,6 +47,8 @@ class Character(baseCharacter):
     abilities = models.ManyToManyField(Ability, through='CharacterAbility')
     skills = models.ManyToManyField(Skill, through='CharacterSkill')
     cyphers = models.ManyToManyField(Cypher, through='CharacterCypher')
+    def get_absolute_url(self):
+        return "/strange/characters/%s/" % self.slug
 
 class CharacterAbility(baseCharacterAbility):
     class Meta:
@@ -94,7 +96,14 @@ class Meta:
 
 class Attack(baseAttack):
     class Meta:
-        ordering = ['recursion__name', 'name']
+        ordering = ['name']
+        verbose_name = 'Global Attack'
+        verbose_name_plural = 'Global Attacks'
+    character = models.ForeignKey(Character, on_delete=models.CASCADE)
+
+class RecursionAttack(baseAttack):
+    class Meta:
+        ordering = ['name']
     recursion = models.ForeignKey(Recursion, on_delete=models.CASCADE)
 
 class CharacterCypher(baseCharacterCypher):

strange/templates/strange/character_detail.html

@@ -19,6 +19,7 @@
 {% endblock %}
 {% block recursable_stats %}{% endblock %}
 {% block focus_abilities %}{% endblock %}
+{% block attacks_header %}<h2>Global Attacks</h2>{% endblock %}
 {% block abilities_header %}<h2>Global Abilities</h2>{% endblock %}
 {% block skills_header %}<h2>Global Skills</h2>{% endblock %}
 {% block recursions %}
@@ -99,10 +100,10 @@ <h1>Recursion: {{ recursion.name }}</h1>
             <hr />
         </div>
     </section>
-    {% if recursion.attack_set.all %}
+    {% if recursion.recursionattack_set.all %}
     <section class="recursion-attacks" class="avoid-break">
         <h2>Attacks</h2>
-        {% for item in recursion.attack_set.all %}
+        {% for item in recursion.recursionattack_set.all %}
             {% block attack_item %}<span class="bubble-item">{{ item.name }} (Mod: {{ item.modifier }}, Dmg: {{ item.damage }})</span>{% endblock %}
         {% endfor %}
         <hr />

templates/index.html

@@ -4,6 +4,10 @@
         <title>Cypher System</title>
         <meta charset="utf-8">
         <style>
+            a {
+                color: darkgray;
+                text-decoration: none;
+            }
             hr {
                 border-top: 1px solid #E1E1E1;
                 width: 80%;
@@ -13,6 +17,15 @@
                 margin: 50px auto;
                 max-width: 500px;
             }
+            #admin {
+                display: block;
+                font-family: monospace;
+                font-size: 2em;
+                margin: 0 auto;
+                text-align: center;
+                text-transform: uppercase;
+                width: 100%;
+            }
         </style>
     </head>
     <body>
@@ -22,5 +35,6 @@
         <hr />
         <a href="strange/"><img src="{% static 'strange/images/logo.jpg' %}" alt="Strange" class="center" /></a>
         <hr />
+        <div id="admin"><a href="admin/">Admin</a></div>
     </body>
 </html>