Merge pull request #6 from thehappyanarchist/THA-Home

Prep for release

src/LICENSE.txt

@@ -618,57 +618,4 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    Foundry VTT 5th Edition
-    Copyright (C) 2019  Foundry Network
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPACKS.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    Foundry VTT 5th Edition  Copyright (C) 2019  Foundry Network
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

src/acks.js

@@ -84,25 +84,6 @@ Hooks.on("renderSidebarTab", async (object, html) => {
   if (object instanceof ActorDirectory) {
     party.addControl(object, html);
   }
-  if (object instanceof Settings) {
-    let gamesystem = html.find(".game-system");
-    // SRD Link
-    let acks = gamesystem.find('h4').last();
-    acks.append(` <sub><a href="https://oldschoolessentials.necroticgnome.com/srd/index.php">SRD<a></sub>`);
-
-    // License text
-    const template = "systems/acks/templates/chat/license.html";
-    const rendered = await renderTemplate(template);
-    gamesystem.find(".system").append(rendered);
-    
-    // User guide
-    let docs = html.find("button[data-action='docs']");
-    const styling = "border:none;margin-right:2px;vertical-align:middle;margin-bottom:5px";
-    $(`<button data-action="userguide"><img src='/systems/acks/assets/dragon.png' width='16' height='16' style='${styling}'/>Old School Guide</button>`).insertAfter(docs);
-    html.find('button[data-action="userguide"]').click(ev => {
-      new FrameViewer('https://mesfoliesludiques.gitlab.io/foundryvtt-ose', {resizable: true}).render(true);
-    });
-  }
 });
 
 Hooks.on("preCreateCombatant", (combat, data, options, id) => {

src/lang/en.json

@@ -121,7 +121,7 @@
   "ACKS.ArmorClassBonus": "Armor Class Bonus",
   "ACKS.Thac0": "THAC0",
   "ACKS.ABShort": "Throw",
-  "ACKS.AB": "Throw",
+  "ACKS.AB": "Number needed to hit AC 0",
   "ACKS.MeleeShort": "MEL",
   "ACKS.Melee": "Melee",
   "ACKS.MeleeBonus": "Melee Throw Bonus",
@@ -146,6 +146,7 @@
   "ACKS.Literate": "Literate",
   "ACKS.LiteracyBasic": "Basic",
   "ACKS.Illiterate": "Illiterate",
+
   "ACKS.NativeBroken": "Native (Broken)",
   "ACKS.Native": "Native",
   "ACKS.NativePlus1": "Native + 1",
@@ -174,16 +175,16 @@
   "ACKS.Setting.InitiativeKeep": "Keep for each round",
   "ACKS.Setting.InitiativeReroll": "Reroll each round",
   "ACKS.Setting.InitiativeReset": "Reset each round",
-  "ACKS.Setting.AscendingAC": "Ascending Armor Class",
+  "ACKS.Setting.AscendingAC": "ACKS Style Armor Class",
-  "ACKS.Setting.AscendingACHint": "The more the better",
+  "ACKS.Setting.AscendingACHint": "Do not uncheck unless you want old school THAC0",
   "ACKS.Setting.Morale": "Enable monsters Morale Rating",
   "ACKS.Setting.MoraleHint": "Morale Rating is shown on monster sheets",
   "ACKS.Setting.Encumbrance": "Encumbrance",
   "ACKS.Setting.EncumbranceHint": "Choose the way encumbrance is calculated",
   "ACKS.Setting.EncumbranceDisabled": "Disabled",
   "ACKS.Setting.EncumbranceBasic": "Basic",
-  "ACKS.Setting.EncumbranceDetailed": "Detailed",
+  "ACKS.Setting.EncumbranceDetailed": "6 Items or 1000 coins per Stone (ACKS Default)",
-  "ACKS.Setting.EncumbranceComplete": "Complete",
+  "ACKS.Setting.EncumbranceComplete": "Every item has weight at 1000 coins per stone",
   "ACKS.Setting.MovementAuto": "Calculate Movement",
   "ACKS.Setting.SignificantTreasure": "Significant Treasure Weight",
   "ACKS.Setting.SignificantTreasureHint": "Weight at which treasure will reduce the movement, only useful for basic encumbrance",

src/module/actor/entity.js

@@ -110,7 +110,6 @@ export class AcksActor extends Actor {
     let roll = new Roll(this.data.data.hp.hd).roll();
     return this.update({
       data: {
-        actor: this.data,
         hp: {
           max: roll.total,
           value: roll.total,

src/module/settings.js

@@ -17,7 +17,7 @@ export const registerSettings = function () {
   game.settings.register("acks", "ascendingAC", {
     name: game.i18n.localize("ACKS.Setting.AscendingAC"),
     hint: game.i18n.localize("ACKS.Setting.AscendingACHint"),
-    default: false,
+    default: true,
     scope: "world",
     type: Boolean,
     config: true,
@@ -27,7 +27,7 @@ export const registerSettings = function () {
   game.settings.register("acks", "morale", {
     name: game.i18n.localize("ACKS.Setting.Morale"),
     hint: game.i18n.localize("ACKS.Setting.MoraleHint"),
-    default: false,
+    default: true,
     scope: "world",
     type: Boolean,
     config: true,
@@ -41,21 +41,21 @@ export const registerSettings = function () {
     type: String,
     config: true,
     choices: {
-      disabled: "ACKS.Setting.EncumbranceDisabled",
+//      disabled: "ACKS.Setting.EncumbranceDisabled",
-      basic: "ACKS.Setting.EncumbranceBasic",
+//      basic: "ACKS.Setting.EncumbranceBasic",
       detailed: "ACKS.Setting.EncumbranceDetailed",
       complete: "ACKS.Setting.EncumbranceComplete",
     },
     onChange: _ => window.location.reload()
   });
 
-  game.settings.register("acks", "significantTreasure", {
+//  game.settings.register("acks", "significantTreasure", {
-    name: game.i18n.localize("ACKS.Setting.SignificantTreasure"),
+//    name: game.i18n.localize("ACKS.Setting.SignificantTreasure"),
-    hint: game.i18n.localize("ACKS.Setting.SignificantTreasureHint"),
+//    hint: game.i18n.localize("ACKS.Setting.SignificantTreasureHint"),
-    default: 800,
+//    default: 800,
-    scope: "world",
+//    scope: "world",
-    type: Number,
+//    type: Number,
-    config: true,
+//    config: true,
-    onChange: _ => window.location.reload()
+//    onChange: _ => window.location.reload()
-  });
+//  });
 };

src/system.json

@@ -1,8 +1,8 @@
 {
   "name": "acks",
-  "title": "Adventurer Conqueror Kings System",
+  "title": "Adventurer Conqueror King System",
   "description": "Play B/X OSR modules with ACKS on Foundry VTT",
-  "version": "0.2.2",
+  "version": "0.5.0",
   "minimumCoreVersion": "0.6.2",
   "compatibleCoreVersion": "0.6.6",
   "templateVersion": 2,

src/templates/apps/party-sheet.html

@@ -46,7 +46,7 @@
             {{#unless @root.settings.ascending}}
             {{e.data.data.thac0.value}}
             {{else}}
-            {{e.data.data.thac0.bba}}
+            {{e.data.data.thac0.throw}}
             {{/unless}}
           </div>
           {{#if (eq e.data.type 'character')}}

src/templates/chat/license.html

@@ -1,12 +1,11 @@
 <div class="acks game-license">
   <p class="acks game-license">
-    This unofficial system requires Adventuer Conqueror King System Rules that
+    This unofficial system requires Adventuer Conqueror King System Rules that you can find <a href="http://autarch.co">here</a>.
-    you can find <a href="http://autarch.co">here</a>.
   </p>
   <p>
-      Brought to life on Foundry VTT by The Happy Anarchist, with most of the heavy lifting done by U~man.
+      Brought to life on FoundryVTT by The Happy Anarchist, built upon an OSE foundation programmed by U~man.
   </p>
   <div class="footer">
-      Report your issues to The Happy Anarchist at maileater@thehiddencitadel.com
+      Report your issues on the <a href="https://github.com/thehappyanarchist/foundryacks/issues">FoundryACKS Github</a>.
   </div>
 </div>