- Overhealing is healing done to a target with current hit points equal to it's + Overhealing is healing done to a target with current hit points equal to its maximum hit points. diff --git a/src/components/campaign/Players.vue b/src/components/campaign/Players.vue index 42d5950f1..56317791e 100644 --- a/src/components/campaign/Players.vue +++ b/src/components/campaign/Players.vue @@ -1,14 +1,14 @@
+
-
-
-
-
-
-
- Passive perception
-
-
-
- Passive investigation
-
-
-
- Passive insight
-
+
+
-
- Save DC
-
-
-
- Health
-
-
-
-
+
+
+
+
+
+ Passive perception
+
+
+
+ Passive investigation
+
+
+
+ Passive insight
+
+
+
+ Save DC
+
+
+
+ Health
+
+
+
+
-
-
-
-
-
-
- Transformed
-
-
-
-
-
+
+
- {{ (player.transformed ? player.transformed.ac : players[key].ac) + player.ac_bonus }}
-
- Armor Class {{ player.ac_bonus }}
-
-
- {{
- player.transformed ? player.transformed.ac : players[key].ac
- }}
-
-
- {{ players[key].character_name }}
-
-
-
- {{ players[key].passive_perception }}
-
-
- {{ players[key].passive_investigation }}
-
-
- {{ players[key].passive_insight }}
-
-
- {{ players[key].spell_save_dc }}
-
-
-
-
-
-
- Stable
+
- Max HP + {{ player.maxHpMod }}
-
-
- {{ players[key].maxHp }}
-
-
-
- +{{ player.tempHp }}
- Temporary HP
+
+
+
+
+ Transformed
-
- Dead
-
-
-
-
-
-
-
- {{ player.transformed.curHp }}
- /
-
- {{ player.transformed.maxHp }}
-
-
-
- {{ player.curHp }}
- /
-
- {{ maxHp(players[key].maxHp, player.maxHpMod) }}
-
-
-
-
-
+
+
+ {{
+ (player.transformed ? player.transformed.ac : players[key].ac) + player.ac_bonus
+ }}
+
+ Armor Class {{ player.ac_bonus }}
+
-
-
-
+
+ {{ players[key].character_name }}
+
+
+
-
- Edit player
-
-
-
+
+ {{ players[key].passive_investigation }}
+
+
+ {{ players[key].passive_insight }}
+
+
+ {{ players[key].spell_save_dc }}
+
+
+
+
+
+ Max HP + {{ player.maxHpMod }}
+
+
+ {{ players[key].maxHp }}
+
+
+
+ +{{ player.tempHp }}
+ Temporary HP
+
+
+
+
+
+
-
-
+ Stable
+
+
+ Dead
+
+
+
+
+
+
+
+ {{ player.transformed.curHp }}
+ /
+
+ {{ player.transformed.maxHp }}
+
+
+
+ {{ player.curHp }}
+ /
+
+ {{ maxHp(players[key].maxHp, player.maxHpMod) }}
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ name }}
+
+ {{ name }}
+ {{ caption }}
+
+
+ {{ types.filter(item => item.name === type)[0]?.label }}
+
+
+
+
+
+
+
+
+
diff --git a/src/components/campaign/resources/Compendium.vue b/src/components/campaign/resources/Compendium.vue
new file mode 100644
index 000000000..b7eb308fa
--- /dev/null
+++ b/src/components/campaign/resources/Compendium.vue
@@ -0,0 +1,158 @@
+
+ Nothing found
+
+
+
+
+
+
+ {{ label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/campaign/resources/Notes.vue b/src/components/campaign/resources/Notes.vue
new file mode 100644
index 000000000..0042d139e
--- /dev/null
+++ b/src/components/campaign/resources/Notes.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+ {{ note.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/campaign/resources/index.vue b/src/components/campaign/resources/index.vue
new file mode 100644
index 000000000..951cdb7c6
--- /dev/null
+++ b/src/components/campaign/resources/index.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/campaign/share/Sharing.vue b/src/components/campaign/share/Sharing.vue
new file mode 100644
index 000000000..ec5e5e0c3
--- /dev/null
+++ b/src/components/campaign/share/Sharing.vue
@@ -0,0 +1,82 @@
+
+
+ ![Shared image]()
+
+
+
+
+
+
+
diff --git a/src/components/campaign/share/index.vue b/src/components/campaign/share/index.vue
new file mode 100644
index 000000000..12d19023a
--- /dev/null
+++ b/src/components/campaign/share/index.vue
@@ -0,0 +1,361 @@
+
+
+
+
+
+ Currently sharing
+ +
+
+
+ Active
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Go live to share with your players
+
+ Go live
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Get a subscription
+
+
+
+
+
+
+
+
+ 
+
+ {{ sound.name }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/campaign/soundBoard/index.vue b/src/components/campaign/soundBoard/index.vue
new file mode 100644
index 000000000..40da751be
--- /dev/null
+++ b/src/components/campaign/soundBoard/index.vue
@@ -0,0 +1,80 @@
+
+ Nothing found
+
+
+
+ ![]()
+
+
+
+ Add custom links
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add to your Soundboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/characters/computed.vue b/src/components/characters/computed.vue
index a6ef47fc2..e95f10428 100644
--- a/src/components/characters/computed.vue
+++ b/src/components/characters/computed.vue
@@ -1,7 +1,10 @@
-
+
+
+
@@ -202,229 +223,235 @@
\ No newline at end of file
+}
+
diff --git a/src/components/combat/Conditions.vue b/src/components/combat/Conditions.vue
index 0ec9d4e2b..34c9f5afc 100644
--- a/src/components/combat/Conditions.vue
+++ b/src/components/combat/Conditions.vue
@@ -1,46 +1,51 @@
@@ -11,33 +14,26 @@
Level {{ computed.level }} • {{ computed.race.race_name }}
-
- {{ (subclass.level < computed.level) ? `${subclass.level}` : `` }}
- {{ subclass.name }}
-
- •
- {{ subclass.subclass }}
-
+
+ {{ (subclass.level < computed.level) ? `${subclass.level}` : `` }}
+ {{ subclass.name }}
+
+ •
+ {{ subclass.subclass }}
+
-
+
-
+
-
@@ -46,17 +42,19 @@
{{ computed.armor_class }}
+
- HP
{{ computed.hit_points }}
@@ -64,9 +62,7 @@
Speed
-
- {{ computed.speed }}ft.
-
+ {{ computed.speed }}ft.
Initiative
@@ -79,20 +75,24 @@ m: computed.initiative, title: 'Initiative roll', notify: true, - advantage: checkAdvantage('initiative') + advantage: checkAdvantage('initiative'), }" > - - {{ computed.initiative >= 0 ? "+" : "-" }} - {{ Math.abs(computed.initiative) }} + {{ computed.initiative >= 0 ? "+" : "-" }} + {{ Math.abs(computed.initiative) }}+
@@ -106,32 +106,43 @@
m: calcMod(computed.abilities[ability]),
title: `${ability.capitalize()} check`,
notify: true,
- advantage: checkAdvantage('abilities', ability)
+ advantage: checkAdvantage('abilities', ability),
}"
>
- {{ calcMod(computed.abilities[ability]) > 0 ? "+" : "-" }}
- {{ Math.abs(calcMod(computed.abilities[ability])) }}
+ {{ calcMod(computed.abilities[ability]) > 0 ? "+" : "-" }}
+ {{ Math.abs(calcMod(computed.abilities[ability])) }}
{{ computed.abilities[ability] || 0 }}
+
Saving throws
-
-
- +
- - @@ -150,12 +161,19 @@ m: mod, title: `${key.capitalize()} save`, notify: true, - advantage: advantage_disadvantage + advantage: advantage_disadvantage, }" > - {{ mod >= 0 ? "+" : "-" }}{{ mod }} + {{ mod >= 0 ? "+" : "-" + }}{{ mod }} @@ -167,14 +185,15 @@
-
-
+ 'fas fa-eye': key === 'perception',
+ 'fas fa-search': key === 'investigation',
+ 'fas fa-lightbulb-on': key === 'insight',
+ }"
+ />
{{ key.capitalize() }}
@@ -188,13 +207,15 @@
{{ characterState.character }} -+{{ computed }} -+
-
-
- {{ entity.conditions[key] }}
-
-
-
- {{ key.capitalize() }}
-
+
\ No newline at end of file
+
diff --git a/src/components/combat/Current.vue b/src/components/combat/Current.vue
index 5a4afd5d9..733c6b1f5 100644
--- a/src/components/combat/Current.vue
+++ b/src/components/combat/Current.vue
@@ -154,7 +154,7 @@ export default {
},
},
methods: {
- ...mapActions(["setSlide", "remove_limitedUses", "set_show_monster_card"]),
+ ...mapActions(["remove_limitedUses", "set_show_monster_card"]),
percentage(current, max) {
return Math.floor((current / max) * 100);
},
diff --git a/src/components/combat/DeathSaves.vue b/src/components/combat/DeathSaves.vue
index 13cdd244d..8f1fb16e2 100644
--- a/src/components/combat/DeathSaves.vue
+++ b/src/components/combat/DeathSaves.vue
@@ -1,7 +1,10 @@
+
+ {{ entity.conditions[key] }}
+
+
+
+ {{ key.capitalize() }}
+
-
+
What is this
@@ -78,7 +81,7 @@ export default {
},
},
methods: {
- ...mapActions(["setSlide", "set_save", "set_dead", "set_stable"]),
+ ...mapActions(["setDrawer", "set_save", "set_dead", "set_stable"]),
save(check, index) {
this.set_save({
key: this.target.key,
diff --git a/src/components/combat/Finished.vue b/src/components/combat/Finished.vue
index 5af892a19..6d826f62e 100644
--- a/src/components/combat/Finished.vue
+++ b/src/components/combat/Finished.vue
@@ -2,34 +2,54 @@
Encounter finished
-
-
+
-
+
@@ -49,10 +67,18 @@
:dark="$store.getters.theme === 'dark'"
no-caps
inline-label
+ outside-arrows
+ mobile-arrows
align="justify"
class="bg-neutral-9"
>
-
@@ -60,22 +86,28 @@
Encounter rewards
-
+
{{ xpAmount }}
XP
-
+ class="btn"
+ @click="
+ setDrawer({
+ show: true,
+ type: 'drawers/party/xp',
+ data: {
+ amount: xpAmount,
+ entities: players,
+ },
+ })
+ "
+ >
Award
-
+
@@ -89,31 +121,31 @@
![]()
-
Items @@ -166,10 +198,10 @@
-
Stabilize
-
Edit
-
Reminders
-
Transform
-
-
+ {{ entity.hidden ? "Show" : "Hide" }}
-
Conditions
-
Do damage/healing
-
+ Remove
\ No newline at end of file
+ {
+ text: "Yes",
+ action: (toast) => {
+ this.remove_entity(key);
+ this.$snotify.remove(toast.id);
+ },
+ bold: false,
+ },
+ {
+ text: "No",
+ action: (toast) => {
+ this.$snotify.remove(toast.id);
+ },
+ bold: true,
+ },
+ ],
+ }
+ );
+ },
+ },
+};
+
diff --git a/src/components/combat/Targeted.vue b/src/components/combat/Targeted.vue
index 034862d87..de664746f 100644
--- a/src/components/combat/Targeted.vue
+++ b/src/components/combat/Targeted.vue
@@ -162,14 +162,14 @@ export default {
options: [
{
option: "damage",
- method: () => this.setSlide({ show: true, type: "slides/encounter/DamageHealing" }),
+ method: () => this.setDrawer({ show: true, type: "drawers/encounter/DamageHealing" }),
key: ["shift", "d"],
icon: "fa-swords",
tooltip: "[shift]+[d] Out of turn damage/healing",
},
{
option: "conditions",
- method: () => this.setSlide({ show: true, type: "slides/encounter/Conditions" }),
+ method: () => this.setDrawer({ show: true, type: "drawers/encounter/Conditions" }),
key: ["c"],
icon: "fa-flame",
tooltip: "[c] Conditions",
@@ -177,14 +177,14 @@ export default {
{
option: "reminders",
method: () =>
- this.setSlide({ show: true, type: "slides/encounter/reminders/TargetReminders" }),
+ this.setDrawer({ show: true, type: "drawers/encounter/reminders/TargetReminders" }),
key: ["m"],
icon: "fa-stopwatch",
tooltip: "[m] Reminders",
},
{
option: "transform",
- method: () => this.setSlide({ show: true, type: "slides/Transform", data: this.target }),
+ method: () => this.setDrawer({ show: true, type: "drawers/Transform", data: this.target }),
key: ["t"],
icon: "fa-paw-claws",
tooltip: "[t] Transform",
@@ -198,7 +198,7 @@ export default {
},
{
option: "edit",
- method: () => this.setSlide({ show: true, type: "slides/encounter/EditEntity" }),
+ method: () => this.setDrawer({ show: true, type: "drawers/encounter/EditEntity" }),
key: ["e"],
icon: "fa-pencil",
tooltip: "[e] Edit",
@@ -234,7 +234,7 @@ export default {
methods: {
...mapActions([
"set_targeted",
- "setSlide",
+ "setDrawer",
"set_save",
"set_stable",
"set_targetReminder",
diff --git a/src/components/combat/Targets.vue b/src/components/combat/Targets.vue
index 7bab9a0fe..0b02c1288 100644
--- a/src/components/combat/Targets.vue
+++ b/src/components/combat/Targets.vue
@@ -9,8 +9,8 @@
tabindex="-1"
:class="{ disabled: test }"
v-shortkey="['a']"
- @click="test ? null : setSlide({ show: true, type: 'slides/encounter/AddNpc' })"
- @shortkey="test ? null : setSlide({ show: true, type: 'slides/encounter/AddNpc' })"
+ @click="test ? null : setDrawer({ show: true, type: 'drawers/encounter/AddNpc' })"
+ @shortkey="test ? null : setDrawer({ show: true, type: 'drawers/encounter/AddNpc' })"
>
@@ -221,7 +221,7 @@ export default {
},
methods: {
...mapActions([
- "setSlide",
+ "setDrawer",
"set_hidden",
"set_targeted",
"set_stable",
diff --git a/src/components/combat/Turns.vue b/src/components/combat/Turns.vue
index 4846f2af2..2386ca2db 100644
--- a/src/components/combat/Turns.vue
+++ b/src/components/combat/Turns.vue
@@ -16,9 +16,9 @@
clickable
v-close-popup
@click="
- setSlide({
+ setDrawer({
show: true,
- type: 'slides/Broadcast',
+ type: 'drawers/Broadcast',
data: {
campaign_id: $route.params.campid,
encounter_id: $route.params.encid,
@@ -55,7 +55,7 @@
v-if="!demo"
clickable
v-close-popup
- @click="setSlide({ show: true, type: 'settings/Encounter' })"
+ @click="setDrawer({ show: true, type: 'settings/Encounter' })"
>
Settings
@@ -64,7 +64,7 @@
v-if="!demo && !test"
clickable
v-close-popup
- @click="setSlide({ show: true, type: 'settings/TrackEncounter' })"
+ @click="setDrawer({ show: true, type: 'settings/TrackEncounter' })"
>
@@ -188,7 +188,7 @@
-
{{ reminder.rounds }}
@@ -34,43 +37,41 @@
\ No newline at end of file
+}
+
diff --git a/src/components/combat/TargetItem.vue b/src/components/combat/TargetItem.vue
index 3a199122f..fb41cee32 100644
--- a/src/components/combat/TargetItem.vue
+++ b/src/components/combat/TargetItem.vue
@@ -214,7 +214,7 @@
-
+
@@ -199,7 +199,7 @@
Spellcasting
The {{ entity.name.capitalizeEach() }} is a {{ entity.caster_level | numeral("Oo") }}-level
- spellcaster. It's spellcasting ability is {{ entity.caster_ability.capitalize() }} (spell
+ spellcaster. its spellcasting ability is {{ entity.caster_ability.capitalize() }} (spell
save DC {{ entity.caster_save_dc }},
{{
entity.caster_spell_attack > 0
diff --git a/src/components/combat/initiative/NPCs.vue b/src/components/combat/initiative/NPCs.vue
index 6ad579018..53da1d238 100644
--- a/src/components/combat/initiative/NPCs.vue
+++ b/src/components/combat/initiative/NPCs.vue
@@ -31,7 +31,7 @@
Show info
@@ -97,7 +97,7 @@ export default {
},
},
methods: {
- ...mapActions(["setSlide", "set_initiative"]),
+ ...mapActions(["setDrawer", "set_initiative"]),
rollMonster(e, key, entity, advantage_disadvantage) {
const advantage_object = advantage_disadvantage ? advantage_disadvantage : {};
let roll = this.rollD(
diff --git a/src/components/combat/initiative/Overview.vue b/src/components/combat/initiative/Overview.vue
index dbb4e9267..6cb746048 100644
--- a/src/components/combat/initiative/Overview.vue
+++ b/src/components/combat/initiative/Overview.vue
@@ -9,7 +9,7 @@
-
\ No newline at end of file
+}
+
diff --git a/src/components/combat/side/Requests.vue b/src/components/combat/side/Requests.vue
index d5dcf913c..cc16bba30 100644
--- a/src/components/combat/side/Requests.vue
+++ b/src/components/combat/side/Requests.vue
@@ -1,7 +1,7 @@
+
Hides the entity from your players on the - public initiative list. + public initiative list.
@@ -150,7 +150,7 @@ export default { "set_initiative", "set_condition", "set_targetReminder", - "setSlide", + "setDrawer", ]), setSurprised(entity_key, value) { const reminder = this.premade.surprised; diff --git a/src/components/combat/initiative/Players.vue b/src/components/combat/initiative/Players.vue index 5a23faa26..4ac2636f7 100644 --- a/src/components/combat/initiative/Players.vue +++ b/src/components/combat/initiative/Players.vue @@ -2,37 +2,46 @@-
-
-
-
+ 'border-color': entity.color_label ? entity.color_label : ``,
+ }"
+ >
+
+
{{ entity.name }}- {{ entity.curHp}} / {{entity.maxHp}} + {{ entity.curHp }} / {{ entity.maxHp }} + {{ entity.tempHp }}- + -
@@ -41,39 +50,31 @@
\ No newline at end of file
+}
+
diff --git a/src/components/combat/mobile/Current.vue b/src/components/combat/mobile/Current.vue
index 11a767cdd..46d763210 100644
--- a/src/components/combat/mobile/Current.vue
+++ b/src/components/combat/mobile/Current.vue
@@ -3,19 +3,26 @@
-
Player requests
-No requests have been made.
- Your players can do damage or healing request from the - public initiative list. + Your players can do damage or healing request from the + public initiative list.
In order to do this, the following requirements must be met.
@@ -22,8 +22,8 @@
- If the above is met, players can target entities from the public initiative
- list and input the damage or healing they want to do.
+ If the above is met, players can target entities from the public initiative list and input
+ the damage or healing they want to do.
You as a DM can then decide if you wish to apply this damage, or discard it.
Spellcasting
The {{ monster.name.capitalizeEach() }} is a
- {{ monster.caster_level | numeral("Oo") }}-level spellcaster. It's spellcasting ability is
+ {{ monster.caster_level | numeral("Oo") }}-level spellcaster. its spellcasting ability is
{{ monster.caster_ability.capitalize() }} (spell save DC {{ monster.caster_save_dc }},
{{
monster.caster_spell_attack > 0
diff --git a/src/components/slides/BackgroundsOverview.vue b/src/components/drawers/BackgroundsOverview.vue
similarity index 100%
rename from src/components/slides/BackgroundsOverview.vue
rename to src/components/drawers/BackgroundsOverview.vue
diff --git a/src/components/drawers/Broadcast.vue b/src/components/drawers/Broadcast.vue
new file mode 100644
index 000000000..2b5c7e2c2
--- /dev/null
+++ b/src/components/drawers/Broadcast.vue
@@ -0,0 +1,198 @@
+
+
+ Private campaign
+ When you're live, your players can see the initiative list of your active encounter and you
+ can choose to show them your rolls there as well. Your encounters can be followed with your
+ public initiative link.
+ We might have failed a perception check, cause this drawer can not be found...
- These setting are mostly to add some atmosphere to the live initiative list that you can share with your players.
- When you have an account you can share a live initiative list of your active encounter with your players
- and while building the encounter, you can add a background and weather effects that will show on this shared list.
+ These setting are mostly to add some atmosphere to the live initiative list that you can
+ share with your players. When you have an account you can share a live initiative list of
+ your active encounter with your players and while building the encounter, you can add a
+ background and weather effects that will show on this
+ shared list.
- With a subscription you have access to our backgrounds and background effects.
- With a subscription you have access to our backgrounds and background effects.
{{ effect.toUpperCase() }}
- |
+ |
Add players and monsters to create your encounter.
+ Add animated effects to the initiative list that you share with your group.
+
+
+
+
+
+
diff --git a/src/components/slides/CharacterSync.vue b/src/components/drawers/CharacterSync.vue
similarity index 100%
rename from src/components/slides/CharacterSync.vue
rename to src/components/drawers/CharacterSync.vue
diff --git a/src/components/drawers/Compendium.vue b/src/components/drawers/Compendium.vue
new file mode 100644
index 000000000..d6dfb1940
--- /dev/null
+++ b/src/components/drawers/Compendium.vue
@@ -0,0 +1,19 @@
+
+
+ Players can't follow your private campaigns.
+
+
+
+
+
diff --git a/src/components/slides/DeathSaves.vue b/src/components/drawers/DeathSaves.vue
similarity index 100%
rename from src/components/slides/DeathSaves.vue
rename to src/components/drawers/DeathSaves.vue
diff --git a/src/components/slides/EditPlayer.vue b/src/components/drawers/EditPlayer.vue
similarity index 98%
rename from src/components/slides/EditPlayer.vue
rename to src/components/drawers/EditPlayer.vue
index c4b5080f6..99e9c699a 100644
--- a/src/components/slides/EditPlayer.vue
+++ b/src/components/drawers/EditPlayer.vue
@@ -454,7 +454,7 @@ export default {
},
},
methods: {
- ...mapActions(["setSlide", "edit_player"]),
+ ...mapActions(["setDrawer", "edit_player"]),
...mapActions("players", ["get_player", "edit_player", "set_player_prop"]),
...mapActions("campaigns", [
"get_campaign",
@@ -555,7 +555,6 @@ export default {
this.initiative = Number(this.initiative);
}
- console.log("EDIT");
//Parse to INT
this.entity.ac_bonus = this.entity.ac_bonus ? parseInt(this.entity.ac_bonus) : 0;
this.entity.tempHp = this.entity.tempHp ? parseInt(this.entity.tempHp) : 0;
@@ -588,7 +587,7 @@ export default {
if (maxHpMod > 0) {
//check if the current mod was positive too
if (this.entity.maxHpMod > 0) {
- //if so, first subtract current mod, then add new
+ //if so, first substract current mod, then add new
this.entity.curHp = parseInt(
parseInt(this.entity.curHp) - this.entity.maxHpMod + maxHpMod
);
@@ -598,7 +597,7 @@ export default {
}
} else if (maxHpMod < 0) {
//if the new mod is negative,
- //but the current is positive, still subtract current
+ //but the current is positive, still substract current
if (this.entity.maxHpMod > 0) {
this.entity.curHp = parseInt(parseInt(this.entity.curHp) - this.entity.maxHpMod);
}
@@ -643,7 +642,7 @@ export default {
});
}
- this.setSlide(false);
+ this.setDrawer(false);
},
},
};
diff --git a/src/components/drawers/Error.vue b/src/components/drawers/Error.vue
new file mode 100644
index 000000000..8fb77a3ac
--- /dev/null
+++ b/src/components/drawers/Error.vue
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/slides/Keybindings.vue b/src/components/drawers/Keybindings.vue
similarity index 94%
rename from src/components/slides/Keybindings.vue
rename to src/components/drawers/Keybindings.vue
index e1ef1ad67..73439c2a4 100644
--- a/src/components/slides/Keybindings.vue
+++ b/src/components/drawers/Keybindings.vue
@@ -1,8 +1,8 @@
Drawer not found
+
+ With the data:
+ {{ data }}
+
+
- {{ name }}
-
+
{{ name }}
+
Action
Keybind
diff --git a/src/components/slides/MarkdownInfo.vue b/src/components/drawers/MarkdownInfo.vue
similarity index 100%
rename from src/components/slides/MarkdownInfo.vue
rename to src/components/drawers/MarkdownInfo.vue
diff --git a/src/components/slides/Settings.vue b/src/components/drawers/Settings.vue
similarity index 100%
rename from src/components/slides/Settings.vue
rename to src/components/drawers/Settings.vue
diff --git a/src/components/slides/Track.vue b/src/components/drawers/Track.vue
similarity index 100%
rename from src/components/slides/Track.vue
rename to src/components/drawers/Track.vue
diff --git a/src/components/slides/Transform.vue b/src/components/drawers/Transform.vue
similarity index 97%
rename from src/components/slides/Transform.vue
rename to src/components/drawers/Transform.vue
index 734b86498..6e8c62249 100644
--- a/src/components/slides/Transform.vue
+++ b/src/components/drawers/Transform.vue
@@ -84,7 +84,7 @@ export default {
};
},
methods: {
- ...mapActions(["setSlide", "transform_entity"]),
+ ...mapActions(["setDrawer", "transform_entity"]),
edit() {
let transform = {
ac: parseInt(this.transAc),
@@ -96,7 +96,7 @@ export default {
key: this.entity.key,
entity: transform,
});
- this.setSlide(false);
+ this.setDrawer(false);
},
remove() {
this.transform_entity({
diff --git a/src/components/slides/characterBuilder/HitPoints.vue b/src/components/drawers/characterBuilder/HitPoints.vue
similarity index 100%
rename from src/components/slides/characterBuilder/HitPoints.vue
rename to src/components/drawers/characterBuilder/HitPoints.vue
diff --git a/src/components/slides/editEncounter/EditEntity.vue b/src/components/drawers/editEncounter/EditEntity.vue
similarity index 51%
rename from src/components/slides/editEncounter/EditEntity.vue
rename to src/components/drawers/editEncounter/EditEntity.vue
index 850f3d701..c9dab464f 100644
--- a/src/components/slides/editEncounter/EditEntity.vue
+++ b/src/components/drawers/editEncounter/EditEntity.vue
@@ -2,13 +2,21 @@
- Edit {{ npc.name.capitalize() }}
+
+ Edit {{ npc.name.capitalize() }}
+
-
-
-
diff --git a/src/components/slides/encounter/Condition.vue b/src/components/drawers/encounter/Condition.vue
similarity index 95%
rename from src/components/slides/encounter/Condition.vue
rename to src/components/drawers/encounter/Condition.vue
index 4cdb60941..5adf98ec8 100644
--- a/src/components/slides/encounter/Condition.vue
+++ b/src/components/drawers/encounter/Condition.vue
@@ -1,6 +1,6 @@
-
+
{{ cond.name }}
@@ -14,7 +14,7 @@
@click="remove(cond.value)">
Remove condition
-
+
Current
Effect
diff --git a/src/components/slides/encounter/Conditions.vue b/src/components/drawers/encounter/Conditions.vue
similarity index 99%
rename from src/components/slides/encounter/Conditions.vue
rename to src/components/drawers/encounter/Conditions.vue
index cfaaf494a..522840b91 100644
--- a/src/components/slides/encounter/Conditions.vue
+++ b/src/components/drawers/encounter/Conditions.vue
@@ -134,7 +134,7 @@ export default {
this.$refs[0]?.[0]?.focus();
},
methods: {
- ...mapActions(["setSlide", "set_condition"]),
+ ...mapActions(["setDrawer", "set_condition"]),
focusButton(e, i) {
if (e.view.shiftKey) {
i = i - 1;
diff --git a/src/components/slides/encounter/DamageHealing.vue b/src/components/drawers/encounter/DamageHealing.vue
similarity index 100%
rename from src/components/slides/encounter/DamageHealing.vue
rename to src/components/drawers/encounter/DamageHealing.vue
diff --git a/src/components/slides/encounter/EditEntity.vue b/src/components/drawers/encounter/EditEntity.vue
similarity index 100%
rename from src/components/slides/encounter/EditEntity.vue
rename to src/components/drawers/encounter/EditEntity.vue
diff --git a/src/components/slides/encounter/TargetingInfo.vue b/src/components/drawers/encounter/TargetingInfo.vue
similarity index 95%
rename from src/components/slides/encounter/TargetingInfo.vue
rename to src/components/drawers/encounter/TargetingInfo.vue
index 27847bab4..45acbbb19 100644
--- a/src/components/slides/encounter/TargetingInfo.vue
+++ b/src/components/drawers/encounter/TargetingInfo.vue
@@ -24,7 +24,3 @@
props: ['type', 'data']
};
-
-
\ No newline at end of file
diff --git a/src/components/slides/encounter/TestMode.vue b/src/components/drawers/encounter/TestMode.vue
similarity index 100%
rename from src/components/slides/encounter/TestMode.vue
rename to src/components/drawers/encounter/TestMode.vue
diff --git a/src/components/slides/encounter/reminders/Reminder.vue b/src/components/drawers/encounter/reminders/Reminder.vue
similarity index 94%
rename from src/components/slides/encounter/reminders/Reminder.vue
rename to src/components/drawers/encounter/reminders/Reminder.vue
index 8f9f3a33f..692f7bca0 100644
--- a/src/components/slides/encounter/reminders/Reminder.vue
+++ b/src/components/drawers/encounter/reminders/Reminder.vue
@@ -53,7 +53,7 @@ export default {
this.reminder = { ...this.entity.reminders[this.key] };
},
methods: {
- ...mapActions(["setSlide", "set_targetReminder"]),
+ ...mapActions(["setDrawer", "set_targetReminder"]),
setValidation(validate) {
this.validation = validate;
},
@@ -63,7 +63,7 @@ export default {
entity: this.data.entity.key,
key: this.data.key,
});
- this.setSlide(false);
+ this.setDrawer(false);
},
editReminder() {
delete this.reminder[".key"];
@@ -73,7 +73,7 @@ export default {
key: this.data.key,
reminder: this.reminder,
});
- this.setSlide(false);
+ this.setDrawer(false);
},
},
};
diff --git a/src/components/slides/encounter/reminders/TargetReminders.vue b/src/components/drawers/encounter/reminders/TargetReminders.vue
similarity index 100%
rename from src/components/slides/encounter/reminders/TargetReminders.vue
rename to src/components/drawers/encounter/reminders/TargetReminders.vue
diff --git a/src/components/slides/party/AddItem.vue b/src/components/drawers/party/AddItem.vue
similarity index 100%
rename from src/components/slides/party/AddItem.vue
rename to src/components/drawers/party/AddItem.vue
diff --git a/src/components/slides/party/Currency.vue b/src/components/drawers/party/Currency.vue
similarity index 100%
rename from src/components/slides/party/Currency.vue
rename to src/components/drawers/party/Currency.vue
diff --git a/src/components/drawers/party/Inventory.vue b/src/components/drawers/party/Inventory.vue
new file mode 100644
index 000000000..fb6f507df
--- /dev/null
+++ b/src/components/drawers/party/Inventory.vue
@@ -0,0 +1,251 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/drawers/party/LinkedItem.vue b/src/components/drawers/party/LinkedItem.vue
new file mode 100644
index 000000000..ca6b740b7
--- /dev/null
+++ b/src/components/drawers/party/LinkedItem.vue
@@ -0,0 +1,90 @@
+
+ Party Inventory
+
+ Max amount reached
+
+
+
+
+
+
+ {{ coin | numeral("0.0a") }}
+ {{ coin }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Items
+
+
+
+
+
+
+
+
+ {{ item.public_name }}
+
+ {{ item.public_description }}
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ Loading linked item
+
+
+
+
+
diff --git a/src/components/slides/party/Transform.vue b/src/components/drawers/party/Transform.vue
similarity index 100%
rename from src/components/slides/party/Transform.vue
rename to src/components/drawers/party/Transform.vue
diff --git a/src/components/slides/party/ViewInventory.vue b/src/components/drawers/party/ViewInventory.vue
similarity index 100%
rename from src/components/slides/party/ViewInventory.vue
rename to src/components/drawers/party/ViewInventory.vue
diff --git a/src/components/slides/party/health.vue b/src/components/drawers/party/health.vue
similarity index 98%
rename from src/components/slides/party/health.vue
rename to src/components/drawers/party/health.vue
index 13c3f4cf3..28f0658d2 100644
--- a/src/components/slides/party/health.vue
+++ b/src/components/drawers/party/health.vue
@@ -119,7 +119,7 @@ export default {
},
},
methods: {
- ...mapActions(["setSlide"]),
+ ...mapActions(["setDrawer"]),
...mapActions("campaigns", ["get_campaign", "update_campaign_entity"]),
...mapActions("players", ["get_player"]),
async setHpModifiers() {
@@ -200,7 +200,7 @@ export default {
}
this.tempHp = undefined;
this.maxHpMod = undefined;
- this.setSlide(false);
+ this.setDrawer(false);
},
},
};
diff --git a/src/components/drawers/party/xp.vue b/src/components/drawers/party/xp.vue
new file mode 100644
index 000000000..c7a28ed99
--- /dev/null
+++ b/src/components/drawers/party/xp.vue
@@ -0,0 +1,202 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/slides/roll/Roller.vue b/src/components/drawers/roll/Roller.vue
similarity index 100%
rename from src/components/slides/roll/Roller.vue
rename to src/components/drawers/roll/Roller.vue
diff --git a/src/components/slides/roll/Rolls.vue b/src/components/drawers/roll/Rolls.vue
similarity index 100%
rename from src/components/slides/roll/Rolls.vue
rename to src/components/drawers/roll/Rolls.vue
diff --git a/src/components/slides/roll/index.vue b/src/components/drawers/roll/index.vue
similarity index 100%
rename from src/components/slides/roll/index.vue
rename to src/components/drawers/roll/index.vue
diff --git a/src/components/drawers/trackCampaign/playerRequests/DamageHealing.vue b/src/components/drawers/trackCampaign/playerRequests/DamageHealing.vue
new file mode 100644
index 000000000..402e7cd81
--- /dev/null
+++ b/src/components/drawers/trackCampaign/playerRequests/DamageHealing.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
diff --git a/src/components/slides/trackCampaign/playerRequests/index.vue b/src/components/drawers/trackCampaign/playerRequests/index.vue
similarity index 100%
rename from src/components/slides/trackCampaign/playerRequests/index.vue
rename to src/components/drawers/trackCampaign/playerRequests/index.vue
diff --git a/src/components/slides/trackCampaign/playerRequests/pendingRequests.vue b/src/components/drawers/trackCampaign/playerRequests/pendingRequests.vue
similarity index 100%
rename from src/components/slides/trackCampaign/playerRequests/pendingRequests.vue
rename to src/components/drawers/trackCampaign/playerRequests/pendingRequests.vue
diff --git a/src/components/slides/xpTable.vue b/src/components/drawers/xpTable.vue
similarity index 100%
rename from src/components/slides/xpTable.vue
rename to src/components/drawers/xpTable.vue
diff --git a/src/views/UserContent/Encounters/Edit/Entities.vue b/src/components/encounters/Entities.vue
similarity index 99%
rename from src/views/UserContent/Encounters/Edit/Entities.vue
rename to src/components/encounters/Entities.vue
index 5dc0f4573..2682b322e 100644
--- a/src/views/UserContent/Encounters/Edit/Entities.vue
+++ b/src/components/encounters/Entities.vue
@@ -398,7 +398,7 @@ export default {
viewNPC: [],
player_dialog: false,
player: {},
- slide: this.$store.getters.getSlide,
+ drawer: this.$store.getters.getDrawer,
to_add: {},
typeFilter: [],
monsterFields: {
@@ -529,7 +529,7 @@ export default {
},
},
methods: {
- ...mapActions(["setSlide"]),
+ ...mapActions(["setDrawer"]),
...mapActions("api_monsters", ["fetch_monsters", "fetch_monster"]),
...mapActions("npcs", ["get_npcs", "get_npc"]),
...mapActions("players", ["get_players", "get_player"]),
@@ -805,9 +805,6 @@ input[type="number"]::-webkit-inner-spin-button {
}
}
}
-// .multi_nr::v-deep .q-field__inner {
-// display: none;
-// }
.players {
display: flex;
diff --git a/src/views/UserContent/Encounters/Edit/General.vue b/src/components/encounters/General.vue
similarity index 54%
rename from src/views/UserContent/Encounters/Edit/General.vue
rename to src/components/encounters/General.vue
index b905d8688..d2f9fbc00 100644
--- a/src/views/UserContent/Encounters/Edit/General.vue
+++ b/src/components/encounters/General.vue
@@ -1,6 +1,6 @@
- Award Experience
+ Award experience to:
+
+
+
+
-
+
-
+
General settings
@@ -13,15 +13,19 @@
-
+
-
-
-
-
+ >
-
-
-
+
Background effects
-
+
Backgrounds & Effects
-
+
- Background preview
@@ -173,7 +183,11 @@
-
+
+
+
+
+
+
diff --git a/src/components/encounters/Weather.vue b/src/components/encounters/Weather.vue
new file mode 100644
index 000000000..991541584
--- /dev/null
+++ b/src/components/encounters/Weather.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+ {{ encDifficulty[0].capitalize() }}
+
+
+
+
+
+
+
+
+ {{ encDifficulty[1] }}
+
+
+
+
+ Total XP:
+ Party XP thresholds
+
+ Easy:
+
+
+ Medium:
+
+
+ Hard:
+
+
+ Deadly:
+
+
+ Adjusted XP:
+
+
+ {{ difficulty_info[encDifficulty[0]] }}
+ (dmg 82)
+
+
+
+
+
+
+ Players and friendlies
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ data.item.capitalizeEach() }}
+
+
+
+
+
+ Monsters
+
+
+
+ Add entities
+
+
+ Background Effects
+
+ Set them under the General tab.
+
+
+
+
+ {{ name }}: {{ intensity(key) }}
+
+
-
+
+
{{ demo ? "Encounter builder for D&D" : encounter.name }}