diff --git a/src/lang/en.json b/src/lang/en.json index f7ef30b..eec8033 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -109,6 +109,7 @@ "OSE.ArmorClass": "Armor Class", "OSE.ArmorClassShort": "AC", "OSE.AscArmorClassShort": "AAC", + "OSE.ArmorClassBonus": "Armor Class Bonus", "OSE.Thac0": "THAC0", "OSE.ABShort": "AB", "OSE.AB": "Attack Bonus", @@ -157,8 +158,6 @@ "OSE.Setting.AscendingACHint": "The more the better", "OSE.Setting.Morale": "Enable monsters Morale Rating", "OSE.Setting.MoraleHint": "Morale Rating is shown on monster sheets", - "OSE.Setting.THAC0Attacks": "Attacks with THAC0", - "OSE.Setting.THAC0AttacksHint": "Attacks are resolved using the THAC0 value, not compatible with AAC", "OSE.Setting.VariableWeaponDamage": "Variable Weapon Damage", "OSE.Setting.VariableWeaponDamageHint": "Weapons have different damage dice", "OSE.Setting.Encumbrance": "Encumbrance", diff --git a/src/lang/fr.json b/src/lang/fr.json index 5968803..2812053 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -4,6 +4,7 @@ "OSE.Show": "Montrer", "OSE.Add": "Ajouter", "OSE.Ok": "Ok", + "OSE.Update": "Mettre à jour", "OSE.Reset": "Réinitialiser", "OSE.Cancel": "Annuler", "OSE.Roll": "Lancer", @@ -12,6 +13,8 @@ "OSE.dialog.tweaks": "Ajuster", "OSE.dialog.partysheet": "Fiche de Groupe", + "OSE.dialog.selectActors": "Choisir PJs", + "OSE.dialog.dealXP": "Donner XP", "OSE.Formula": "Formule", "OSE.SitMod": "Mod. de situation", @@ -106,6 +109,7 @@ "OSE.ArmorClass": "Classe d'Armure", "OSE.ArmorClassShort": "CA", "OSE.AscArmorClassShort": "CAA", + "OSE.ArmorClassBonus": "Bonus d'Armure", "OSE.Thac0": "THAC0", "OSE.ABShort": "BBA", "OSE.AB": "Bonus d'Attaque", diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index f3106c0..03377b0 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -148,7 +148,6 @@ export class OseActor extends Actor { } rollReaction(options = {}) { - const label = game.i18n.localize(`OSE.details.reaction`); const rollParts = ["2d6"]; const data = { @@ -566,8 +565,8 @@ export class OseActor extends Actor { shield = a.data.ac.value; } }); - data.aac.value = baseAac + data.scores.dex.mod + shield; - data.ac.value = baseAc - data.scores.dex.mod - shield; + data.aac.value = baseAac + data.scores.dex.mod + shield + data.aac.mod; + data.ac.value = baseAc - data.scores.dex.mod - shield - data.ac.mod; data.shield = shield; } diff --git a/src/module/dialog/entity-tweaks.js b/src/module/dialog/entity-tweaks.js index a657268..ad2f74f 100644 --- a/src/module/dialog/entity-tweaks.js +++ b/src/module/dialog/entity-tweaks.js @@ -33,6 +33,7 @@ export class OseEntityTweaks extends FormApplication { data.isCharacter = true; } data.user = game.user; + data.config = CONFIG.OSE; return data; } diff --git a/src/module/dialog/party-sheet.js b/src/module/dialog/party-sheet.js index 5cb627f..42970cc 100644 --- a/src/module/dialog/party-sheet.js +++ b/src/module/dialog/party-sheet.js @@ -39,8 +39,7 @@ export class OsePartySheet extends FormApplication { _onDrop(event) { event.preventDefault(); - - console.log("DROPPING"); + // WIP Drop Items let data; try { data = JSON.parse(event.dataTransfer.getData("text/plain")); @@ -48,7 +47,6 @@ export class OsePartySheet extends FormApplication { } catch (err) { return false; } - console.log(data); } /* -------------------------------------------- */ @@ -117,10 +115,13 @@ export class OsePartySheet extends FormApplication { html .find("button[data-action='select-actors']") .click(this._selectActors.bind(this)); - html.find("button[data-action='deal-xp']").click(this._dealXP.bind(this)); + + html.find("button[data-action='deal-xp']").click(this._dealXP.bind(this)); + html.find("a.resync").click(() => this.render(true)); - html.find(".field-img").click((ev) => { - let actorId = ev.currentTarget.parentElement.dataset.actorId; + + html.find(".field-img button[data-action='open-sheet']").click((ev) => { + let actorId = ev.currentTarget.parentElement.parentElement.parentElement.dataset.actorId; game.actors.get(actorId).sheet.render(true); }) } diff --git a/src/scss/apps.scss b/src/scss/apps.scss index 5d7ecc8..2c10b4c 100644 --- a/src/scss/apps.scss +++ b/src/scss/apps.scss @@ -34,11 +34,37 @@ text-align: center; .field-img { flex: 0 0 50px; + position: relative; + &:hover { + .img-btns button { + display: block; + } + } img { border: none; width: 50px; height: 50px; } + .img-btns { + position: absolute; + bottom: 0; + left: 0; + width: 50px; + height: 12px; + button { + display: none; + cursor: pointer; + font-size: 10px; + height: 18px; + width: 14px; + line-height: 13px; + margin: 0 1px; + border: 1px solid $colorOlive; + padding: 2px; + background: $colorFaint; + box-shadow: inset 0 0px 3px $colorTan; + } + } } } } diff --git a/src/template.json b/src/template.json index 50bdea3..f2e4398 100644 --- a/src/template.json +++ b/src/template.json @@ -14,10 +14,12 @@ "max": 20 }, "ac": { - "value": 0 + "value": 0, + "mod": 0 }, "aac": { - "value": 0 + "value": 0, + "mod": 0 }, "thac0": { "value": 19, diff --git a/src/templates/actors/dialogs/tweaks-dialog.html b/src/templates/actors/dialogs/tweaks-dialog.html index 149815c..fb96b43 100644 --- a/src/templates/actors/dialogs/tweaks-dialog.html +++ b/src/templates/actors/dialogs/tweaks-dialog.html @@ -46,6 +46,18 @@ data-dtype="Number" /> +
+ +
+ {{#if config.ascending}} + + {{else}} + + {{/if}} +
+
diff --git a/src/templates/apps/party-sheet.html b/src/templates/apps/party-sheet.html index 6ef09ee..ee32374 100644 --- a/src/templates/apps/party-sheet.html +++ b/src/templates/apps/party-sheet.html @@ -18,7 +18,10 @@ {{#each data.entities as |e|}} {{#if e.data.flags.ose.party}}
  • - + +
    + +
    @@ -61,7 +64,7 @@ {{#each e.data.data.saves as |s i|}} {{lookup @root.config.saves_short i}} {{s.value}} {{/each}} - {{#if (eq e.data.type 'character')}}{{mod e.data.data.scores.wis.mod}}{{/if}} + {{#if (eq e.data.type 'character')}}{{mod e.data.data.scores.wis.mod}}{{/if}}