Prepare for classy or classless systems

Changed makecharacter.py and all of the views and templates for accommodating either classy or classless systems.

Author: ericearl

CharacterCreator/models.py

@@ -86,7 +86,7 @@ class Character(models.Model):
     other_points = models.IntegerField(default=0)
 
     def __str__(self):
-        return self.role.name + ': ' + self.name
+        return self.name
 
 
 class CharacterEventRoll(models.Model):

CharacterCreator/templates/CharacterCreator/character.html

@@ -1,7 +1,11 @@
 <h1>{{ character }}</h1>
 
+{% if character.role.name %}
+    <li>Role: {{ character.role.name }}</li>
+    <li>Role Skill Points: {{ character.role_points }}</li>
+{% endif %}
+
 <li>Statistic Points: {{ character.stat_points }}</li>
-<li>Role Skill Points: {{ character.role_points }}</li>
 <li>Other Skill Points: {{ character.other_points }}</li>
 
 <h2>Statistics</h2>

CharacterCreator/templates/CharacterCreator/index.html

@@ -1,22 +1,48 @@
 {% if character_list %}
-    <ul>
-    {% for c in character_list %}
-        <li><a href="{% url 'character' c.id %}">{{ c }}</a></li>
-        {% if npc_list %}
+    {% if role_list %}
+        {% for r in role_list %}
+            <li>{{ r }}</li>
             <ul>
-            {% for npc in npc_list %}
-                {% for h in npc_history %}
-                    {% if h.npc == npc and h.character == c %}
-                        {% ifchanged npc %}
-                            <li><a href="{% url 'npc' npc.id %}">{{ npc }}</a></li>
-                        {% endifchanged %}
+            {% for c in character_list %}
+                {% if c.role == r %}
+                    <li><a href="{% url 'character' c.id %}">{{ c }}</a></li>
+                    {% if npc_list %}
+                        <ul>
+                        {% for npc in npc_list %}
+                            {% for h in npc_history %}
+                                {% if h.npc == npc and h.character == c %}
+                                    {% ifchanged npc %}
+                                        <li><a href="{% url 'npc' npc.id %}">{{ npc }}</a></li>
+                                    {% endifchanged %}
+                                {% endif %}
+                            {% endfor %}
+                        {% endfor %}
+                        </ul>
                     {% endif %}
-                {% endfor %}
+                {% endif %}
             {% endfor %}
             </ul>
-        {% endif %}
-    {% endfor %}
-    </ul>
+        {% endfor %}
+        </ul>
+    {% else %}
+        {% for c in character_list %}
+            <li><a href="{% url 'character' c.id %}">{{ c }}</a></li>
+            {% if npc_list %}
+                <ul>
+                {% for npc in npc_list %}
+                    {% for h in npc_history %}
+                        {% if h.npc == npc and h.character == c %}
+                            {% ifchanged npc %}
+                                <li><a href="{% url 'npc' npc.id %}">{{ npc }}</a></li>
+                            {% endifchanged %}
+                        {% endif %}
+                    {% endfor %}
+                {% endfor %}
+                </ul>
+            {% endif %}
+        {% endfor %}
+        </ul>
+    {% endif %}
 {% else %}
     <p>No characters are available.</p>
 {% endif %}

CharacterCreator/templates/CharacterCreator/npc.html

@@ -1,7 +1,11 @@
 <h1>{{ character }}</h1>
 
+{% if character.role.name %}
+    <li>Role: {{ character.role.name }}</li>
+    <li>Role Skill Points: {{ character.role_points }}</li>
+{% endif %}
+
 <li>Statistic Points: {{ character.stat_points }}</li>
-<li>Role Skill Points: {{ character.role_points }}</li>
 <li>Other Skill Points: {{ character.other_points }}</li>
 
 <h2>Statistics</h2>

CharacterCreator/views.py

@@ -9,7 +9,8 @@ def index(request):
     npc_list = Character.objects.filter(name__contains='[NPC').order_by('role__name', 'name')
     npc_history_list = NPCEventRoll.objects.all()
     character_list = Character.objects.all().exclude(name__contains='[NPC').order_by('role__name', 'name')
-    return render(request, 'CharacterCreator/index.html', {'character_list': character_list, 'npc_list': npc_list, 'npc_history': npc_history_list})
+    role_list = Role.objects.all().order_by('name')
+    return render(request, 'CharacterCreator/index.html', {'character_list': character_list, 'npc_list': npc_list, 'npc_history': npc_history_list, 'role_list': role_list})
 
 
 def character(request, character_id):

makecharacter.py

@@ -51,12 +51,19 @@ def roll_skills(c):
     op = c.other_points
 
     # initialize skills
-    special_skills = c.role.special_skills.all()
-    common_skills = c.role.common_skills.all()
-    role_skills = (special_skills | common_skills).distinct()
-    special_stat = Statistic.objects.get(name='SPECIAL')
-    all_special_skills = Skill.objects.filter(statistic=special_stat)
-    other_skills = Skill.objects.all().difference(all_special_skills, role_skills)
+    if c.role:
+        special_skills = c.role.special_skills.all()
+        common_skills = c.role.common_skills.all()
+        role_skills = (special_skills | common_skills).distinct()
+        special_stat = Statistic.objects.get(name='SPECIAL')
+        all_special_skills = Skill.objects.filter(statistic=special_stat)
+        other_skills = Skill.objects.all().difference(all_special_skills, role_skills)
+    else:
+        special_skills = []
+        common_skills = []
+        role_skills = []
+        other_skills = Skill.objects.all()
+
     for skill in role_skills:
         cskill = CharacterSkill()
         cskill.character = c
@@ -81,8 +88,7 @@ def roll_skills(c):
         op -= skill.minimum
         cskill.save()
 
-    other_cskills = CharacterSkill.objects.filter(
-        character=c).difference(role_cskills)
+    other_cskills = CharacterSkill.objects.filter(character=c).difference(role_cskills)
     while op > 0:
         skill = random.choice(other_skills)
         cskill = CharacterSkill.objects.get(character=c, skill=skill)