add Carte Blanche trinket: equip system, gatekeeper multi-slot, mini tooltip portal; new token type Token.CARTE ('carte') with fa-money-check icon; migrations 0010-0012:
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
CARTE type, User.equipped_trinket FK, Token.slots_claimed field; post_save signal sets equipped_trinket=COIN for new users, PASS for staff; kit bag now shows only the equipped trinket in Trinkets section; Game Kit applet mini tooltip portal shows Equipped or Equip Trinket per token; AJAX POST equip-trinket id updates equippedId in-place; equip btn now works for COIN, PASS, and CARTE (data-token-id added to all three); Gatekeeper CARTE flow: drop_token sets current_room (no slot reserved); each empty slot up to slots_claimed+1 gets a drop-token-btn; slots_claimed high-water mark advances on fill, never decrements; highest CARTE-filled slot gets NVM (release_slot); token_return_btn resets current_room + slots_claimed + un-fills all CARTE slots; gate_status always returns full template so launch-game-btn persists via HTMX when gate_status == OPEN; room.html includes gatekeeper when GATHERING or OPEN; new FT test_trinket_carte_blanche.py (2 tests, both passing); 299 tests green
This commit is contained in:
18
src/apps/lyric/migrations/0010_carte_blanche_token_type.py
Normal file
18
src/apps/lyric/migrations/0010_carte_blanche_token_type.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 6.0 on 2026-03-15 23:42
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('lyric', '0009_alter_token_token_type'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='token',
|
||||
name='token_type',
|
||||
field=models.CharField(choices=[('coin', 'Coin-on-a-String'), ('Free', 'Free Token'), ('tithe', 'Tithe Token'), ('pass', 'Backstage Pass'), ('carte', 'Carte Blanche')], max_length=8),
|
||||
),
|
||||
]
|
||||
19
src/apps/lyric/migrations/0011_user_equipped_trinket_fk.py
Normal file
19
src/apps/lyric/migrations/0011_user_equipped_trinket_fk.py
Normal file
@@ -0,0 +1,19 @@
|
||||
# Generated by Django 6.0 on 2026-03-15 23:44
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('lyric', '0010_carte_blanche_token_type'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='equipped_trinket',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='lyric.token'),
|
||||
),
|
||||
]
|
||||
18
src/apps/lyric/migrations/0012_carte_slots_claimed.py
Normal file
18
src/apps/lyric/migrations/0012_carte_slots_claimed.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 6.0 on 2026-03-16 03:28
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('lyric', '0011_user_equipped_trinket_fk'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='token',
|
||||
name='slots_claimed',
|
||||
field=models.PositiveSmallIntegerField(default=0),
|
||||
),
|
||||
]
|
||||
@@ -33,6 +33,10 @@ class User(AbstractBaseUser):
|
||||
searchable = models.BooleanField(default=False)
|
||||
palette = models.CharField(max_length=32, default="palette-default")
|
||||
stripe_customer_id = models.CharField(max_length=255, null=True, blank=True)
|
||||
equipped_trinket = models.ForeignKey(
|
||||
"Token", null=True, blank=True,
|
||||
on_delete=models.SET_NULL, related_name="+",
|
||||
)
|
||||
|
||||
is_staff = models.BooleanField(default=False)
|
||||
is_superuser = models.BooleanField(default=False)
|
||||
@@ -72,11 +76,13 @@ class Token(models.Model):
|
||||
FREE = "Free"
|
||||
TITHE = "tithe"
|
||||
PASS = "pass"
|
||||
CARTE = "carte"
|
||||
TOKEN_TYPE_CHOICES = [
|
||||
(COIN, "Coin-on-a-String"),
|
||||
(FREE, "Free Token"),
|
||||
(TITHE, "Tithe Token"),
|
||||
(PASS, "Backstage Pass"),
|
||||
(CARTE, "Carte Blanche"),
|
||||
]
|
||||
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="tokens")
|
||||
@@ -87,6 +93,7 @@ class Token(models.Model):
|
||||
on_delete=models.SET_NULL, related_name="coin_tokens"
|
||||
)
|
||||
next_ready_at = models.DateTimeField(null=True, blank=True)
|
||||
slots_claimed = models.PositiveSmallIntegerField(default=0, blank=True)
|
||||
|
||||
def tooltip_name(self):
|
||||
return self.get_token_type_display()
|
||||
@@ -98,10 +105,12 @@ class Token(models.Model):
|
||||
return "Admit All Entry"
|
||||
if self.token_type == self.TITHE:
|
||||
return "+ Writ bonus"
|
||||
if self.token_type == self.CARTE:
|
||||
return "Admit up to +6"
|
||||
return ""
|
||||
|
||||
def tooltip_expiry(self):
|
||||
if self.token_type in (self.COIN, self.PASS):
|
||||
if self.token_type in (self.COIN, self.PASS, self.CARTE):
|
||||
if self.token_type == self.COIN and self.next_ready_at:
|
||||
return f"Ready {self.next_ready_at.strftime('%Y-%m-%d')}"
|
||||
return "no expiry"
|
||||
@@ -118,8 +127,12 @@ class Token(models.Model):
|
||||
def tooltip_shoptalk(self):
|
||||
if self.token_type == self.COIN:
|
||||
return "\u2026and another after that, and another after that\u2026"
|
||||
if self.token_type == self.FREE:
|
||||
return "a spot of good fortune"
|
||||
if self.token_type == self.PASS:
|
||||
return "\u2018Entry fee\u2019? Pal, do you know who you\u2019re talking to?"
|
||||
if self.token_type == self.CARTE:
|
||||
return "No, I\u2019m afraid we\u2019ll be taking over from here."
|
||||
return None
|
||||
|
||||
def tooltip_text(self):
|
||||
@@ -143,11 +156,15 @@ def create_wallet_and_tokens(sender, instance, created, **kwargs):
|
||||
if not created:
|
||||
return
|
||||
Wallet.objects.create(user=instance, writs=144)
|
||||
Token.objects.create(user=instance, token_type=Token.COIN)
|
||||
coin = Token.objects.create(user=instance, token_type=Token.COIN)
|
||||
Token.objects.create(
|
||||
user=instance,
|
||||
token_type=Token.FREE,
|
||||
expires_at=timezone.now() + timedelta(days=7),
|
||||
)
|
||||
if instance.is_staff:
|
||||
Token.objects.create(user=instance, token_type=Token.PASS)
|
||||
pass_token = Token.objects.create(user=instance, token_type=Token.PASS)
|
||||
instance.equipped_trinket = pass_token
|
||||
else:
|
||||
instance.equipped_trinket = coin
|
||||
instance.save(update_fields=['equipped_trinket'])
|
||||
|
||||
@@ -163,15 +163,64 @@ class TokenTooltipTest(TestCase):
|
||||
free.expires_at = None
|
||||
self.assertEqual(free.tooltip_expiry(), "")
|
||||
|
||||
def test_tooltip_shoptalk_none_for_non_coin(self):
|
||||
def test_tooltip_shoptalk_none_for_free_coin(self):
|
||||
free = Token.objects.get(user=self.user, token_type=Token.FREE)
|
||||
self.assertIsNone(free.tooltip_shoptalk())
|
||||
self.assertEqual(free.tooltip_shoptalk(), "a spot of good fortune")
|
||||
|
||||
def test_tooltip_room_html_returns_empty_when_no_room(self):
|
||||
token = Token.objects.get(user=self.user, token_type=Token.COIN)
|
||||
self.assertEqual(token.tooltip_room_html(), "")
|
||||
|
||||
|
||||
class EquippedTrinketTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="equip@test.io", is_staff=True)
|
||||
self.pass_token = self.user.tokens.get(token_type=Token.PASS)
|
||||
|
||||
def test_normal_user_equipped_trinket_defaults_to_coin(self):
|
||||
user = User.objects.create(email="noequip@test.io")
|
||||
coin = user.tokens.get(token_type=Token.COIN)
|
||||
self.assertEqual(user.equipped_trinket, coin)
|
||||
|
||||
def test_staff_user_equipped_trinket_defaults_to_pass(self):
|
||||
self.assertEqual(self.user.equipped_trinket, self.pass_token)
|
||||
|
||||
def test_equipped_trinket_can_be_set_to_pass(self):
|
||||
self.user.equipped_trinket = self.pass_token
|
||||
self.user.save(update_fields=["equipped_trinket"])
|
||||
self.assertEqual(
|
||||
User.objects.get(pk=self.user.pk).equipped_trinket, self.pass_token
|
||||
)
|
||||
|
||||
def test_equipped_trinket_can_be_set_to_carte(self):
|
||||
carte = Token.objects.create(user=self.user, token_type=Token.CARTE)
|
||||
self.user.equipped_trinket = carte
|
||||
self.user.save(update_fields=["equipped_trinket"])
|
||||
self.assertEqual(
|
||||
User.objects.get(pk=self.user.pk).equipped_trinket, carte
|
||||
)
|
||||
|
||||
def test_equipped_trinket_can_be_cleared(self):
|
||||
self.user.equipped_trinket = self.pass_token
|
||||
self.user.save(update_fields=["equipped_trinket"])
|
||||
self.user.equipped_trinket = None
|
||||
self.user.save(update_fields=["equipped_trinket"])
|
||||
self.assertIsNone(User.objects.get(pk=self.user.pk).equipped_trinket)
|
||||
|
||||
|
||||
class CarteTokenCreationTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="carte@test.io")
|
||||
|
||||
def test_carte_token_can_be_created(self):
|
||||
token = Token.objects.create(user=self.user, token_type=Token.CARTE)
|
||||
self.assertEqual(Token.objects.get(pk=token.pk).token_type, Token.CARTE)
|
||||
|
||||
def test_carte_has_no_expiry(self):
|
||||
token = Token.objects.create(user=self.user, token_type=Token.CARTE)
|
||||
self.assertIsNone(token.expires_at)
|
||||
|
||||
|
||||
class PaymentMethodTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="pay@test.io")
|
||||
|
||||
@@ -55,3 +55,21 @@ class PassTokenTooltipTest(SimpleTestCase):
|
||||
def test_tooltip_contains_no_expiry(self):
|
||||
self.assertIn("no expiry", self.token.tooltip_text())
|
||||
|
||||
|
||||
class CarteTooltipTest(SimpleTestCase):
|
||||
def setUp(self):
|
||||
self.token = Token()
|
||||
self.token.token_type = Token.CARTE
|
||||
self.token.expires_at = None
|
||||
|
||||
def test_tooltip_contains_name(self):
|
||||
self.assertIn("Carte Blanche", self.token.tooltip_text())
|
||||
|
||||
def test_tooltip_contains_entry(self):
|
||||
self.assertIn("Admit up to +6", self.token.tooltip_text())
|
||||
|
||||
def test_tooltip_contains_shoptalk(self):
|
||||
self.assertIn("taking over from here", self.token.tooltip_text())
|
||||
|
||||
def test_tooltip_contains_no_expiry(self):
|
||||
self.assertIn("no expiry", self.token.tooltip_text())
|
||||
|
||||
Reference in New Issue
Block a user