Skip to content

Commit

Permalink
feat(rpg): imaginary charisma level
Browse files Browse the repository at this point in the history
  • Loading branch information
vEnhance committed Jun 22, 2024
1 parent e8a4033 commit 568a354
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
4 changes: 3 additions & 1 deletion dashboard/templates/dashboard/portal.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ <h1>Getting Started — Setup Instructions</h1>
<div class="greeting">
{% if request.user|getconfig:"show_bars" %}
<h1>
Level {{ level_number }} —
Level {{ level_number }}
{% if meters.diamonds.imaginary_level %}+ {{ meters.diamonds.imaginary_level }}{% endif %}
<a href="{% url 'stats' student.pk %}">
<span class="emoji-text">🏅</span>{{ level_name }}</a>
</h1>
Expand Down
10 changes: 10 additions & 0 deletions rpg/levelsys.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@ def __init__(
def level(self) -> int:
return int(max(0, self.value) ** 0.5)

@property
def imaginary_level(self) -> str | None:
if self.value >= 0:
return None
x = int((-self.value) ** 0.5)
if x == 1:
return "i"
else:
return f"{x}i"

@property
def percent(self) -> int:
eps = 0.4 # Make sure text fits in the bar
Expand Down
6 changes: 5 additions & 1 deletion rpg/templates/rpg/meters/large.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ <h2 class="accordion-header" id="heading{{ meter.name }}">
aria-expanded="false"
aria-controls="collapse{{ meter.name }}">
<span class="meter-header" style="color: {{ meter.color }};">
<span style="font-size: 150%;">{{ meter.level }}</span>
{% if meter.imaginary_level %}
<span style="font-size: 150%;">{{ meter.imaginary_level }}</span>
{% else %}
<span style="font-size: 150%;">{{ meter.level }}</span>
{% endif %}
{{ meter.name }}
</span>
<span class="badge bg-secondary" style="position:absolute; right:60px;">Total {{ meter.value }}{{ meter.unit }}</span>
Expand Down
6 changes: 5 additions & 1 deletion rpg/templates/rpg/meters/small.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
</div>
<div style="position: relative;">
<span class="meter-name" style="color: {{ meter.color }};">
<big style="font-weight: 900;">{{ meter.level }}</big>
{% if meter.imaginary_level %}
<big style="font-weight: 900;">{{ meter.imaginary_level }}</big>
{% else %}
<big style="font-weight: 900;">{{ meter.level }}</big>
{% endif %}
{{ meter.name }}
</span>
<span style="position:absolute; right: 0; text-align: right;">
Expand Down

0 comments on commit 568a354

Please sign in to comment.