diff --git a/README.md b/README.md index c865e07..54fb0e5 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,12 @@ [![MIT License](https://img.shields.io/static/v1?label=Licence&message=MIT&color=green)](https://opensource.org/licenses/) [![GitHub Release](https://img.shields.io/static/v1?label=Version&message=2.6.0&color=blue)]() [![Discord](https://img.shields.io/static/v1?label=Discord&message=Click%20to%20Join&color=purple)](https://discord.gg/k3v2fXQWJp) [![Patreon](https://img.shields.io/badge/Patreon-FFFFFF)](https://patreon.com/FrykesFiddlings) -This is the repository for WakForge, coded by Fryke (fryke) on Discord. -
-Come check out the [WakForge Discord Server](https://discord.gg/k3v2fXQWJp). +This is the repository for WakForge, coded by Fryke (fryke) on Discord.
Come check out the [WakForge Discord Server](https://discord.gg/k3v2fXQWJp). WakForge is a character build tool for the game Wakfu. This README will be updated with current features as the project is upgraded and added to. You can find the site at .
+ ## Features @@ -42,7 +41,7 @@ If you are interested in contributing to this project, feel free to look through - Keeper of Time (sinbad) for allowing us to use his [auto-item-set](https://github.com/mikeshardmind/wakfu-utils) library on the site. - \ (fl_cl) for icon hunting and Spanish translation work. -- Isp (_is) for bug hunting and French translation work. +- Isp (\_is) for bug hunting and French translation work. - Slendy (slendycandy) for pulling together the default equipment slot icons. - Scour (scour.) and Liz (morgouse) for collecting data and doing the busy work no one likes. - Hooks (hooks0), Ruchi (ruchi), \ (fl_cl), Owlite (owlite), Hate (hatespawn), Soza (sozalord), Kimas (kimasage) for feature ideas and feedback. diff --git a/package.json b/package.json index 3000474..57c9aa5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wakfu-wizard", - "version": "2.6.0", + "version": "2.7.0", "private": true, "scripts": { "serve": "vite", diff --git a/src/App.vue b/src/App.vue index 37b20ed..685ea04 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@
{{ message.message }}
- +
diff --git a/src/components/CharactersPage.vue b/src/components/CharactersPage.vue index a065676..cd46e7e 100644 --- a/src/components/CharactersPage.vue +++ b/src/components/CharactersPage.vue @@ -56,7 +56,7 @@ class="create-character-button py-1 pr-3 pl-2 ml-3" @click.stop="onCreateCharacter(group)" /> - +
@@ -82,7 +82,7 @@
- +
@@ -213,12 +213,26 @@ const onCreateGroup = () => { }); }; -const onDeleteGroup = (group) => { +const onDeleteGroup = (event, group) => { if (group.buildIds.length === 0) { let targetIndex = masterData.groups.indexOf(group); masterData.groups.splice(targetIndex, 1); } else { - toast.add({ severity: 'error', summary: 'You cannot delete a group that has characters in it.', life: 3000 }); + // toast.add({ severity: 'error', summary: 'You cannot delete a group that has characters in it.', life: 3000 }); + + confirm.require({ + group: 'dialog', + target: event.currentTarget, + message: t('confirms.willDeleteCharacters'), + accept: () => { + group.buildIds.forEach((buildId) => { + deleteCharacter(buildId); + }); + + let targetIndex = masterData.groups.indexOf(group); + masterData.groups.splice(targetIndex, 1); + }, + }); } }; @@ -266,7 +280,7 @@ const gotoBuild = (event, id) => { const getBuildById = (buildId) => { let potentialCharacter = masterData.characters.find((character) => character.id === buildId); - if(potentialCharacter) { + if (potentialCharacter) { return potentialCharacter; } else { // We are trying to pull character data that does not exist. @@ -335,6 +349,7 @@ const onBuildDrop = (event, group) => { :deep(.character-enties-wrapper) { overflow-y: auto; + flex-grow: 1; .class-name { min-width: 100px; @@ -347,12 +362,12 @@ const onBuildDrop = (event, group) => { } .delete-button { - width: 40px; - height: 40px; + width: 30px; + height: 100%; background-color: var(--error-70); .p-button-icon { - font-size: 24px; + font-size: 16px; font-weight: 800; pointer-events: none; } diff --git a/src/components/characterSheet/CharacterSheet.vue b/src/components/characterSheet/CharacterSheet.vue index 62833c5..3049bd5 100644 --- a/src/components/characterSheet/CharacterSheet.vue +++ b/src/components/characterSheet/CharacterSheet.vue @@ -86,7 +86,7 @@ class="tab-header characteristics-tab-header" :class="{ error: hasCharacteristicsError, 'points-to-spend': hasCharacteristicsPointsToSpend && !hasCharacteristicsError }" > - {{ $t('characterSheet.characteristics') }} + {{ $t('characterSheet.characteristicsAndSpells') }} @@ -121,14 +121,14 @@ - + @@ -305,7 +305,7 @@ const onCopyBuildCode = () => { } .characteristics-tab-header { - width: 126px !important; + width: 173px !important; i { font-size: 1rem !important; } @@ -319,7 +319,7 @@ const onCopyBuildCode = () => { } .characteristics-tab-header { - width: 158px; + width: 219px; .error-icon { display: none; diff --git a/src/components/characterSheet/CharacteristicsTabContent.vue b/src/components/characterSheet/CharacteristicsTabContent.vue index baa4113..1284501 100644 --- a/src/components/characterSheet/CharacteristicsTabContent.vue +++ b/src/components/characterSheet/CharacteristicsTabContent.vue @@ -316,12 +316,94 @@ +
+ + + + + {{ $t('characterSheet.spellsAndPassivesContent.passives') }} +
+
+
+ +
+ +
+ +
+ +
+ +
+