Progress once more

This commit is contained in:
tcaxle 2020-04-15 20:35:45 +01:00
parent 1323c8e06e
commit 5f07ab1bf9
5 changed files with 261 additions and 116 deletions

View File

@ -38,5 +38,3 @@ admin.site.register(ownershipCharmLunar)
admin.site.register(ownershipCharmLunarShape)
admin.site.register(ownershipMerit)
admin.site.register(ownershipSpeciality)
admin.site.register(ownershipIntimacyTie)
admin.site.register(ownershipIntimacyPrincipal)

View File

@ -0,0 +1,38 @@
# Generated by Django 3.0.5 on 2020-04-15 19:29
import app.models
from django.db import migrations
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('app', '0002_characterexaltbase_motescommitted'),
]
operations = [
migrations.RemoveField(
model_name='ownershipintimacytie',
name='owner',
),
migrations.RemoveField(
model_name='ownershipintimacytie',
name='ownershipbase_ptr',
),
migrations.RemoveField(
model_name='ownershipintimacytie',
name='target',
),
migrations.AddField(
model_name='intimacybase',
name='character',
field=app.models.NamedForeignKeyField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.characterBase', verbose_name='Character'),
),
migrations.DeleteModel(
name='ownershipIntimacyPrincipal',
),
migrations.DeleteModel(
name='ownershipIntimacyTie',
),
]

View File

@ -419,7 +419,7 @@ class characterBase(PolymorphicModel):
def effectModifier(self, keyword):
modifier = 0
try:
ownerships = self.ownershipBase_set.filter(active=True)
ownerships = [ownership for ownership in ownershipBase.objects.all() if (ownership.owner == self) and (ownership.active)]
for ownership in ownerships:
try:
modifier += ownership.target.modifier(keyword)
@ -437,7 +437,7 @@ class characterBase(PolymorphicModel):
#=========== ATTRIBUTES ===========#
strength = DotField("Strength")
def attributeStrength(self):
return self.strength + self.effectModifier("STRENGTH")
return self.strength + self.effectModifier("Strength")
def dotsStrength(self):
output = []
for i in range(self.strength):
@ -447,7 +447,7 @@ class characterBase(PolymorphicModel):
return output
dexterity = DotField("Dexterity")
def attributeDexterity(self):
return self.dexterity + self.effectModifier("DEXTERITY")
return self.dexterity + self.effectModifier("Dexterity")
def dotsDexterity(self):
output = []
for i in range(self.dexterity):
@ -457,7 +457,7 @@ class characterBase(PolymorphicModel):
return output
stamina = DotField("Stamina")
def attributeStamina(self):
return self.stamina + self.effectModifier("STAMINA")
return self.stamina + self.effectModifier("Stamina")
def dotsStamina(self):
output = []
for i in range(self.stamina):
@ -467,7 +467,7 @@ class characterBase(PolymorphicModel):
return output
charisma = DotField("Charisma")
def attributeCharisma(self):
return self.charisma + self.effectModifier("CHARISMA")
return self.charisma + self.effectModifier("Charisma")
def dotsCharisma(self):
output = []
for i in range(self.charisma):
@ -477,7 +477,7 @@ class characterBase(PolymorphicModel):
return output
manipulation = DotField("Manipulation")
def attributeManipulation(self):
return self.manipulation + self.effectModifier("MANIPULATION")
return self.manipulation + self.effectModifier("Manipulation")
def dotsManipulation(self):
output = []
for i in range(self.manipulation):
@ -487,7 +487,7 @@ class characterBase(PolymorphicModel):
return output
appearance = DotField("Apperance")
def attributeAppearance(self):
return self.appearance + self.effectModifier("APPEARANCE")
return self.appearance + self.effectModifier("Appearance")
def dotsAppearance(self):
output = []
for i in range(self.appearance):
@ -497,7 +497,7 @@ class characterBase(PolymorphicModel):
return output
perception = DotField("Perception")
def attributePerception(self):
return self.perception + self.effectModifier("PERCEPTION")
return self.perception + self.effectModifier("Perception")
def dotsPerception(self):
output = []
for i in range(self.perception):
@ -507,7 +507,7 @@ class characterBase(PolymorphicModel):
return output
intelligence = DotField("Intelligence")
def attributeIntelligence(self):
return self.intelligence + self.effectModifier("INTELLIGENCE")
return self.intelligence + self.effectModifier("Intelligence")
def dotsIntelligence(self):
output = []
for i in range(self.intelligence):
@ -517,7 +517,7 @@ class characterBase(PolymorphicModel):
return output
wits = DotField("Wits")
def attributeWits(self):
return self.wits + self.effectModifier("WITS")
return self.wits + self.effectModifier("Wits")
def dotsWits(self):
output = []
for i in range(self.wits):
@ -529,7 +529,7 @@ class characterBase(PolymorphicModel):
#=========== ABILITIES ============#
archery = DotField("Archery")
def abilityArchery(self):
return self.archery + self.effectModifier("ARCHERY")
return self.archery + self.effectModifier("Archery")
def dotsArchery(self):
output = []
for i in range(self.archery):
@ -539,7 +539,7 @@ class characterBase(PolymorphicModel):
return output
athletics = DotField("Athletics")
def abilityAthletics(self):
return self.athletics + self.effectModifier("ATHLETICS")
return self.athletics + self.effectModifier("Athletics")
def dotsAthletics(self):
output = []
for i in range(self.athletics):
@ -549,7 +549,7 @@ class characterBase(PolymorphicModel):
return output
awareness = DotField("Awareness")
def abilityAwareness(self):
return self.awareness + self.effectModifier("AWARENESS")
return self.awareness + self.effectModifier("Awareness")
def dotsAwareness(self):
output = []
for i in range(self.awareness):
@ -559,7 +559,7 @@ class characterBase(PolymorphicModel):
return output
brawl = DotField("Brawl")
def abilityBrawl(self):
return self.brawl + self.effectModifier("BRAWL")
return self.brawl + self.effectModifier("Brawl")
def dotsBrawl(self):
output = []
for i in range(self.brawl):
@ -569,7 +569,7 @@ class characterBase(PolymorphicModel):
return output
bureaucracy = DotField("Bureaucracy")
def abilityBureaucracy(self):
return self.bureaucracy + self.effectModifier("BUREAUCRACY")
return self.bureaucracy + self.effectModifier("Bureaucracy")
def dotsBureaucracy(self):
output = []
for i in range(self.bureaucracy):
@ -579,7 +579,7 @@ class characterBase(PolymorphicModel):
return output
craft = DotField("Craft")
def abilityCraft(self):
return self.craft + self.effectModifier("CRAFT")
return self.craft + self.effectModifier("Craft")
def dotsCraft(self):
output = []
for i in range(self.craft):
@ -589,7 +589,7 @@ class characterBase(PolymorphicModel):
return output
dodge = DotField("Dodge")
def abilityDodge(self):
return self.dodge + self.effectModifier("DODGE")
return self.dodge + self.effectModifier("Dodge")
def dotsDodge(self):
output = []
for i in range(self.dodge):
@ -599,7 +599,7 @@ class characterBase(PolymorphicModel):
return output
integrity = DotField("Integrity")
def abilityIntegrity(self):
return self.integrity + self.effectModifier("INTEGRITY")
return self.integrity + self.effectModifier("Integrity")
def dotsIntegrity(self):
output = []
for i in range(self.integrity):
@ -609,7 +609,7 @@ class characterBase(PolymorphicModel):
return output
investigation = DotField("Investigation")
def abilityInvestigation(self):
return self.investigation + self.effectModifier("INVESTIGATION")
return self.investigation + self.effectModifier("Investigation")
def dotsInvestigation(self):
output = []
for i in range(self.investigation):
@ -619,7 +619,7 @@ class characterBase(PolymorphicModel):
return output
larceny = DotField("Larceny")
def abilityLarceny(self):
return self.larceny + self.effectModifier("LARCENY")
return self.larceny + self.effectModifier("Larceny")
def dotsLarceny(self):
output = []
for i in range(self.larceny):
@ -629,7 +629,7 @@ class characterBase(PolymorphicModel):
return output
linguistics = DotField("Linguistics")
def abilityLinguistics(self):
return self.linguistics + self.effectModifier("LINGUISTICS")
return self.linguistics + self.effectModifier("Linguistics")
def dotsLinguistics(self):
output = []
for i in range(self.linguistics):
@ -639,7 +639,7 @@ class characterBase(PolymorphicModel):
return output
lore = DotField("Lore")
def abilityLore(self):
return self.lore + self.effectModifier("LORE")
return self.lore + self.effectModifier("Lore")
def dotsLore(self):
output = []
for i in range(self.lore):
@ -649,7 +649,7 @@ class characterBase(PolymorphicModel):
return output
martialArts = DotField("MartialArts")
def abilityMartialArts(self):
return self.martialArts + self.effectModifier("MARTIAL ARTS")
return self.martialArts + self.effectModifier("Martial Arts")
def dotsMartialArts(self):
output = []
for i in range(self.martialArts):
@ -659,7 +659,7 @@ class characterBase(PolymorphicModel):
return output
medicine = DotField("Medicine")
def abilityMedicine(self):
return self.medicine + self.effectModifier("MEDICINE")
return self.medicine + self.effectModifier("Medicine")
def dotsMedicine(self):
output = []
for i in range(self.medicine):
@ -669,7 +669,7 @@ class characterBase(PolymorphicModel):
return output
melee = DotField("Melee")
def abilityMelee(self):
return self.melee + self.effectModifier("MELEE")
return self.melee + self.effectModifier("Melee")
def dotsMelee(self):
output = []
for i in range(self.melee):
@ -679,7 +679,7 @@ class characterBase(PolymorphicModel):
return output
occult = DotField("Occult")
def abilityOccult(self):
return self.occult + self.effectModifier("OCCULT")
return self.occult + self.effectModifier("Occult")
def dotsOccult(self):
output = []
for i in range(self.occult):
@ -689,7 +689,7 @@ class characterBase(PolymorphicModel):
return output
performance = DotField("Performance")
def abilityPerformance(self):
return self.performance + self.effectModifier("PERFORMANCE")
return self.performance + self.effectModifier("Performance")
def dotsPerformance(self):
output = []
for i in range(self.performance):
@ -699,7 +699,7 @@ class characterBase(PolymorphicModel):
return output
presence = DotField("Presence")
def abilityPresence(self):
return self.presence + self.effectModifier("PRESENCE")
return self.presence + self.effectModifier("Presence")
def dotsPresence(self):
output = []
for i in range(self.presence):
@ -709,7 +709,7 @@ class characterBase(PolymorphicModel):
return output
resistance = DotField("Resistance")
def abilityResistance(self):
return self.resistance + self.effectModifier("RESISTANCE")
return self.resistance + self.effectModifier("Resistance")
def dotsResistance(self):
output = []
for i in range(self.resistance):
@ -719,7 +719,7 @@ class characterBase(PolymorphicModel):
return output
ride = DotField("Ride")
def abilityRide(self):
return self.ride + self.effectModifier("RIDE")
return self.ride + self.effectModifier("Ride")
def dotsRide(self):
output = []
for i in range(self.ride):
@ -729,7 +729,7 @@ class characterBase(PolymorphicModel):
return output
sail = DotField("Sail")
def abilitySail(self):
return self.sail + self.effectModifier("SAIL")
return self.sail + self.effectModifier("Sail")
def dotsSail(self):
output = []
for i in range(self.sail):
@ -739,7 +739,7 @@ class characterBase(PolymorphicModel):
return output
socialize = DotField("Socialize")
def abilitySocialize(self):
return self.socialize + self.effectModifier("SOCIALIZE")
return self.socialize + self.effectModifier("Socialize")
def dotsSocialize(self):
output = []
for i in range(self.socialize):
@ -749,7 +749,7 @@ class characterBase(PolymorphicModel):
return output
stealth = DotField("Stealth")
def abilityStealth(self):
return self.stealth + self.effectModifier("STEALTH")
return self.stealth + self.effectModifier("Stealth")
def dotsStealth(self):
output = []
for i in range(self.stealth):
@ -759,7 +759,7 @@ class characterBase(PolymorphicModel):
return output
survival = DotField("Survival")
def abilitySurvival(self):
return self.survival + self.effectModifier("SURVIVAL")
return self.survival + self.effectModifier("Survival")
def dotsSurvival(self):
output = []
for i in range(self.survival):
@ -769,7 +769,7 @@ class characterBase(PolymorphicModel):
return output
thrown = DotField("Thrown")
def abilityThrown(self):
return self.thrown + self.effectModifier("THROWN")
return self.thrown + self.effectModifier("Thrown")
def dotsThrown(self):
output = []
for i in range(self.thrown):
@ -779,7 +779,7 @@ class characterBase(PolymorphicModel):
return output
war = DotField("War")
def abilityWar(self):
return self.war + self.effectModifier("WAR")
return self.war + self.effectModifier("War")
def dotsWar(self):
output = []
for i in range(self.war):
@ -814,27 +814,9 @@ class characterBase(PolymorphicModel):
#=========== INTIMACIES ===========#
# Reverse relation
def intimacyTieSet(self):
output = []
try:
ownerships = self.ownershipIntimacyTie_set.all()
for ownership in ownerships:
output.append(ownership.target)
except:
pass
return output
# Reverse relation
def intimacyPrincipalSet(self):
output = []
try:
ownerships = self.ownershipIntimacyPrincipal_set.all()
for ownership in ownerships:
output.append(ownership.target)
except:
pass
return output
def intimacySet(self):
return self.intimacyTieSet() + self.intimacyPrincipalSet()
# character.intimactBase_set.all()
# character.intimacyTie_set.object.all()
# character.intimacyPrincipal_set.all()
#=========== WILLPOWER ============#
willpowerMax = NamedIntegerField("Maximum Willpower")
@ -1218,6 +1200,7 @@ class intimacyBase(PolymorphicModel):
description = DescriptionField()
intensity = SingleChoiceField("Intensity", INTENSITIES)
character = NamedForeignKeyField("Character", characterBase)
class intimacyTie(intimacyBase):
target = NamedCharField("Target")
@ -1265,10 +1248,3 @@ class ownershipMerit(ownershipBase):
class ownershipSpeciality(ownershipBase):
target = NamedForeignKeyField("Speciality", speciality, related_name="ownershipSpecialityTarget_set")
owner = NamedForeignKeyField("Owner", characterBase, related_name="ownershipSpeciality_set")
class ownershipIntimacyTie(ownershipBase):
target = NamedForeignKeyField("Tie", intimacyTie, related_name="ownershipIntimacyTieTarget_set")
owner = NamedForeignKeyField("Owner", characterBase, related_name="ownershipIntimacyTie_set")
class ownershipIntimacyPrincipal(ownershipBase):
target = NamedForeignKeyField("Principal", intimacyPrincipal, related_name="ownershipIntimacyPrincipalTarget_set")
owner = NamedForeignKeyField("Owner", characterBase, related_name="ownershipIntimacyPrincipal_set")

View File

@ -15,7 +15,7 @@
height: 15px;
border-bottom: 2px solid #40545c;
top: 0;
width: 600px;
width: 6000px;
}
.fancy span:before {
right: 100%;
@ -41,7 +41,7 @@
height: 11px;
border-bottom: 2px solid #40545c;
top: 0;
width: 600px;
width: 6000px;
}
.fancy-small span:before {
right: 100%;
@ -67,7 +67,7 @@
height: 38px;
border-bottom: 4px solid #40545c;
top: 0;
width: 600px;
width: 6000px;
}
.fancy-big span:before {
right: 100%;
@ -78,6 +78,17 @@
margin-left: 7px;
}
/* Vertial Line */
.vl {
background: linear-gradient(to right,
transparent 0%,
transparent calc(50% - 0.5px),
#40545c calc(50% - 0.5px),
#40545c calc(50% + 0.5px),
transparent calc(50% + 0.5px),
transparent 100%);
}
/* W3.CSS 4.13 June 2019 by Jan Egil and Borge Refsnes */
html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit}
/* Extract from normalize.css by Nicolas Gallagher and Jonathan Neal git.io/normalize */
@ -261,8 +272,8 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
.custom-orange,.custom-hover-orange:hover{color:#000!important;background-color:#e8a951!important}
.custom-text-grey,.custom-hover-text-grey:hover{color:#40545c!important}
.custom-text-orange,.custom-hover-text-orange:hover{color:#e8a951!important}
.custom-border-grey,.w3-hover-border-amber:hover{border-color:#40545c!important}
.custom-border-orange,.w3-hover-border-amber:hover{border-color:#e8a951!important}
.custom-border-grey,.w3-hover-border-grey:hover{border-color:#40545c!important}
.custom-border-orange,.w3-hover-border-orange:hover{border-color:#e8a951!important}
.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}

View File

@ -47,7 +47,7 @@
<p style="margin:3px" class="fancy w3-center w3-xlarge">
<span class="w3-center"><b>Abilities</b></span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Archery:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsArchery %}
@ -57,9 +57,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Athletics:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsAthletics %}
@ -69,9 +70,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Awareness:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsAwareness %}
@ -81,9 +83,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Brawl:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsBrawl %}
@ -93,9 +96,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Bureaucracy:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsBureaucracy %}
@ -105,9 +109,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Craft:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsCraft %}
@ -117,9 +122,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Dodge:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsDodge %}
@ -129,9 +135,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Integrity:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsIntegrity %}
@ -141,9 +148,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Investigation:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsInvestigation %}
@ -153,9 +161,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Larceny:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsLarceny %}
@ -165,9 +174,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Linguistics:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsLinguistics %}
@ -177,9 +187,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Lore:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsLore %}
@ -189,9 +200,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Martial Arts:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsMartialArts %}
@ -201,9 +213,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Medicine:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsMedicine %}
@ -213,9 +226,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Melee:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsMelee %}
@ -225,9 +239,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Occult:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsOccult %}
@ -237,9 +252,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Performance:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsPerformance %}
@ -249,9 +265,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Presence:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsPresence %}
@ -261,9 +278,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Resistance:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsResistance %}
@ -273,9 +291,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Ride:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsRide %}
@ -285,9 +304,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Sail:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsSail %}
@ -297,9 +317,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Socialize:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsSocialize %}
@ -309,9 +330,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Stealth:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsStealth %}
@ -321,9 +343,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Survival:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsSurvival %}
@ -333,9 +356,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Thrown:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsThrown %}
@ -345,9 +369,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>War:</span>
<span class="w3-medium w3-display-right">
{% for dot in object.dotsWar %}
@ -357,6 +382,7 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
</div>
@ -372,7 +398,7 @@
<p style="margin:0" class="w3-large w3-center fancy-small">
<span>Physical</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Strength:</span>
<span class="w3-hide-large w3-hide-small">STR:</span>
<span class="w3-medium w3-display-right">
@ -383,9 +409,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Dexterity:</span>
<span class="w3-hide-large w3-hide-small">DEX:</span>
<span class="w3-medium w3-display-right">
@ -396,9 +423,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Stamina:</span>
<span class="w3-hide-large w3-hide-small">STA:</span>
<span class="w3-medium w3-display-right">
@ -409,6 +437,7 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
</div>
@ -416,7 +445,7 @@
<p style="margin:0" class="w3-large w3-center fancy-small">
<span>Social</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Charisma:</span>
<span class="w3-hide-large w3-hide-small">CHA:</span>
<span class="w3-medium w3-display-right">
@ -427,9 +456,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Manipulation:</span>
<span class="w3-hide-large w3-hide-small">MAN:</span>
<span class="w3-medium w3-display-right">
@ -440,9 +470,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Appearance:</span>
<span class="w3-hide-large w3-hide-small">APP:</span>
<span class="w3-medium w3-display-right">
@ -453,6 +484,7 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
</div>
@ -460,7 +492,7 @@
<p style="margin:0" class="w3-large w3-center fancy-small">
<span>Mental</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Perception:</span>
<span class="w3-hide-large w3-hide-small">PER:</span>
<span class="w3-medium w3-display-right">
@ -471,9 +503,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Intelligence:</span>
<span class="w3-hide-large w3-hide-small">INT:</span>
<span class="w3-medium w3-display-right">
@ -484,9 +517,10 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
<p style="margin:0" class="w3-display-container">
<p style="margin:0" class="w3-display-container w3-row-padding custom-hover-grey custom-hover-text-orange">
<span class="w3-hide-medium">Wits:</span>
<span class="w3-hide-large w3-hide-small">WIT:</span>
<span class="w3-medium w3-display-right">
@ -497,6 +531,7 @@
<i class="far fa-circle"></i>
{% endif %}
{% endfor %}
&thinsp;
</span>
</p>
</div>
@ -623,27 +658,33 @@
<span class="w3-center"><b>Experience</b></span>
</p>
<div class="w3-cell-row">
<div class="w3-cell w3-row-padding w3-half">
<div class="w3-cell w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Current:</span>
<span class="w3-right">{{ object.experience }}</span>
</div>
<div class="w3-cell w3-row-padding w3-half">
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Total:</span>
<span class="w3-right">{{ object.experienceTotal }}</span>
</div>
</div>
</div>
{% if object.type is not "Mortal" %}
<div class="w3-cell w3-row-padding w3-hide-small">
</div>
<div class="w3-cell w3-mobile">
<p style="margin:3px" class="fancy w3-center w3-xlarge">
<span class="w3-center"><b>Exalted Experience</b></span>
</p>
<div class="w3-cell-row">
<div class="w3-cell w3-row-padding w3-half">
<div class="w3-cell w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Current:</span>
<span class="w3-right">{{ object.experienceExalted }}</span>
</div>
<div class="w3-cell w3-row-padding w3-half">
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-row-padding custom-hover-grey custom-hover-text-orange">
<span>Total:</span>
<span class="w3-right">{{ object.experienceExaltedTotal }}</span>
</div>
@ -685,10 +726,10 @@
{% endif %}
</tr>
{% endfor %}
{% else %}
{% else %}
<tr><td>No weapons found.</td></tr>
{% endif %}
</table>
{% endif %}
</table>
<table class="w3-table" style="line-height:15px">
<tr class="w3-border-bottom custom-border-grey">
<th><b>Armor</b></th>
@ -708,9 +749,9 @@
</tr>
{% endfor %}
{% else %}
<tr><td>No armor found.</td></tr>
<tr><td>No armor found.</td></tr>
{% endif %}
</table>
</table>
</div>
{% endblock %}
@ -719,7 +760,54 @@
<p style="margin:3px" class="fancy w3-center w3-xlarge">
<span class="w3-center"><b>Health & Defense</b></span>
</p>
<div class="w3-cell-row">
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Soak (N/A/T):</span>
<span class="w3-right">{{ object.soakNatural }}/{{ object.soakArmored }}/{{ object.soakTotal }}</span>
</div>
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Hardness:</span>
<span class="w3-right">{{ object.hardness }}</span>
</div>
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Guile:</span>
<span class="w3-right">{{ object.guile }}</span>
</div>
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Resolve:</span>
<span class="w3-right">{{ object.resolve }}</span>
</div>
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Rush:</span>
<span class="w3-right">{{ object.rush }}</span>
</div>
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Evasion:</span>
<span class="w3-right">{{ object.evasion }}</span>
</div>
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Disengage:</span>
<span class="w3-right">{{ object.disengage }}</span>
</div>
<div class="w3-cell w3-row-padding vl w3-hide-small">
</div>
<div class="w3-cell w3-mobile custom-hover-grey custom-hover-text-orange w3-row-padding">
<span>Join Battle:</span>
<span class="w3-right">{{ object.joinBattle }}</span>
</div>
</div>
</div>
{% endblock %}
@ -728,6 +816,40 @@
<p style="margin:3px" class="fancy w3-center w3-xlarge">
<span class="w3-center"><b>Intimacies</b></span>
</p>
<table class="w3-table" style="line-height:15px">
<tr class="w3-border-bottom custom-border-grey">
<th>Principal</th>
<th>Intensity</th>
</tr>
{% if object.intimacyPrincipal_set.all %}
{% for tie in object.intimacyPrincipal_set.all %}
<tr class="custom-hover-grey custom-hover-text-orange">
<td>{{ tie.description }}</td>
<td>{{ tie.intensity }}</td>
</tr>
{% endfor %}
{% else %}
<tr><td>No principals found.</td></tr>
{% endif %}
</table>
<table class="w3-table" style="line-height:15px">
<tr class="w3-border-bottom custom-border-grey">
<th>Tie</th>
<th>Target</th>
<th>Intensity</th>
</tr>
{% if object.intimacyTie_set.all %}
{% for tie in object.intimacyTie_set.all %}
<tr class="custom-hover-grey custom-hover-text-orange">
<td>{{ tie.description }}</td>
<td>{{ tie.target }}</td>
<td>{{ tie.intensity }}</td>
</tr>
{% endfor %}
{% else %}
<tr><td>No ties found.</td></tr>
{% endif %}
</table>
</div>
{% endblock %}