fix: handle players added directly in encounters, not just through pa…

…rties (#197)
javalent · Aug 16, 2023 · 4317e07 · 4317e07
1 parent 51aed21
commit 4317e07
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 17 deletions.
diff --git a/src/encounter/index.ts b/src/encounter/index.ts
@@ -154,6 +154,10 @@ export class EncounterParser {
  )
  );
  }
+ console.log(
+ "🚀 ~ file: index.ts:158 ~ playersToReturn:",
+ playersToReturn
+ );
  return Array.from(new Set(playersToReturn));
  }
  async parseRawCreatures(rawMonsters: RawCreatureArray) {

diff --git a/src/encounter/ui/Encounter.svelte b/src/encounter/ui/Encounter.svelte
@@ -64,10 +64,16 @@
  })
  .flat();
  const transformedCreatures: CreatureState[] = [];
- for (const creature of [
- ...plugin.getPlayersForParty(party),
- ...creatures
- ]) {
+ const combinedPlayers = [
+ ...plugin.getPlayerNamesForParty(party),
+ ...players
+ ];
+ const playersForEncounter: Creature[] = [];
+ for (const name of new Set(combinedPlayers)) {
+ playersForEncounter.push(plugin.getPlayerByName(name));
+ }
+
+ for (const creature of [...playersForEncounter, ...creatures]) {
  transformedCreatures.push(creature.toJSON());
  }
  tracker.new(plugin, {
@@ -194,7 +200,10 @@
  >
  <CreatureComponent
  {creature}
- xp={rpgSystem.getCreatureDifficulty(creature, playerLevels)}
+ xp={rpgSystem.getCreatureDifficulty(
+ creature,
+ playerLevels
+ )}
  shouldShowRoll={!allRolling && rollHP}
  {count}
  >
@@ -218,17 +227,25 @@
  aria-label={difficulty.summary}
  class={difficulty.cssClass}
  >
- <strong class="difficulty-label">{difficulty.displayName}</strong>
- <span class="xp-parent difficulty">
- <span class="paren left">(</span>
- <span class="xp-container">
- {#if difficulty.value > 0}
- <span class="xp number">{rpgSystem.formatDifficultyValue(difficulty.value)}</span>
- <span class="xp text">{rpgSystem.valueUnit}</span>
- {/if}
- </span>
- <span class="paren right">)</span>
- </span>
+ <strong class="difficulty-label"
+ >{difficulty.displayName}</strong
+ >
+ <span class="xp-parent difficulty">
+ <span class="paren left">(</span>
+ <span class="xp-container">
+ {#if difficulty.value > 0}
+ <span class="xp number"
+ >{rpgSystem.formatDifficultyValue(
+ difficulty.value
+ )}</span
+ >
+ <span class="xp text"
+ >{rpgSystem.valueUnit}</span
+ >
+ {/if}
+ </span>
+ <span class="paren right">)</span>
+ </span>
  </span>
  {/if}
  </div>
@@ -274,7 +291,7 @@
  color: green;
  }
  .trivial .difficulty-label {
- color: #AAAAAA;
+ color: #aaaaaa;
  }
  .icons {
  display: flex;

diff --git a/src/main.ts b/src/main.ts
@@ -22,6 +22,7 @@ import type {
  HomebrewCreature,
  InitiativeTrackerData,
  InitiativeViewState,
+ Party,
  SRDMonster
 } from "../index";
 import type { Plugins, StackRoller } from "obsidian-overload";
@@ -100,6 +101,9 @@ export default class InitiativeTracker extends Plugin {
  if (!this.players.has(name)) return new Creature({ name });
  return Creature.from(this.players.get(name));
  }
+ getPlayerNamesForParty(party: string): string[] {
+ return this.data.parties?.find((p) => p.name === party)?.players ?? [];
+ }
  getPlayersForParty(party: string) {
  return (
  this.data.parties