+
({ httpRequest: vi.fn() }));
vi.mock("axios", () => ({
- default: {
- create: () => ({ request: httpRequest }),
- isAxiosError: () => false,
- },
+ default: { create: () => ({ request: httpRequest }), isAxiosError: () => false },
}));
vi.mock("./realtime", () => ({
- campaignRequest: vi.fn().mockResolvedValue({ id: 4, ledger: "test" }),
+ campaignRequest: vi.fn().mockResolvedValue(undefined),
ensureCampaignRealtime: vi.fn().mockResolvedValue(undefined),
inviteRequest: vi.fn(),
userRequest: vi.fn(),
@@ -40,158 +23,33 @@ vi.mock("./realtime", () => ({
describe("API client", () => {
afterEach(() => {
vi.clearAllMocks();
- vi.unstubAllGlobals();
});
- it("uses the CSRF token when posting login credentials", async () => {
- httpRequest
- .mockResolvedValueOnce({ status: 200, data: { csrfToken: "token" } })
- .mockResolvedValueOnce({ status: 200, data: { id: 1, username: "jay" } });
+ it("manages a DiceCloud link through the campaign socket", async () => {
+ await linkDiceCloudCharacter(8, 2, "sfdxGdwav3hoNATLJ");
+ await setCharacterActive(8, 2, false);
+ await unlinkDiceCloudCharacter(8, 2);
- await initialiseCsrf();
- await login("jay", "secret");
-
- expect(httpRequest).toHaveBeenNthCalledWith(
- 2,
- expect.objectContaining({
- url: "/api/auth/session/",
- method: "POST",
- headers: expect.objectContaining({ "X-CSRFToken": "token" }),
- }),
- );
- });
-
- it("sends money transfers and exchanges over the acting context socket", async () => {
- await createMoneyTransfer(8, {
- from_character_id: 2,
- to_character_id: null,
- amounts: { gp: 3, sp: 4, cp: 7 },
- });
- await createMoneyExchange(8, {
+ expect(ensureCampaignRealtime).toHaveBeenCalledWith(8);
+ expect(campaignRequest).toHaveBeenNthCalledWith(1, "characters.dicecloud.link", {
character_id: 2,
- given: { gp: 1 },
- received: { sp: 10 },
+ creature: "sfdxGdwav3hoNATLJ",
});
-
- expect(ensureCampaignRealtime).toHaveBeenCalledWith(8);
- expect(campaignRequest).toHaveBeenNthCalledWith(1, "money.transfers.create", {
- from_character_id: 2,
- to_character_id: null,
- amounts: { gp: 3, sp: 4, cp: 7 },
+ expect(campaignRequest).toHaveBeenNthCalledWith(2, "characters.active.set", {
+ character_id: 2,
+ is_active: false,
});
- expect(campaignRequest).toHaveBeenNthCalledWith(2, "money.exchanges.create", {
+ expect(campaignRequest).toHaveBeenNthCalledWith(3, "characters.dicecloud.unlink", {
character_id: 2,
- given: { gp: 1 },
- received: { sp: 10 },
});
});
- it("sends shared XP awards and ledger reversals over the socket", async () => {
- await createSharedXpAward(8, {
+ it("sends party XP awards without individual character data", async () => {
+ await createSharedXpAward(8, { amount: 250, description: "Milestone" });
+
+ expect(campaignRequest).toHaveBeenCalledWith("experience.shared_awards.create", {
amount: 250,
description: "Milestone",
});
- await reverseTransaction(8, {
- id: 41,
- ledger: "experience",
- } as LedgerTransaction);
-
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 1,
- "experience.shared_awards.create",
- {
- amount: 250,
- description: "Milestone",
- },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(2, "transactions.reverse", {
- ledger: "experience",
- transaction_id: 41,
- });
- });
-
- it("maps the display class field to the character command payload", async () => {
- await updateCharacter(8, 2, {
- name: "Wren",
- class: "Wizard",
- });
-
- expect(campaignRequest).toHaveBeenCalledWith("characters.update", {
- character_id: 2,
- fields: {
- name: "Wren",
- character_class: "Wizard",
- },
- });
- });
-
- it("manages encounters through the historical socket commands", async () => {
- await startEncounter(8);
- await addCharacterToEncounter(8, 2, 18);
- await addEncounterCombatant(8, {
- name: "Goblin 2",
- initiative: 12,
- current_hp: 7,
- max_hp: 7,
- });
- await reorderEncounterCombatants(8, [31, 30]);
- await setCurrentEncounterCombatant(8, 30);
- await removeEncounterCombatant(8, 31);
- await endEncounter(8);
-
- expect(campaignRequest).toHaveBeenNthCalledWith(1, "campaign.encounter.start", {});
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 2,
- "campaign.encounter.combatants.add_character",
- { character_id: 2, initiative: 18 },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 3,
- "campaign.encounter.combatants.add",
- {
- name: "Goblin 2",
- initiative: 12,
- current_hp: 7,
- max_hp: 7,
- },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 4,
- "campaign.encounter.combatants.reorder",
- { combatant_ids: [31, 30] },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 5,
- "campaign.encounter.current.set",
- { combatant_id: 30 },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 6,
- "campaign.encounter.combatants.remove",
- { combatant_id: 31 },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(7, "campaign.encounter.end", {});
- });
-
- it("sends player initiative and turn commands", async () => {
- await rollPlayerInitiative(8, 17);
- await chooseInitiativeTie(8, 31);
- await endPlayerTurn(8);
-
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 1,
- "campaign.encounter.initiative.roll",
- { roll: 17 },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 2,
- "campaign.encounter.initiative.tie.choose",
- { combatant_id: 31 },
- );
- expect(campaignRequest).toHaveBeenNthCalledWith(
- 3,
- "campaign.encounter.turn.end",
- {},
- );
});
});
diff --git a/hoard/api.ts b/hoard/api.ts
index d1bc7cd0c..773b8a279 100644
--- a/hoard/api.ts
+++ b/hoard/api.ts
@@ -25,50 +25,46 @@ export type Calculation = {
}>;
};
-export type CharacterSheet = {
- level: number;
- rolled_hit_points: number;
- hp_ability: string;
- hp_adjustment: number;
- initiative_adjustment: number;
- proficiency_bonus_adjustment: number;
- max_hp: number;
- hp_calculation: Calculation;
- current_hp: number;
- temporary_hp: number;
- initiative: Calculation;
- proficiency_bonus: number;
- proficiency_bonus_calculation: Calculation;
- jack_of_all_trades: boolean;
- remarkable_athlete: boolean;
- abilities: Record<
- string,
- {
- score: number;
- raw: number;
- ancestry_bonus: number;
- background_bonus: number;
- score_adjustment: number;
- modifier: number;
- check_bonus: number;
- check_formula: Calculation;
- formula: Calculation;
- }
- >;
- saves: Record<
- string,
- { proficiency: string; adjustment: number; bonus: number; formula: Calculation }
- >;
- skills: Record<
- string,
- {
- ability: string;
- proficiency: string;
- adjustment: number;
- bonus: number;
- formula: Calculation;
- }
- >;
+export type DiceCloudProfile = {
+ unavailable?: boolean;
+ error?: string;
+ id: string;
+ source_url: string;
+ fetched_at: string;
+ stale: boolean;
+ name: string;
+ image_url: string | null;
+ details: Record{{ label }}
- - {{ abbreviation }} · {{ ability.score }} - -
-
+
+
+ , default: null },
maxHp: { type: Number as PropType, default: null },
- healthPercentage: {
- type: Number as PropType,
- default: null,
- },
+ healthPercentage: { type: Number as PropType, default: null },
+ temporaryHp: { type: Number, default: 0 },
current: { type: Boolean, default: false },
},
computed: {
- healthLabel(): string {
- if (this.currentHp !== null && this.maxHp !== null) {
- return `${this.name} health: ${this.currentHp} of ${this.maxHp}`;
- }
-
- return `${this.name} health bar`;
+ hasDetailedHealth(): boolean {
+ return this.currentHp !== null && this.maxHp !== null;
+ },
+ hasHealthIndicator(): boolean {
+ return this.hasDetailedHealth || this.healthPercentage !== null;
},
},
});
+
+
diff --git a/hoard/campaigns/components/PartyRailMember.vue b/hoard/campaigns/components/PartyRailMember.vue
index bbc41f648..5b46711d3 100644
--- a/hoard/campaigns/components/PartyRailMember.vue
+++ b/hoard/campaigns/components/PartyRailMember.vue
@@ -6,9 +6,9 @@
:connected="connected"
show-presence
:expanded="expanded"
- :current-hp="character.sheet.current_hp"
- :max-hp="character.sheet.max_hp"
- :health-percentage="healthPercentage"
+ :current-hp="hitPoints"
+ :max-hp="maximumHitPoints"
+ :temporary-hp="temporaryHitPoints"
/>
@@ -36,14 +36,18 @@ export default defineComponent({
label(): string {
return this.isCurrentCharacter ? "You" : this.character.name;
},
- healthPercentage(): number {
- return Math.max(
- 0,
- Math.min(
- 100,
- (this.character.sheet.current_hp / this.character.sheet.max_hp) * 100,
- ),
- );
+ hitPoints(): number | null {
+ const value = this.character.profile?.stats.hitPoints;
+ return typeof value === "number" ? value : null;
+ },
+ maximumHitPoints(): number | null {
+ const stats = this.character.profile?.stats;
+ const value = stats?.maxHitPoints ?? stats?.hitPoints;
+ return typeof value === "number" ? value : null;
+ },
+ temporaryHitPoints(): number {
+ const value = this.character.profile?.stats.tempHP;
+ return typeof value === "number" && value > 0 ? value : 0;
},
},
});
diff --git a/hoard/campaigns/components/PartyRoster.vue b/hoard/campaigns/components/PartyRoster.vue
index 27f918daf..824dd7dad 100644
--- a/hoard/campaigns/components/PartyRoster.vue
+++ b/hoard/campaigns/components/PartyRoster.vue
@@ -33,7 +33,7 @@ export default defineComponent({
computed: {
playerCharacters(): Character[] {
return this.characters
- .filter((character) => character.is_active && character.is_player_character)
+ .filter((character) => character.is_active)
.sort((first, second) => {
const presenceDifference =
Number(this.connectedFor(second)) - Number(this.connectedFor(first));
diff --git a/hoard/campaigns/consumers.py b/hoard/campaigns/consumers.py
index 555f60aea..a68a0beb8 100644
--- a/hoard/campaigns/consumers.py
+++ b/hoard/campaigns/consumers.py
@@ -31,9 +31,6 @@
CampaignMemberData,
CampaignMembershipChangedEvent,
CampaignPresenceChangedEvent,
- CharacterHealthChangedEvent,
- CharacterLifecycleData,
- CharacterLifecycleEvent,
)
from .protocol import (
CommandAcknowledgementEnvelope,
@@ -52,12 +49,7 @@
notify_campaign_changed,
notify_campaign_event,
)
-from .services import (
- CharacterLifecycleService,
- accept_invitation,
- create_invitation,
- register_and_accept,
-)
+from .services import accept_invitation, create_invitation, register_and_accept
from .services.calendar import CampaignCalendarService
logger = logging.getLogger(__name__)
@@ -148,6 +140,7 @@ async def receive_json(self, content: dict[str, object], **kwargs: object) -> No
"campaign.get": self._campaign_get,
"campaign.calendar.get": self._calendar_get,
"campaign.calendar.adjust": self._calendar_adjust,
+ "campaign.experience.recipients.set": self._experience_recipients_set,
"campaign.members.list": self._member_list,
"campaign.members.deactivate": self._member_deactivate,
"campaign.invites.list": self._invite_list,
@@ -170,17 +163,10 @@ async def receive_json(self, content: dict[str, object], **kwargs: object) -> No
"campaign.encounter.turn.end": self._player_turn_end,
"characters.list": self._character_list,
"characters.get": self._character_get,
- "characters.create": self._character_create,
- "characters.update": self._character_update,
- "characters.portrait.remove": self._character_portrait_remove,
- "characters.archive": self._character_archive,
- "characters.health.post": self._character_health_adjust,
- "characters.rest": self._character_rest,
- "transactions.list": self._transaction_list,
- "money.transfers.create": self._money_transfer_create,
- "money.exchanges.create": self._money_exchange_create,
+ "characters.dicecloud.link": self._character_dicecloud_link,
+ "characters.dicecloud.unlink": self._character_dicecloud_unlink,
+ "characters.active.set": self._character_active_set,
"experience.shared_awards.create": self._shared_xp_create,
- "transactions.reverse": self._transaction_reverse,
}
handler = handlers.get(message_type)
if handler is not None:
@@ -303,15 +289,13 @@ async def _request_response(self, content: dict[str, object], handler) -> None:
).model_dump(mode="json")
elif message_type in {
"campaign.calendar.adjust",
+ "campaign.experience.recipients.set",
"campaign.members.deactivate",
"campaign.invites.revoke",
"campaign.presence.heartbeat",
- "characters.create",
- "characters.update",
- "characters.portrait.remove",
- "characters.archive",
- "characters.health.post",
- "characters.rest",
+ "characters.dicecloud.link",
+ "characters.dicecloud.unlink",
+ "characters.active.set",
"campaign.encounter.start",
"campaign.encounter.end",
"campaign.encounter.combatants.add_character",
@@ -375,6 +359,8 @@ def _campaign_get(self, content: dict[str, object]) -> dict[str, object]:
from .api import (
character_data,
context_data,
+ dicecloud_projection,
+ party_experience_award_data,
party_money,
visible_characters,
)
@@ -383,12 +369,19 @@ def _campaign_get(self, content: dict[str, object]) -> dict[str, object]:
context = self._context()
campaign = context.campaign
connected_context_ids = self.connected_context_ids(campaign.pk)
+ characters = list(
+ visible_characters(context).select_related("context__user").order_by("pk")
+ )
+ projections = {
+ character.pk: dicecloud_projection(character) for character in characters
+ }
return {
**context_data(context),
"id": campaign.pk,
"name": campaign.name,
"is_game_master": context.kind == CampaignContext.Kind.GM,
"shared_experience": campaign.shared_experience,
+ "experience_recipient_count": campaign.experience_recipient_count,
"level": campaign.level,
"eligible_level": Character.level_for_experience(
campaign.shared_experience
@@ -396,8 +389,14 @@ def _campaign_get(self, content: dict[str, object]) -> dict[str, object]:
"calendar": CampaignCalendarData.from_campaign(campaign).model_dump(
mode="json"
),
- "party_money": party_money(campaign),
- "encounter": encounter_data(context),
+ "party_money": party_money(campaign, projections),
+ "party_experience_awards": [
+ party_experience_award_data(award)
+ for award in campaign.party_xp_awards.select_related(
+ "created_by__user"
+ ).all()
+ ],
+ "encounter": encounter_data(context, projections),
"members": [
{
"id": candidate.pk,
@@ -418,7 +417,8 @@ def _campaign_get(self, content: dict[str, object]) -> dict[str, object]:
).select_related("user")
],
"characters": [
- character_data(value, context) for value in visible_characters(context)
+ character_data(value, context, projections[value.pk])
+ for value in characters
],
"invitations": (
[self._invitation_data(value) for value in campaign.invitations.all()]
@@ -746,14 +746,23 @@ def _invite_revoke(self, content: dict[str, object]) -> None:
@database_sync_to_async
def _character_list(self, content: dict[str, object]) -> list[dict[str, object]]:
- from .api import character_data, visible_characters
+ from .api import character_data, dicecloud_projection, visible_characters
context = self._context()
- return [character_data(value, context) for value in visible_characters(context)]
+ characters = visible_characters(context).select_related("context__user")
+ return [
+ character_data(value, context, dicecloud_projection(value))
+ for value in characters
+ ]
@database_sync_to_async
def _character_get(self, content: dict[str, object]) -> dict[str, object]:
- from .api import character_data, character_for_context, visible_characters
+ from .api import (
+ character_data,
+ character_for_context,
+ dicecloud_projection,
+ visible_characters,
+ )
context = self._context()
character = character_for_context(
@@ -761,254 +770,76 @@ def _character_get(self, content: dict[str, object]) -> dict[str, object]:
)
if not visible_characters(context).filter(pk=character.pk).exists():
raise HttpError(404, "Character not found.")
- return character_data(character, context)
+ return character_data(character, context, dicecloud_projection(character))
@database_sync_to_async
- def _character_create(self, content: dict[str, object]) -> dict[str, object]:
- from .api import character_data, gm_context
-
- context = self._context()
- gm_context(context)
- fields = content.get("fields")
- if not isinstance(fields, dict) or not fields.get("is_npc"):
- raise ValidationError("Only NPC creation is available from this command.")
- character = CharacterLifecycleService().create_npc(context, fields)
- notify_campaign_event(
- context.campaign_id,
- CharacterLifecycleEvent(
- type="character.created",
- character=CharacterLifecycleData(
- id=character.pk,
- name=character.name,
- is_active=character.is_active,
- ),
- request_id=str(content["request_id"]),
- ),
- )
- return character_data(character, context)
-
- @database_sync_to_async
- def _character_update(self, content: dict[str, object]) -> dict[str, object]:
- from .api import character_data, editable_character
-
- context = self._context()
- character = editable_character(context, self._integer(content, "character_id"))
- fields = content.get("fields")
- if not isinstance(fields, dict):
- raise ValueError("fields must be an object.")
- character = CharacterLifecycleService().update(context, character, fields)
- notify_campaign_event(
- context.campaign_id,
- CharacterLifecycleEvent(
- type="character.updated",
- character=CharacterLifecycleData(
- id=character.pk,
- name=character.name,
- is_active=character.is_active,
- ),
- request_id=str(content["request_id"]),
- ),
- )
- return character_data(character, context)
-
- @database_sync_to_async
- def _character_portrait_remove(
- self, content: dict[str, object]
- ) -> dict[str, object]:
- from .api import character_data, editable_character
+ def _character_dicecloud_link(self, content: dict[str, object]) -> None:
+ from .api import editable_character
+ from .payloads import DiceCloudLinkCommand
+ from .services.dicecloud import creature_id_from_input, refresh_creature
context = self._context()
- character = editable_character(context, self._integer(content, "character_id"))
- character.portrait.delete(save=True)
+ command = DiceCloudLinkCommand.model_validate(content)
+ character = editable_character(context, command.character_id)
+ creature_id = creature_id_from_input(command.creature)
+ refresh_creature(creature_id)
+ character.dicecloud_creature_id = creature_id
+ character.is_active = True
+ character.save(update_fields=("dicecloud_creature_id", "is_active"))
notify_campaign_changed(context.campaign_id, str(content["request_id"]))
- return character_data(character, context)
-
- @database_sync_to_async
- def _character_archive(self, content: dict[str, object]) -> dict[str, object]:
- from .api import character_data, editable_character
-
- context = self._context()
- character = editable_character(context, self._integer(content, "character_id"))
- character = CharacterLifecycleService().archive(context, character)
- notify_campaign_event(
- context.campaign_id,
- CharacterLifecycleEvent(
- type="character.archived",
- character=CharacterLifecycleData(
- id=character.pk,
- name=character.name,
- is_active=character.is_active,
- ),
- request_id=str(content["request_id"]),
- ),
- )
- return character_data(character, context)
-
@database_sync_to_async
- def _character_health_adjust(self, content: dict[str, object]) -> None:
+ def _character_dicecloud_unlink(self, content: dict[str, object]) -> None:
from .api import editable_character
- from .payloads import CharacterHealthCommand
- from .services.health import adjust_health
+ from .payloads import CharacterIdentifierCommand
context = self._context()
- command = CharacterHealthCommand.model_validate(content)
+ command = CharacterIdentifierCommand.model_validate(content)
character = editable_character(context, command.character_id)
- amount = (
- -command.current_hp_delta
- if command.reason == "damage"
- else command.current_hp_delta
- if command.reason == "healing"
- else command.temporary_hp_delta
- )
- updated = adjust_health(
- character,
- reason=command.reason,
- amount=amount,
- current_hp=command.current_hp,
- temporary_hp=command.temporary_hp,
- description=command.description,
- created_by=context,
- )
- notify_campaign_event(
- context.campaign_id,
- CharacterHealthChangedEvent(
- character_id=updated.pk,
- max_hp=updated.max_hp,
- current_hp=updated.current_hp,
- temporary_hp=updated.temporary_hp,
- request_id=str(content["request_id"]),
- ),
- )
+ character.dicecloud_creature_id = ""
+ character.is_active = False
+ character.save(update_fields=("dicecloud_creature_id", "is_active"))
+ notify_campaign_changed(context.campaign_id, str(content["request_id"]))
@database_sync_to_async
- def _character_rest(self, content: dict[str, object]) -> None:
+ def _character_active_set(self, content: dict[str, object]) -> None:
from .api import editable_character
- from .payloads import CharacterRestCommand
- from .services.health import take_rest
+ from .payloads import CharacterActiveCommand
context = self._context()
- command = CharacterRestCommand.model_validate(content)
+ command = CharacterActiveCommand.model_validate(content)
character = editable_character(context, command.character_id)
- updated = take_rest(
- character,
- kind=command.kind,
- regained_hp=command.regained_hp,
- created_by=context,
- )
- notify_campaign_event(
- context.campaign_id,
- CharacterHealthChangedEvent(
- character_id=updated.pk,
- max_hp=updated.max_hp,
- current_hp=updated.current_hp,
- temporary_hp=updated.temporary_hp,
- request_id=str(content["request_id"]),
- ),
- )
-
- @database_sync_to_async
- def _transaction_list(self, content: dict[str, object]) -> dict[str, object]:
- from .api import TRANSACTION_MODELS, history_data, transaction_queryset
-
- context = self._context()
- ledger = self._string(content, "ledger") or "all"
- rows: list[dict[str, object]] = []
- if ledger in ("all", "money", "experience"):
- ledgers = ("money", "experience") if ledger == "all" else (ledger,)
- for ledger_name in ledgers:
- model = TRANSACTION_MODELS[ledger_name]
- query = transaction_queryset(model, context.campaign)
- if context.kind != CampaignContext.Kind.GM:
- query = query.filter(
- entries__account__character__context__user=context.user
- ).distinct()
- rows.extend(history_data(posted) for posted in query)
- if ledger in ("all", "audit"):
- audit_models = []
- if context.kind == CampaignContext.Kind.GM:
- audit_models.extend((InvitationEvent, MembershipEvent))
- for model in audit_models:
- events = model.objects.filter(campaign=context.campaign).select_related(
- "created_by__user"
- )
- rows.extend(self._audit_data(posted) for posted in events)
- rows.sort(key=lambda row: str(row["occurred_at"]), reverse=True)
- page = max(1, int(content.get("page", 1)))
- page_size = min(100, max(1, int(content.get("page_size", 25))))
- start = (page - 1) * page_size
- return {
- "count": len(rows),
- "page": page,
- "page_size": page_size,
- "results": rows[start : start + page_size],
- }
-
- @database_sync_to_async
- def _money_transfer_create(self, content: dict[str, object]) -> dict[str, object]:
- from types import SimpleNamespace
-
- from .api import MoneyTransferCreate, money_transfer_create
-
- context = self._context()
- payload = MoneyTransferCreate(
- from_character_id=content.get("from_character_id"),
- to_character_id=content.get("to_character_id"),
- amounts=content.get("amounts", {}),
- description=self._string(content, "description"),
- )
- result = money_transfer_create(
- SimpleNamespace(auth=context.user), context.pk, payload
- )
- return result[1] if isinstance(result, tuple) else result
-
- @database_sync_to_async
- def _money_exchange_create(self, content: dict[str, object]) -> dict[str, object]:
- from types import SimpleNamespace
-
- from .api import MoneyExchangeCreate, money_exchange_create
-
- context = self._context()
- payload = MoneyExchangeCreate(
- character_id=self._integer(content, "character_id"),
- given=content.get("given", {}),
- received=content.get("received", {}),
- description=self._string(content, "description"),
- )
- result = money_exchange_create(
- SimpleNamespace(auth=context.user), context.pk, payload
- )
- return result[1] if isinstance(result, tuple) else result
+ character.is_active = command.is_active
+ character.save(update_fields=("is_active",))
+ notify_campaign_changed(context.campaign_id, str(content["request_id"]))
@database_sync_to_async
- def _shared_xp_create(self, content: dict[str, object]) -> dict[str, object]:
- from types import SimpleNamespace
-
- from .api import SharedXpAwardCreate, shared_xp_award_create
+ def _shared_xp_create(self, content: dict[str, object]) -> None:
+ from .api import gm_context
+ from .services.experience import award_shared_experience
context = self._context()
- payload = SharedXpAwardCreate(
- amount=self._integer(content, "amount"),
+ gm_context(context)
+ award_shared_experience(
+ context.campaign,
+ self._integer(content, "amount"),
description=self._string(content, "description"),
+ created_by=context,
)
- result = shared_xp_award_create(
- SimpleNamespace(auth=context.user), context.pk, payload
- )
- return result[1] if isinstance(result, tuple) else result
+ notify_campaign_changed(context.campaign_id, str(content["request_id"]))
@database_sync_to_async
- def _transaction_reverse(self, content: dict[str, object]) -> dict[str, object]:
- from types import SimpleNamespace
-
- from .api import transaction_reverse
+ def _experience_recipients_set(self, content: dict[str, object]) -> None:
+ from .api import gm_context
+ from .payloads import ExperienceRecipientCountCommand
context = self._context()
- return transaction_reverse(
- SimpleNamespace(auth=context.user),
- context.pk,
- self._string(content, "ledger", required=True),
- self._integer(content, "transaction_id"),
- )
+ gm_context(context)
+ command = ExperienceRecipientCountCommand.model_validate(content)
+ campaign = context.campaign
+ campaign.experience_recipient_count = command.experience_recipient_count
+ campaign.save(update_fields=("experience_recipient_count",))
+ notify_campaign_changed(context.campaign_id, str(content["request_id"]))
def _context(self) -> CampaignContext:
context = (
diff --git a/hoard/campaigns/migrations/0003_restore_encounter_tracking.py b/hoard/campaigns/migrations/0003_restore_encounter_tracking.py
index 65ae11a4d..f3db164d0 100644
--- a/hoard/campaigns/migrations/0003_restore_encounter_tracking.py
+++ b/hoard/campaigns/migrations/0003_restore_encounter_tracking.py
@@ -5,46 +5,58 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('campaigns', '0002_character_ability_bonuses_and_more'),
+ ("campaigns", "0002_character_ability_bonuses_and_more"),
]
operations = [
migrations.AlterModelOptions(
- name='encounter',
- options={'ordering': ('-started_at', '-pk')},
+ name="encounter",
+ options={"ordering": ("-started_at", "-pk")},
),
migrations.AlterModelOptions(
- name='encountercombatant',
- options={'ordering': ('-initiative', 'pk')},
+ name="encountercombatant",
+ options={"ordering": ("-initiative", "pk")},
),
migrations.RemoveField(
- model_name='encountercombatant',
- name='position',
+ model_name="encountercombatant",
+ name="position",
),
migrations.AddField(
- model_name='encounter',
- name='initiative_tie_breaks',
+ model_name="encounter",
+ name="initiative_tie_breaks",
field=models.JSONField(blank=True, default=dict),
),
migrations.AddField(
- model_name='encounter',
- name='initiative_tie_choices',
+ model_name="encounter",
+ name="initiative_tie_choices",
field=models.JSONField(blank=True, default=dict),
),
migrations.AddField(
- model_name='encounter',
- name='started_by',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='started_encounters', to='campaigns.campaigncontext'),
+ model_name="encounter",
+ name="started_by",
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name="started_encounters",
+ to="campaigns.campaigncontext",
+ ),
),
migrations.AlterField(
- model_name='encountercombatant',
- name='current_hp',
+ model_name="encountercombatant",
+ name="current_hp",
field=models.IntegerField(blank=True, null=True),
),
migrations.AddConstraint(
- model_name='encountercombatant',
- constraint=models.CheckConstraint(condition=models.Q(('current_hp__isnull', True), ('current_hp__gte', 0), _connector='OR'), name='encounter_combatant_current_hp_nonnegative'),
+ model_name="encountercombatant",
+ constraint=models.CheckConstraint(
+ condition=models.Q(
+ ("current_hp__isnull", True),
+ ("current_hp__gte", 0),
+ _connector="OR",
+ ),
+ name="encounter_combatant_current_hp_nonnegative",
+ ),
),
]
diff --git a/hoard/campaigns/migrations/0004_dicecloud_character_shims.py b/hoard/campaigns/migrations/0004_dicecloud_character_shims.py
new file mode 100644
index 000000000..12752bb6b
--- /dev/null
+++ b/hoard/campaigns/migrations/0004_dicecloud_character_shims.py
@@ -0,0 +1,250 @@
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import migrations, models
+
+
+def clear_legacy_character_data(apps, schema_editor):
+ Character = apps.get_model("campaigns", "Character")
+ EncounterCombatant = apps.get_model("campaigns", "EncounterCombatant")
+ HealthTransaction = apps.get_model("campaigns", "HealthTransaction")
+ ExperienceEntry = apps.get_model("campaigns", "ExperienceEntry")
+ ExperienceTransaction = apps.get_model("campaigns", "ExperienceTransaction")
+ ExperienceAccount = apps.get_model("campaigns", "ExperienceAccount")
+ MoneyEntry = apps.get_model("campaigns", "MoneyEntry")
+ MoneyTransaction = apps.get_model("campaigns", "MoneyTransaction")
+ MoneyAccount = apps.get_model("campaigns", "MoneyAccount")
+ PartyExperienceAward = apps.get_model("campaigns", "PartyExperienceAward")
+
+ for character in Character.objects.exclude(portrait=""):
+ character.portrait.delete(save=False)
+
+ npc_ids = list(Character.objects.filter(kind="npc").values_list("pk", flat=True))
+ for combatant in EncounterCombatant.objects.filter(
+ character_id__in=npc_ids
+ ).select_related("character"):
+ character = combatant.character
+ combatant.name = character.name
+ combatant.current_hp = character.current_hp
+ combatant.max_hp = character.rolled_hit_points
+ combatant.character_id = None
+ combatant.save(update_fields=("name", "current_hp", "max_hp", "character"))
+
+ HealthTransaction.objects.all().delete()
+
+ for transaction in (
+ ExperienceTransaction.objects.order_by("occurred_at", "pk")
+ .select_related("campaign", "created_by__user")
+ .prefetch_related("entries__account")
+ ):
+ recipient_amounts = [
+ entry.amount
+ for entry in transaction.entries.all()
+ if not entry.account.is_system
+ ]
+ if not recipient_amounts:
+ continue
+ per_player, remainder = divmod(sum(recipient_amounts), len(recipient_amounts))
+ PartyExperienceAward.objects.create(
+ campaign=transaction.campaign,
+ amount=(
+ transaction.requested_amount
+ if transaction.requested_amount
+ else sum(recipient_amounts)
+ ),
+ recipient_count=len(recipient_amounts),
+ awarded_per_player=per_player,
+ discarded_amount=transaction.discarded_amount + abs(remainder),
+ reason=transaction.reason,
+ description=transaction.description,
+ created_by=transaction.created_by,
+ actor_username=transaction.actor_username,
+ campaign_era_abbreviation=transaction.campaign_era_abbreviation,
+ campaign_year=transaction.campaign_year,
+ campaign_day=transaction.campaign_day,
+ occurred_at=transaction.occurred_at,
+ )
+
+ ExperienceEntry.objects.all().delete()
+ ExperienceTransaction.objects.update(reversal_of=None)
+ ExperienceTransaction.objects.all().delete()
+ ExperienceAccount.objects.all().delete()
+ MoneyEntry.objects.all().delete()
+ MoneyTransaction.objects.update(reversal_of=None)
+ MoneyTransaction.objects.all().delete()
+ MoneyAccount.objects.all().delete()
+
+ Character.objects.filter(kind="npc").delete()
+ Character.objects.update(is_active=False)
+
+
+def seed_experience_recipient_counts(apps, schema_editor):
+ Campaign = apps.get_model("campaigns", "Campaign")
+ PartyExperienceAward = apps.get_model("campaigns", "PartyExperienceAward")
+
+ for campaign in Campaign.objects.all().iterator():
+ latest_award = (
+ PartyExperienceAward.objects.filter(campaign_id=campaign.pk)
+ .order_by("-occurred_at", "-pk")
+ .first()
+ )
+ if latest_award is None:
+ continue
+ campaign.experience_recipient_count = latest_award.recipient_count
+ campaign.save(update_fields=("experience_recipient_count",))
+
+
+class Migration(migrations.Migration):
+ dependencies = [("campaigns", "0003_restore_encounter_tracking")]
+ atomic = False
+
+ operations = [
+ migrations.AddField(
+ model_name="character",
+ name="dicecloud_creature_id",
+ field=models.CharField(blank=True, default="", max_length=80),
+ preserve_default=False,
+ ),
+ migrations.CreateModel(
+ name="PartyExperienceAward",
+ fields=[
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("amount", models.IntegerField()),
+ ("recipient_count", models.PositiveIntegerField()),
+ ("awarded_per_player", models.IntegerField()),
+ ("discarded_amount", models.PositiveIntegerField(default=0)),
+ ("reason", models.CharField(default="award", max_length=20)),
+ ("description", models.TextField(blank=True)),
+ ("actor_username", models.CharField(blank=True, max_length=150)),
+ (
+ "campaign_era_abbreviation",
+ models.CharField(blank=True, max_length=20, null=True),
+ ),
+ ("campaign_year", models.PositiveIntegerField(blank=True, null=True)),
+ (
+ "campaign_day",
+ models.PositiveSmallIntegerField(blank=True, null=True),
+ ),
+ (
+ "occurred_at",
+ models.DateTimeField(
+ default=django.utils.timezone.now,
+ editable=False,
+ ),
+ ),
+ (
+ "campaign",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="party_xp_awards",
+ to="campaigns.campaign",
+ ),
+ ),
+ (
+ "created_by",
+ models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name="party_xp_awards",
+ to="campaigns.campaigncontext",
+ ),
+ ),
+ ],
+ options={"ordering": ("-occurred_at", "-pk")},
+ ),
+ migrations.RunPython(clear_legacy_character_data, migrations.RunPython.noop),
+ migrations.RemoveField(model_name="character", name="ability_bonuses"),
+ migrations.RemoveField(
+ model_name="character", name="ability_score_adjustments"
+ ),
+ migrations.RemoveField(
+ model_name="character", name="background_ability_bonuses"
+ ),
+ migrations.RemoveField(model_name="character", name="character_class"),
+ migrations.RemoveField(model_name="character", name="charisma"),
+ migrations.RemoveField(model_name="character", name="constitution"),
+ migrations.RemoveField(model_name="character", name="dexterity"),
+ migrations.RemoveField(model_name="character", name="hp_ability"),
+ migrations.RemoveField(model_name="character", name="hp_adjustment"),
+ migrations.RemoveField(model_name="character", name="initiative_adjustment"),
+ migrations.RemoveField(model_name="character", name="intelligence"),
+ migrations.RemoveField(model_name="character", name="jack_of_all_trades"),
+ migrations.RemoveField(model_name="character", name="kind"),
+ migrations.RemoveField(model_name="character", name="portrait"),
+ migrations.RemoveField(
+ model_name="character", name="proficiency_bonus_adjustment"
+ ),
+ migrations.RemoveField(model_name="character", name="race"),
+ migrations.RemoveField(model_name="character", name="remarkable_athlete"),
+ migrations.RenameField(
+ model_name="character",
+ old_name="rolled_hit_points",
+ new_name="max_hp",
+ ),
+ migrations.AlterField(
+ model_name="character",
+ name="current_hp",
+ field=models.PositiveIntegerField(blank=True, null=True),
+ ),
+ migrations.AlterField(
+ model_name="character",
+ name="max_hp",
+ field=models.PositiveIntegerField(blank=True, null=True),
+ ),
+ migrations.AlterField(
+ model_name="character",
+ name="name",
+ field=models.CharField(blank=True, max_length=200),
+ ),
+ migrations.RemoveField(model_name="character", name="save_adjustments"),
+ migrations.RemoveField(model_name="character", name="save_proficiencies"),
+ migrations.RemoveField(model_name="character", name="skill_adjustments"),
+ migrations.RemoveField(model_name="character", name="skill_proficiencies"),
+ migrations.RemoveField(model_name="character", name="strength"),
+ migrations.RemoveField(model_name="character", name="temporary_hp"),
+ migrations.RemoveField(model_name="character", name="wisdom"),
+ migrations.AlterField(
+ model_name="character",
+ name="context",
+ field=models.OneToOneField(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="character",
+ to="campaigns.campaigncontext",
+ ),
+ ),
+ migrations.AddConstraint(
+ model_name="character",
+ constraint=models.UniqueConstraint(
+ condition=~models.Q(dicecloud_creature_id=""),
+ fields=("campaign", "dicecloud_creature_id"),
+ name="unique_dicecloud_creature_per_campaign",
+ ),
+ ),
+ migrations.AddField(
+ model_name="campaign",
+ name="experience_recipient_count",
+ field=models.PositiveSmallIntegerField(
+ default=1, verbose_name="XP Recipient Count"
+ ),
+ ),
+ migrations.RunPython(
+ seed_experience_recipient_counts, migrations.RunPython.noop
+ ),
+ migrations.DeleteModel(name="HealthTransaction"),
+ migrations.DeleteModel(name="ExperienceEntry"),
+ migrations.DeleteModel(name="MoneyEntry"),
+ migrations.DeleteModel(name="ExperienceTransaction"),
+ migrations.DeleteModel(name="MoneyTransaction"),
+ migrations.DeleteModel(name="ExperienceAccount"),
+ migrations.DeleteModel(name="MoneyAccount"),
+ ]
diff --git a/hoard/campaigns/models/__init__.py b/hoard/campaigns/models/__init__.py
index 68e56b994..947c29e87 100644
--- a/hoard/campaigns/models/__init__.py
+++ b/hoard/campaigns/models/__init__.py
@@ -1,44 +1,26 @@
-from .audit import (
- CampaignDatedEvent,
- ImmutableLedgerEntry,
- LedgerTransaction,
- format_campaign_date,
- ordinal,
-)
+from .audit import format_campaign_date, ordinal
from .combat import Encounter, EncounterCombatant
from .core import (
XP_LEVEL_THRESHOLDS,
Campaign,
CampaignContext,
Character,
- MoneyBalance,
)
-from .experience import ExperienceAccount, ExperienceEntry, ExperienceTransaction
-from .history import HealthTransaction, MembershipEvent
+from .history import MembershipEvent
from .invites import CampaignInvitation, InvitationEvent
-from .money import MoneyAccount, MoneyEntry, MoneyTransaction
+from .party_experience import PartyExperienceAward
__all__ = [
"Campaign",
"XP_LEVEL_THRESHOLDS",
- "CampaignDatedEvent",
"CampaignInvitation",
"CampaignContext",
"Encounter",
"EncounterCombatant",
"Character",
- "ExperienceAccount",
- "ExperienceEntry",
- "ExperienceTransaction",
- "ImmutableLedgerEntry",
"InvitationEvent",
- "HealthTransaction",
- "LedgerTransaction",
- "MoneyAccount",
- "MoneyBalance",
- "MoneyEntry",
- "MoneyTransaction",
"MembershipEvent",
+ "PartyExperienceAward",
"format_campaign_date",
"ordinal",
]
diff --git a/hoard/campaigns/models/audit.py b/hoard/campaigns/models/audit.py
index fd4f7b3c3..8c9e3a445 100644
--- a/hoard/campaigns/models/audit.py
+++ b/hoard/campaigns/models/audit.py
@@ -89,38 +89,3 @@ def save(self, *args: Any, **kwargs: Any) -> None:
def delete(self, *args: Any, **kwargs: Any) -> None:
raise ValidationError("Posted campaign events are immutable.")
-
-
-class LedgerTransaction(CampaignDatedEvent):
- """A campaign audit event that records an immutable ledger transaction."""
-
- description = models.TextField("Description", blank=True)
-
- class Meta:
- abstract = True
-
- @property
- def created_at(self):
- """Compatibility alias while clients migrate to occurred_at."""
- return self.occurred_at
-
-
-class ImmutableLedgerEntry(models.Model):
- """An immutable amount recorded against one account in a ledger transaction."""
-
- amount = models.IntegerField()
-
- class Meta:
- abstract = True
-
- def save(self, *args: Any, **kwargs: Any) -> None:
- if self.pk:
- raise ValidationError(
- "Posted ledger entries are immutable; post a reversal instead."
- )
- super().save(*args, **kwargs)
-
- def delete(self, *args: Any, **kwargs: Any) -> None:
- raise ValidationError(
- "Posted ledger entries are immutable; post a reversal instead."
- )
diff --git a/hoard/campaigns/models/combat.py b/hoard/campaigns/models/combat.py
index c7fc5e8eb..2dda7931b 100644
--- a/hoard/campaigns/models/combat.py
+++ b/hoard/campaigns/models/combat.py
@@ -95,7 +95,10 @@ class Meta:
def clean(self) -> None:
super().clean()
- if self.character_id and self.character.campaign_id != self.encounter.campaign_id:
+ if (
+ self.character_id
+ and self.character.campaign_id != self.encounter.campaign_id
+ ):
raise ValidationError(
{"character": "A combatant must belong to the encounter campaign."}
)
@@ -114,14 +117,8 @@ def save(self, *args, **kwargs) -> None:
@property
def display_name(self) -> str:
- if self.character_id:
- return self.character.name
-
return self.name.strip()
@property
def health(self) -> tuple[int | None, int | None]:
- if self.character_id:
- return self.character.current_hp, self.character.max_hp
-
return self.current_hp, self.max_hp
diff --git a/hoard/campaigns/models/core.py b/hoard/campaigns/models/core.py
index e3e4a41c9..6be923c9f 100644
--- a/hoard/campaigns/models/core.py
+++ b/hoard/campaigns/models/core.py
@@ -1,20 +1,6 @@
-from __future__ import annotations
-
-from collections import defaultdict
-from dataclasses import dataclass
-from decimal import Decimal
-from typing import TYPE_CHECKING
-
from django.conf import settings
from django.core.exceptions import ValidationError
from django.db import models
-from django.db.models import Sum
-
-if TYPE_CHECKING:
- from hoard.campaigns.models.experience import ExperienceAccount
- from hoard.campaigns.models.money import MoneyAccount, MoneyTransaction
- from hoard.campaigns.services.actions import CoinAmounts
-
XP_LEVEL_THRESHOLDS = (
0,
@@ -112,6 +98,9 @@ class Campaign(models.Model):
calendar_year = models.PositiveIntegerField("Calendar Year", default=81)
calendar_day = models.PositiveSmallIntegerField("Calendar Day", default=137)
shared_experience = models.PositiveIntegerField("Shared Experience", default=0)
+ experience_recipient_count = models.PositiveSmallIntegerField(
+ "XP Recipient Count", default=1
+ )
level = models.PositiveSmallIntegerField("Campaign Level", default=1)
def adjust_calendar_day(self, amount: int) -> None:
@@ -129,18 +118,6 @@ def adjust_calendar_day(self, amount: int) -> None:
else:
self.calendar_day += amount
- def money_system_account(self) -> MoneyAccount:
- from ..services.ledger import system_account
- from .money import MoneyAccount
-
- return system_account(MoneyAccount, self)
-
- def experience_system_account(self) -> ExperienceAccount:
- from ..services.ledger import system_account
- from .experience import ExperienceAccount
-
- return system_account(ExperienceAccount, self)
-
def award_shared_experience(
self,
amount: int,
@@ -224,26 +201,9 @@ def save(self, *args, **kwargs) -> None:
super().save(*args, **kwargs)
-@dataclass(frozen=True)
-class MoneyBalance:
- copper: int = 0
- silver: int = 0
- electrum: int = 0
- gold: int = 0
- platinum: int = 0
-
- @property
- def gold_value(self) -> Decimal:
- return (
- Decimal(self.copper) / Decimal(100)
- + Decimal(self.silver) / Decimal(10)
- + Decimal(self.electrum) / Decimal(2)
- + Decimal(self.gold)
- + Decimal(self.platinum) * Decimal(10)
- )
-
-
class Character(models.Model):
+ """A local campaign link to a public DiceCloud creature, not a character sheet."""
+
campaign_id: int
context_id: int | None
@@ -254,114 +214,58 @@ class Character(models.Model):
CampaignContext,
null=True,
blank=True,
- on_delete=models.SET_NULL,
+ on_delete=models.CASCADE,
related_name="character",
)
-
- class Kind(models.TextChoices):
- PC = "pc", "Player character"
- NPC = "npc", "Non-player character"
-
- kind = models.CharField(max_length=3, choices=Kind.choices, default=Kind.PC)
+ name = models.CharField(max_length=200, blank=True)
+ current_hp = models.PositiveIntegerField(null=True, blank=True)
+ max_hp = models.PositiveIntegerField(null=True, blank=True)
+ dicecloud_creature_id = models.CharField(max_length=80, blank=True)
is_active = models.BooleanField("Is Active", default=False)
- name = models.CharField("Character Name", max_length=200)
- portrait = models.FileField(upload_to="character-portraits/", blank=True)
- race = models.CharField(max_length=100, blank=True)
- character_class = models.CharField("Class", max_length=100, blank=True)
- rolled_hit_points = models.PositiveIntegerField("Rolled Hit Points", default=1)
- current_hp = models.PositiveIntegerField("Current HP", default=1)
- temporary_hp = models.PositiveIntegerField("Temporary HP", default=0)
- hp_ability = models.CharField(max_length=20, default="constitution")
- hp_adjustment = models.SmallIntegerField(default=0)
- initiative_adjustment = models.SmallIntegerField(default=0)
- proficiency_bonus_adjustment = models.SmallIntegerField(default=0)
- ability_bonuses = models.JSONField(default=dict, blank=True)
- background_ability_bonuses = models.JSONField(default=dict, blank=True)
- ability_score_adjustments = models.JSONField(default=dict, blank=True)
- skill_proficiencies = models.JSONField(default=dict, blank=True)
- skill_adjustments = models.JSONField(default=dict, blank=True)
- save_proficiencies = models.JSONField(default=dict, blank=True)
- save_adjustments = models.JSONField(default=dict, blank=True)
- jack_of_all_trades = models.BooleanField(default=False)
- remarkable_athlete = models.BooleanField(default=False)
- strength = models.PositiveSmallIntegerField(default=10)
- dexterity = models.PositiveSmallIntegerField(default=10)
- constitution = models.PositiveSmallIntegerField(default=10)
- intelligence = models.PositiveSmallIntegerField(default=10)
- wisdom = models.PositiveSmallIntegerField(default=10)
- charisma = models.PositiveSmallIntegerField(default=10)
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=("campaign", "dicecloud_creature_id"),
+ condition=~models.Q(dicecloud_creature_id=""),
+ name="unique_dicecloud_creature_per_campaign",
+ )
+ ]
def clean(self) -> None:
super().clean()
- if self.context_id and self.context.campaign_id != self.campaign_id:
- raise ValidationError(
- {"context": "A character context must belong to the same campaign."}
- )
- if self.context_id and self.context.kind != CampaignContext.Kind.PC:
- raise ValidationError({"context": "Only a PC context may own a character."})
- if self.kind == self.Kind.NPC and self.context_id:
+ if self.context_id is not None:
+ if self.context.campaign_id != self.campaign_id:
+ raise ValidationError(
+ {"context": "A character context must belong to the same campaign."}
+ )
+ if self.context.kind != CampaignContext.Kind.PC:
+ raise ValidationError(
+ {"context": "Only player contexts may have DiceCloud links."}
+ )
+ has_local_combat_fallback = (
+ bool(self.name.strip())
+ and self.current_hp is not None
+ and self.max_hp is not None
+ )
+ if (
+ self.is_active
+ and not self.dicecloud_creature_id
+ and not has_local_combat_fallback
+ ):
raise ValidationError(
- {"context": "NPCs cannot belong to a player context."}
+ {
+ "is_active": (
+ "Connect DiceCloud or provide a local name and both HP values "
+ "before activating this player."
+ )
+ }
)
- if self.hp_ability not in ABILITY_NAMES:
- raise ValidationError({"hp_ability": "Choose a valid ability."})
-
- validate_stat_map(
- "ability_bonuses",
- self.ability_bonuses,
- ABILITY_NAMES,
- minimum=-30,
- maximum=30,
- )
- validate_stat_map(
- "background_ability_bonuses",
- self.background_ability_bonuses,
- ABILITY_NAMES,
- minimum=-30,
- maximum=30,
- )
- validate_stat_map(
- "ability_score_adjustments",
- self.ability_score_adjustments,
- ABILITY_NAMES,
- minimum=-30,
- maximum=30,
- )
- validate_stat_map(
- "skill_adjustments",
- self.skill_adjustments,
- SKILL_NAMES,
- minimum=-99,
- maximum=99,
- )
- validate_stat_map(
- "save_adjustments",
- self.save_adjustments,
- ABILITY_NAMES,
- minimum=-99,
- maximum=99,
- )
- validate_stat_map(
- "skill_proficiencies",
- self.skill_proficiencies,
- SKILL_NAMES,
- {"none", "proficient", "expertise"},
- )
- validate_stat_map(
- "save_proficiencies",
- self.save_proficiencies,
- ABILITY_NAMES,
- {"none", "proficient"},
- )
def save(self, *args, **kwargs) -> None:
self.clean()
super().save(*args, **kwargs)
- @property
- def is_player_character(self) -> bool:
- return self.kind == self.Kind.PC
-
@staticmethod
def level_for_experience(experience: int) -> int:
return max(
@@ -370,147 +274,9 @@ def level_for_experience(experience: int) -> int:
if experience >= threshold
)
- @property
- def level(self) -> int:
- return self.campaign.level
-
- @property
- def proficiency_bonus(self) -> int:
- return 2 + (self.level - 1) // 4 + self.proficiency_bonus_adjustment
-
- def ability_score(self, ability: str) -> int:
- return (
- getattr(self, ability)
- + int(self.ability_bonuses.get(ability, 0))
- + int(self.background_ability_bonuses.get(ability, 0))
- + int(self.ability_score_adjustments.get(ability, 0))
- )
-
- def ability_modifier(self, ability: str) -> int:
- return (self.ability_score(ability) - 10) // 2
-
- def half_proficiency(self, ability: str, proficiency: str) -> int:
- if proficiency != "none":
- return 0
- down = self.proficiency_bonus // 2 if self.jack_of_all_trades else 0
- up = (
- (self.proficiency_bonus + 1) // 2
- if self.remarkable_athlete
- and ability in {"strength", "dexterity", "constitution"}
- else 0
- )
- return max(down, up)
-
- def saving_throw(self, ability: str) -> int:
- proficiency = self.save_proficiencies.get(ability, "none")
- contribution = self.proficiency_bonus if proficiency == "proficient" else 0
- return (
- self.ability_modifier(ability)
- + contribution
- + int(self.save_adjustments.get(ability, 0))
- )
-
- def ability_check(self, ability: str) -> int:
- return self.ability_modifier(ability) + self.half_proficiency(ability, "none")
-
- def skill_bonus(self, skill: str, ability: str) -> int:
- proficiency = self.skill_proficiencies.get(skill, "none")
- contribution = {
- "proficient": self.proficiency_bonus,
- "expertise": self.proficiency_bonus * 2,
- }.get(proficiency, self.half_proficiency(ability, proficiency))
- return (
- self.ability_modifier(ability)
- + contribution
- + int(self.skill_adjustments.get(skill, 0))
- )
-
- @property
- def max_hp(self) -> int:
- return max(
- 1,
- self.rolled_hit_points
- + self.ability_modifier(self.hp_ability) * self.level
- + self.hp_adjustment,
- )
-
- @property
- def initiative_bonus(self) -> int:
- return (
- self.ability_modifier("dexterity")
- + self.half_proficiency("dexterity", "none")
- + self.initiative_adjustment
- )
-
- @property
- def experience(self) -> int:
- from .experience import ExperienceEntry
-
- return (
- ExperienceEntry.objects.filter(account__character=self).aggregate(
- total=Sum("amount")
- )["total"]
- or 0
- )
-
- @property
- def money(self) -> MoneyBalance:
- from .money import MoneyEntry
-
- totals = defaultdict(int)
- for entry in (
- MoneyEntry.objects.filter(account__character=self)
- .values("denomination")
- .annotate(total=Sum("amount"))
- ):
- totals[entry["denomination"]] = entry["total"]
- return MoneyBalance(
- copper=totals[MoneyEntry.Denomination.COPPER],
- silver=totals[MoneyEntry.Denomination.SILVER],
- electrum=totals[MoneyEntry.Denomination.ELECTRUM],
- gold=totals[MoneyEntry.Denomination.GOLD],
- platinum=totals[MoneyEntry.Denomination.PLATINUM],
- )
-
- def activate(self) -> Character:
- from ..services.experience import activate_character
-
- return activate_character(self)
-
- def grant_coins(
- self, coins: CoinAmounts, description: str = ""
- ) -> MoneyTransaction:
- from ..services.actions import grant_coins
-
- return grant_coins(recipient=self, coins=coins, description=description)
-
- def spend_coins(
- self, coins: CoinAmounts, description: str = ""
- ) -> MoneyTransaction:
- from ..services.actions import spend_coins
-
- return spend_coins(spender=self, coins=coins, description=description)
-
- def exchange_coins(
- self, given: CoinAmounts, received: CoinAmounts, description: str = ""
- ) -> MoneyTransaction:
- from ..services.actions import exchange_coins
-
- return exchange_coins(
- character=self, given=given, received=received, description=description
- )
-
- def money_account(self) -> MoneyAccount:
- from ..services.ledger import character_account
- from .money import MoneyAccount
-
- return character_account(MoneyAccount, self)
-
- def experience_account(self) -> ExperienceAccount:
- from ..services.ledger import character_account
- from .experience import ExperienceAccount
-
- return character_account(ExperienceAccount, self)
-
def __str__(self) -> str:
- return self.name
+ if self.context_id is not None:
+ return self.context.user.get_username()
+ if self.dicecloud_creature_id:
+ return f"Linked player {self.pk}"
+ return self.name or f"Unlinked player {self.pk}"
diff --git a/hoard/campaigns/models/experience.py b/hoard/campaigns/models/experience.py
deleted file mode 100644
index 27b660adf..000000000
--- a/hoard/campaigns/models/experience.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from django.db import models
-from django.db.models import Q
-
-from .audit import ImmutableLedgerEntry, LedgerTransaction
-
-
-class ExperienceAccount(models.Model):
- campaign_id: int
- character_id: int | None
-
- campaign = models.ForeignKey(
- "campaigns.Campaign",
- on_delete=models.CASCADE,
- related_name="experience_accounts",
- )
- character = models.OneToOneField(
- "campaigns.Character",
- null=True,
- blank=True,
- on_delete=models.CASCADE,
- related_name="experience_ledger_account",
- )
- is_system = models.BooleanField(default=False)
-
- class Meta:
- constraints = [
- models.UniqueConstraint(
- fields=("campaign",),
- condition=Q(is_system=True),
- name="one_system_experience_account_per_campaign",
- ),
- models.CheckConstraint(
- condition=(
- Q(is_system=True, character__isnull=True)
- | Q(is_system=False, character__isnull=False)
- ),
- name="experience_account_system_or_character",
- ),
- ]
-
-
-class ExperienceTransaction(LedgerTransaction):
- reversal_of_id: int | None
-
- class Reason(models.TextChoices):
- SHARED_AWARD = "shared_award", "Shared award"
- BASELINE = "baseline", "Activation baseline"
- REVERSAL = "reversal", "Reversal"
-
- reason = models.CharField(max_length=20, choices=Reason.choices)
- requested_amount = models.PositiveIntegerField(default=0)
- discarded_amount = models.PositiveIntegerField(default=0)
- reversal_of = models.OneToOneField(
- "self", null=True, blank=True, on_delete=models.PROTECT, related_name="reversal"
- )
-
- class Meta:
- verbose_name = "Experience"
- verbose_name_plural = "Experience"
-
-
-class ExperienceEntry(ImmutableLedgerEntry):
- transaction_id: int
- account_id: int
-
- transaction = models.ForeignKey(
- ExperienceTransaction, on_delete=models.PROTECT, related_name="entries"
- )
- account = models.ForeignKey(
- ExperienceAccount, on_delete=models.PROTECT, related_name="entries"
- )
-
- class Meta:
- constraints = [
- models.CheckConstraint(
- condition=~Q(amount=0), name="experience_entry_nonzero_amount"
- )
- ]
diff --git a/hoard/campaigns/models/history.py b/hoard/campaigns/models/history.py
index 14456352e..6f8f5a524 100644
--- a/hoard/campaigns/models/history.py
+++ b/hoard/campaigns/models/history.py
@@ -6,30 +6,6 @@
from .audit import CampaignDatedEvent
-class HealthTransaction(CampaignDatedEvent):
- class Reason(models.TextChoices):
- DAMAGE = "damage", "Damage"
- HEALING = "healing", "Healing"
- TEMPORARY = "temporary", "Temporary HP"
- CORRECTION = "correction", "Correction"
- SHORT_REST = "short_rest", "Short rest"
- LONG_REST = "long_rest", "Long rest"
-
- character = models.ForeignKey(
- "campaigns.Character", on_delete=models.PROTECT, related_name="health_history"
- )
- reason = models.CharField(max_length=20, choices=Reason.choices)
- current_hp_before = models.PositiveIntegerField()
- current_hp_after = models.PositiveIntegerField()
- temporary_hp_before = models.PositiveIntegerField()
- temporary_hp_after = models.PositiveIntegerField()
- description = models.TextField(blank=True)
-
- class Meta:
- verbose_name = "Health Change"
- verbose_name_plural = "Health Changes"
-
-
class MembershipEvent(CampaignDatedEvent):
class Reason(models.TextChoices):
DEACTIVATED = "deactivated", "Deactivated"
diff --git a/hoard/campaigns/models/money.py b/hoard/campaigns/models/money.py
deleted file mode 100644
index 90c9e98a8..000000000
--- a/hoard/campaigns/models/money.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from django.db import models
-from django.db.models import Q
-
-from .audit import ImmutableLedgerEntry, LedgerTransaction
-
-
-class MoneyAccount(models.Model):
- campaign_id: int
- character_id: int | None
-
- campaign = models.ForeignKey(
- "campaigns.Campaign", on_delete=models.CASCADE, related_name="money_accounts"
- )
- character = models.OneToOneField(
- "campaigns.Character",
- null=True,
- blank=True,
- on_delete=models.CASCADE,
- related_name="money_ledger_account",
- )
- is_system = models.BooleanField(default=False)
-
- class Meta:
- constraints = [
- models.UniqueConstraint(
- fields=("campaign",),
- condition=Q(is_system=True),
- name="one_system_money_account_per_campaign",
- ),
- models.CheckConstraint(
- condition=(
- Q(is_system=True, character__isnull=True)
- | Q(is_system=False, character__isnull=False)
- ),
- name="money_account_system_or_character",
- ),
- ]
-
-
-class MoneyTransaction(LedgerTransaction):
- reversal_of_id: int | None
-
- reversal_of = models.OneToOneField(
- "self", null=True, blank=True, on_delete=models.PROTECT, related_name="reversal"
- )
-
- class Meta:
- verbose_name = "Coins"
- verbose_name_plural = "Coins"
-
-
-class MoneyEntry(ImmutableLedgerEntry):
- transaction_id: int
- account_id: int
-
- class Denomination(models.TextChoices):
- COPPER = "cp", "Copper"
- SILVER = "sp", "Silver"
- ELECTRUM = "ep", "Electrum"
- GOLD = "gp", "Gold"
- PLATINUM = "pp", "Platinum"
-
- transaction = models.ForeignKey(
- MoneyTransaction, on_delete=models.PROTECT, related_name="entries"
- )
- account = models.ForeignKey(
- MoneyAccount, on_delete=models.PROTECT, related_name="entries"
- )
- denomination = models.CharField(
- "Denomination", max_length=2, choices=Denomination.choices
- )
-
- class Meta:
- constraints = [
- models.CheckConstraint(
- condition=~Q(amount=0), name="money_entry_nonzero_amount"
- )
- ]
diff --git a/hoard/campaigns/models/party_experience.py b/hoard/campaigns/models/party_experience.py
new file mode 100644
index 000000000..e69136f75
--- /dev/null
+++ b/hoard/campaigns/models/party_experience.py
@@ -0,0 +1,47 @@
+from django.db import models
+from django.utils import timezone
+
+
+class PartyExperienceAward(models.Model):
+ """Audit record for an award added to the campaign-wide XP total."""
+
+ campaign = models.ForeignKey(
+ "campaigns.Campaign", on_delete=models.CASCADE, related_name="party_xp_awards"
+ )
+ amount = models.IntegerField()
+ recipient_count = models.PositiveIntegerField()
+ awarded_per_player = models.IntegerField()
+ discarded_amount = models.PositiveIntegerField(default=0)
+ reason = models.CharField(max_length=20, default="award")
+ description = models.TextField(blank=True)
+ created_by = models.ForeignKey(
+ "campaigns.CampaignContext",
+ null=True,
+ blank=True,
+ on_delete=models.SET_NULL,
+ related_name="party_xp_awards",
+ )
+ actor_username = models.CharField(max_length=150, blank=True)
+ campaign_era_abbreviation = models.CharField(max_length=20, null=True, blank=True)
+ campaign_year = models.PositiveIntegerField(null=True, blank=True)
+ campaign_day = models.PositiveSmallIntegerField(null=True, blank=True)
+ occurred_at = models.DateTimeField(default=timezone.now, editable=False)
+
+ class Meta:
+ ordering = ("-occurred_at", "-pk")
+
+ @property
+ def campaign_date(self) -> str | None:
+ if (
+ self.campaign_era_abbreviation is None
+ or self.campaign_year is None
+ or self.campaign_day is None
+ ):
+ return None
+ from .audit import format_campaign_date
+
+ return format_campaign_date(
+ self.campaign_era_abbreviation,
+ self.campaign_year,
+ self.campaign_day,
+ )
diff --git a/hoard/campaigns/pages/CharacterDirectoryView.vue b/hoard/campaigns/pages/CharacterDirectoryView.vue
index 40623ec9b..55d13ea06 100644
--- a/hoard/campaigns/pages/CharacterDirectoryView.vue
+++ b/hoard/campaigns/pages/CharacterDirectoryView.vue
@@ -31,11 +31,11 @@
{{ error }}
-
-
-
-
+ No player contexts are currently visible in this campaign.
+
@@ -130,30 +87,18 @@ import Button from "primevue/button";
import Message from "primevue/message";
import { defineComponent } from "vue";
import CharacterAvatar from "@/campaigns/components/CharacterAvatar.vue";
-import { formatGoldValue } from "@/campaigns/money";
-import { getCampaign, type Campaign, type Character } from "@/api";
+import { getCampaign, type Character } from "@/api";
import { campaignRefreshRevision } from "@/realtime";
export default defineComponent({
components: { Button, CharacterAvatar, Message },
data() {
- return {
- campaign: undefined as Campaign | undefined,
- characters: [] as Character[],
- ownIds: new Set(),
- error: "",
- };
+ return { characters: [] as Character[], error: "" };
},
computed: {
campaignId(): number {
return Number(this.$route.params.id);
},
- playerCharacters(): Character[] {
- return this.characters.filter((character) => character.is_player_character);
- },
- hasNpcs(): boolean {
- return this.characters.some((character) => !character.is_player_character);
- },
campaignRefresh(): number {
return campaignRefreshRevision.value;
},
@@ -167,27 +112,14 @@ export default defineComponent({
void this.load();
},
methods: {
- formatGoldValue,
async load(): Promise {
try {
- const nextCampaign = await getCampaign(this.campaignId);
-
- this.campaign = nextCampaign;
- this.characters = nextCampaign.characters;
- this.ownIds = new Set(
- nextCampaign.characters
- .filter((character) => character.is_active)
- .filter((character) => character.context_id === this.campaignId)
- .map((character) => character.id),
- );
+ this.characters = (await getCampaign(this.campaignId)).characters;
} catch (exception) {
this.error =
exception instanceof Error ? exception.message : "Unable to load characters.";
}
},
- actingPath(character: Character): string {
- return character.context_id ? `/c/${character.context_id}` : "";
- },
},
});
diff --git a/hoard/campaigns/pages/CharacterProfileView.vue b/hoard/campaigns/pages/CharacterProfileView.vue
index d4fb76122..b7591a0ef 100644
--- a/hoard/campaigns/pages/CharacterProfileView.vue
+++ b/hoard/campaigns/pages/CharacterProfileView.vue
@@ -1,67 +1,78 @@
-
-
- Modifier
- {{ signed(ability.modifier) }}
-
-
- Save
-
+
-
-
- {{ signed(save.bonus) }}
-
-
- {{ label }}
+ + {{ abbreviation }} · {{ displayValue(score) }} + +
+
-
-
-
diff --git a/hoard/campaigns/components/GmCoinForm.vue b/hoard/campaigns/components/GmCoinForm.vue
deleted file mode 100644
index bb478cbb2..000000000
--- a/hoard/campaigns/components/GmCoinForm.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
- Amounts must be whole numbers of zero or more.
-
-
-
-
-
diff --git a/hoard/campaigns/components/GmEncounterControl.vue b/hoard/campaigns/components/GmEncounterControl.vue
index b4a34318c..46b183a05 100644
--- a/hoard/campaigns/components/GmEncounterControl.vue
+++ b/hoard/campaigns/components/GmEncounterControl.vue
@@ -158,8 +158,8 @@
{{ combatant.current_hp }} / {{ combatant.max_hp }} HP
+ Modifier
+ {{ modifier }}
-
-
-
-
-
- {{ label }}
- Calculation --
-
- Modifier from score -
- - {{ signed(ability.modifier) }} - -
-
-
-
+
+ Save
+
+
+
+ {{ signed(save?.value ?? null) }}
+
+
-
-
-
+ - - Coins -
-
-
-
- - Level {{ level }} · {{ sharedExperience.toLocaleString() }} shared XP + Level {{ level }} · {{ sharedExperience.toLocaleString() }} shared XP · + {{ recipientCount }} configured players
{{ currentHp }} / {{ maxHp }} HP + · +{{ temporaryHp }} temporary-
@@ -46,82 +46,39 @@
size="preview"
/>
--
- {{ character.name }} -
+{{ character.name }}
- {{ character.race }} · {{ character.class }} + {{ + character.is_connected + ? `${character.race || "Unknown race"} · ${character.class || "Unknown class"}` + : "DiceCloud sheet not connected" + }}
--- {{ formatGoldValue(character.money.gold_value) }} ¤ -
-- {{ character.experience.toLocaleString() }} XP -
-
- No player characters are currently visible in this campaign. -
-- Game Master only -
-NPCs
--
-
-
-
- -- - {{ character.name }} - - {{ character.race }} · {{ character.class }} - - -
-
-
- {{ character.kind === "pc" ? "Player character" : "Non-player character" }} +
+ DiceCloud character
- {{ character.name }} + {{ character?.name ?? "Connect DiceCloud" }}
-- {{ character.race || "Race not set" }} · - {{ character.class || "Class not set" }} -
-
- Level {{ experienceProgress.level }} ·
- {{ formatXp(experienceProgress.current) }} ·
-
-
- {{ formatXp(experienceProgress.remaining) }}
-
- to level up
+
+ {{ character.race || "No race" }}
+
+ {{ character.class || "No class" }}
+
+
+ {{ character.profile.details.alignment }}
+
+
+
+ {{ character.profile.details.gender }}
- Maximum level
+ {{ formatXp(experienceProgress.remaining) }} XP to level up
+
+ Level {{ profileLevel }} party XP
+
+ {{ formatXp(experienceProgress.current) }} /
+ {{ formatXp(experienceProgress.next) }}
+ XP
+
+
+
+
+
@@ -69,423 +80,246 @@
v-if="error"
severity="error"
closable
- class="mb-4"
@close="error = ''"
>
{{ error }}
-
-
+
+
+
+
-
-
+
-
-
-
+
-
-
+ This player has not connected a public DiceCloud sheet yet.
+
+
+
+
+ {{ character.profile.error ?? "DiceCloud is unavailable right now." }}
+
+
+ DiceCloud could not be reached. This is the last successful profile fetch from
+ {{ formattedFetchTime }}.
+
+
+
+
+
+
+ + Stored character details +
++ These retained values are used only until a DiceCloud sheet is connected. +
+-
+
- Current HP +
- {{ character.current_hp ?? "—" }} +
- Maximum HP +
- {{ character.max_hp }} +
+ {{ character.profile.details.description }} +
+ +
+
+
+
-
-
+
@@ -515,1005 +349,94 @@
-
-
-
-
-
-
-
-
-
- Inventory
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
+ {{ stat.summary }}
+
+
- Coin pouch
-
-
-
-
-
- {{ formatCoinPouch(character.money) }}
+
+
+
-
+ Coin pouch
+
+
+ {{ stat.summary }}
+
-
-
-
-
-
- Coin value
-
-
-
-
-
- {{ formatGoldValue(character.money.gold_value) }} ¤
+
-
+
+
-
-
-
+ Coin value
-
-
-
-
-
-
-
-
-
-
-
-
- Armor class
-
-
-
-
-
-
-
-
-
-
- Movement speed
-
-
-
-
-
+ {{ formatGoldValue(currencyGoldValue) }} ¤
-
-
-
-
-
-
-
-
-
-
- - Conditions -
-- Conditions remain active until each cause is removed. -
-
-
+
-
-
-
-
- Resources
-
-
-
-
-
- Inspiration:
- {{ stat.summary }}
+
-
-
-
- | Slot | -- Current - | -- Maximum - | -Source | -
|---|---|---|---|
|
- |
-
- |
-
Abilities and saving throws
- Flip a card to see how its totals are calculated. + Each card shows the DiceCloud score, derived modifier, and saving throw.
Skills
@@ -496,17 +330,17 @@
@@ -515,1005 +349,94 @@
-
- {{ skill }}
+ {{ skill.name }}
-
-
- {{ signed(character.sheet.skills[skillKey(skill)].bonus) }}
-
-
-
-
-
-
-
-
- | Item | -- Quantity - | -- Weight - | -- Value - | -- Actions - | -
|---|---|---|---|---|
|
- |
-
- |
-
- |
-
- |
-
- Equipment and effects -
-
-
-
- Equipment
-
-
-
-
- Active effects
-
-
-
-
- Equipment
-
-
-
-
-
- | Item | -Slot | -Status | -
|---|---|---|
- Active effects
-
-
-
-
-
- | Effect | -Duration | -Modifiers and reminder | -- Actions - | -
|---|---|---|---|
|
- |
-
- Character details -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- {{ field.label }} -
-
-
-
-
-
-
-
-
-
-
-
- Languages
-Equipment proficiencies
--
-
- {{ stat }} -
-
- - Recent activity -
- - -
-
-
-
- | When | -- Change - | -Details | -By | -
|---|---|---|---|
|
- |
- - {{ activityAmount(transaction) }} - | -{{ activityDescription(transaction) }} | -{{ transaction.actor || "—" }} | -
- No recent activity. -
-