Merge branch 'development'

gmmatt · Jan 28, 2021 · df03cb5 · df03cb5
2 parents 4300c56 + 9fc7bfc
commit df03cb5
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/lang/en.json b/lang/en.json
@@ -180,7 +180,11 @@
             "spellcraft": "Spellcraft"
         },
         "sheetLabels": {
+            "stats": "Stats",
             "perks": "Perks",
+            "gear": "Gear",
+            "powers": "Powers",
+            "background": "Background",
             "enhancements": "Enhancements",
             "generalGear": "General Gear",
             "armor": "Armor",
@@ -199,8 +203,36 @@
             "skills": "Skills",
             "possibilitypotential": "Possibilities (Potential)",
             "possibilities": "Possibilities",
+            "up": "Up",
             "equipment": "Equipment",
-            "specialabilities": "Special Abilities"
+            "specialabilities": "Special Abilities",
+            "wounds": "Wounds",
+            "shock": "Shock",
+            "attributes": "Attributes",
+            "move": "Move",
+            "run": "Run",
+            "toughness": "Toughness",
+            "magic": "Magic",
+            "social": "Social",
+            "spirit": "Spirit",
+            "tech": "Tech",
+            "attribute": "Attribute",
+            "adds": "Adds",
+            "total": "Total",
+            "defenses": "Defenses",
+            "melee": "Melee",
+            "unarmed": "Unarmed",
+            "xp": "XP",
+            "unspent": "Unspent",
+            "earned": "Earned",
+            "clearance": "Clearance",
+            "race": "Race",
+            "weapons": "Weapons",
+            "armorAndShields": "Armor and Shields",
+            "other": "Other",
+            "spell": "Spell",
+            "miracle": "Miracle",
+            "psionicPower": "Psionic Power"
         },
         "itemSheetDescriptions": {
             "perk": "Perk",

diff --git a/module/sheets/torgeternityActorSheet.js b/module/sheets/torgeternityActorSheet.js
@@ -121,10 +121,32 @@ export default class torgeternityActorSheet extends ActorSheet {
 
         // Delete Inventory Item
         html.find('.item-delete').click(ev => {
-            const li = $(ev.currentTarget).parents(".item");
-            this.actor.deleteOwnedItem(li.data("itemId"));
-            li.slideUp(200, () => this.render(false));
-      }); 
+            let applyChanges = false;
+            new Dialog({
+                title: "Confirm Deletion",
+                content: "Are you sure you want to delete this? It will be permanently removed from the sheet.",
+                buttons: {
+                    yes: {
+                        icon: '<i class="fas fa-check"></i>',
+                        label: "Yes",
+                        callback: () => applyChanges = true
+                    },
+                    no: {
+                        icon: '<i class="fas fa-times"></i>',
+                        label: "No"
+                    },
+                },
+                default: "yes",
+                close: html => {
+                    if (applyChanges) {
+                        const li = $(ev.currentTarget).parents(".item");
+                        this.actor.deleteOwnedItem(li.data("itemId"));
+                        li.slideUp(200, () => this.render(false));            
+                    }
+                }                
+            }).render(true);
+        }); 
+
         // Toggle Item Detail Visibility
         html.find('.item-name').click(ev => {
             let section = event.currentTarget.closest(".item");

diff --git a/module/torgchecks.js b/module/torgchecks.js
@@ -92,7 +92,7 @@ export function PossibilityCheck ({
             icon: "<i class='fas fa-times'></i>",
             label: `Cancel`
          },
-   },
+      },
          default: "yes",
    close: html => {
     if (applyChanges) {

diff --git a/module/torgeternityItem.js b/module/torgeternityItem.js
@@ -76,6 +76,7 @@ export default class torgeternityItem extends Item {
          var messageContent = `Bonus:` + bonus; }
 
       // Calculate base damage
+
       if (this.data.data.damageType == "flat") {
          var baseDamage = this.data.data.damage;}
       else if (this.data.data.damageType == "strengthPlus") {

diff --git a/system.json b/system.json
@@ -3,7 +3,7 @@
   "title": "Torg Eternity",
   "description": "Unofficial Torg Eternity character sheet for Foundry VTT.",
   "author": "Matt Ritchie",
-  "version": "0.90.3",
+  "version": "0.90.4",
   "minimumCoreVersion": "0.7.8",
   "compatibleCoreVersion": "0.7.9", 
   "templateVersion": 2,

diff --git a/template.json b/template.json
@@ -15,11 +15,11 @@
                     "value": 0
                 },
                 "attributes": {
-                    "charisma": 5,
-                    "dexterity": 5,
-                    "mind": 5,
-                    "spirit": 5,
-                    "strength": 5
+                    "charisma": 8,
+                    "dexterity": 8,
+                    "mind": 8,
+                    "spirit": 8,
+                    "strength": 8
                 },
                 "other": {
                     "move": 5,

diff --git a/templates/sheets/gear-sheet.html b/templates/sheets/gear-sheet.html
@@ -1,8 +1,8 @@
 <form class="{{cssClass}} item-sheet" autocomplete="off">
     <header class="sheet-header">
         <img src="{{item.img}}" data-edit="img" title="{{item.name}}" height="64" width="64"/>
-        <h1><input name="name" type="text" value="{{item.name}}" placeholder="Firearm Name" style="background-color:white;border-radius:10px;width:320px;font-family:'Palatino Linotype"/></h1>
-        <h1 style="font-size:42px;text-align:right;font-family:'Palatino Linotype'">{{localize "torgeternity.itemSheetDescriptions.generalGear"}}</h1>
+        <h1><input name="name" type="text" value="{{item.name}}" placeholder="Firearm Name" style="background-color:white;border-radius:10px;width:320px;font-family:'Palatino Linotype'" /></h1>
+        <h1 style="font-size:32px;text-align:right;font-family:'Palatino Linotype'">{{localize "torgeternity.itemSheetDescriptions.generalGear"}}</h1>
     </header>
     <div class="sheet-content">
         <table style="background-color:transparent;border: 0px solid black">

diff --git a/templates/sheets/shield-sheet.html b/templates/sheets/shield-sheet.html
@@ -1,8 +1,8 @@
 <form class="{{cssClass}} item-sheet" autocomplete="off">
     <header class="sheet-header">
         <img src="{{item.img}}" data-edit="img" title="{{item.name}}" height="64" width="64"/>
-        <h1><input name="name" type="text" value="{{item.name}}" placeholder="Firearm Name" style="background-color:white;border-radius:10px;width:320px;font-family:'Palatino Linotype"/></h1>
-        <h1 style="font-size:40px;text-align:right;font-family:'Palatino Linotype'">{{localize "torgeternity.itemSheetDescriptions.shield"}}</h1>
+        <h1><input name="name" type="text" value="{{item.name}}" placeholder="Firearm Name" style="background-color:white;border-radius:10px;width:320px;font-family:'Palatino Linotype'"/></h1>
+        <h1 style="font-size:36px;text-align:right;font-family:'Palatino Linotype'">{{localize "torgeternity.itemSheetDescriptions.shield"}}</h1>
     </header>
     <div class="sheet-content">
         <table style="background-color:transparent;border: 0px solid black">