enable combatskills part#1, bugffixes, consumables, character magical…

… AND clerical, language point calculation

dsa5.js

@@ -5,9 +5,6 @@ import ActorSheetdsa5NPC from "./modules/actor/npc-sheet.js";
 import Actordsa5 from "./modules/actor/actor-dsa5.js";
 import Itemdsa5 from "./modules/item/item-dsa5.js";
 import ItemSheetdsa5 from "./modules/item/item-sheet.js";
-import ItemSpeciesDsa5 from "./modules/item/sheets/item-species-dsa5.js";
-import ItemCareerDsa5 from "./modules/item/sheets/item-career-dsa5.js";
-import ItemCultureDsa5 from "./modules/item/sheets/item-culture-dsa5.js"
 import initHooks from "./modules/hooks/init.js";
 import MacroDSA5 from "./modules/system/macroControl.js";
 import LazyImporter from "./modules/importer/lazy_importer.js"
@@ -18,35 +15,12 @@ import DSA5Initializer from "./modules/system/initializer.js"
 import AdvantageRulesDSA5 from "./modules/system/advantage-rules-dsa5.js";
 import SpecialabilityRulesDSA5 from "./modules/system/specialability-rules-dsa5.js"
 import ChatMessageDSA5Roll from "./modules/chat/ChatMessageDSA5.js";
-import VantageSheetDSA5 from "./modules/item/sheets/item-vantage-dsa5.js"
-import SpellSheetDSA5 from "./modules/item/sheets/item-spell-dsa5.js";
-import SpecialAbilitySheetDSA5 from "./modules/item/sheets/item-specialability-dsa5.js";
-import MeleeweaponSheetDSA5 from "./modules/item/sheets/item-meleeweapon-dsa5.js";
-import DiseaseSheetDSA5 from "./modules/item/sheets/item-disease-sheet.js";
-import PoisonSheetDSA5 from "./modules/item/sheets/item-poison-dsa5.js";
+
 
 Hooks.once("init", async function() {
     console.log("Initializing DSA5 system")
 
     CONFIG.statusEffects = DSA5.statusEffects
-
-    Actors.unregisterSheet("core", ActorSheet);
-    Actors.registerSheet("dsa5", ActorSheetdsa5Character, { types: ["character"], makeDefault: true });
-    Actors.registerSheet("dsa5", ActorSheetdsa5Creature, { types: ["creature"] });
-    Actors.registerSheet("dsa5", ActorSheetdsa5NPC, { types: ["npc"] });
-    Items.unregisterSheet("core", ItemSheet);
-    Items.registerSheet("dsa5", ItemSheetdsa5, { makeDefault: true });
-    Items.registerSheet("dsa5", ItemSpeciesDsa5, { makeDefault: true, types: ["species"] });
-    Items.registerSheet("dsa5", ItemCareerDsa5, { makeDefault: true, types: ["career"] });
-    Items.registerSheet("dsa5", ItemCultureDsa5, { makeDefault: true, types: ["culture"] });
-    Items.registerSheet("dsa5", VantageSheetDSA5, { makeDefault: true, types: ["advantage", "disadvantage"] });
-    Items.registerSheet("dsa5", SpellSheetDSA5, { makeDefault: true, types: ["ritual", "ceremony", "liturgy", "spell"] });
-    Items.registerSheet("dsa5", SpecialAbilitySheetDSA5, { makeDefault: true, types: ["specialability"] });
-    Items.registerSheet("dsa5", MeleeweaponSheetDSA5, { makeDefault: true, types: ["meleeweapon"] });
-    Items.registerSheet("dsa5", PoisonSheetDSA5, { makeDefault: true, types: ["poison"] });
-    Items.registerSheet("dsa5", DiseaseSheetDSA5, { makeDefault: true, types: ["disease"] });
-    Items.unregisterSheet("dsa5", ItemSheetdsa5, { types: ["species", "career", "culture", "advantage", "specialability", "disadvantage", "ritual", "ceremony", "liturgy", "spell", "disease", "poison", "meleeweapon"] });
-
     game.dsa5 = {
         apps: {
             ActorSheetdsa5,

lang/de.json

@@ -78,7 +78,8 @@
         "ItemRequiresAdoptionDescription": "Das Hinzufügen benötigt zuerst eine Anpassung. Wähle den passenden Eintrag.",
         "alreadyAddedCharacterpart": "Du hast bereits eine {category}. Möchtest du diese Überschreiben? Bereits hinzugefügte Modifikation der vorherigen {category} können nicht automatisch rückgängig gemacht werden.",
         "warning": "Vorsicht",
-        "deselectWithStrg": "Strg + Click zum Deselektieren"
+        "deselectWithStrg": "Strg + Click zum Deselektieren",
+        "noCombatskills": "Keine passenden Kampfsonderfertigkeiten"
     },
 
     "Equipment": {
@@ -90,7 +91,7 @@
         "bags": "Behältniss",
         "wealth": "Wertsachen",
         "writing": "Schreibwaren",
-        "alchemy": "Alchemie und Gifte",
+        "alchemy": "Alchemie",
         "service": "Dienstleistungen",
         "luxus": "Genussmittel und Luxus",
         "armor": "Rüstung",
@@ -159,13 +160,15 @@
     "culture": "Kultur",
     "count": "Anzahl",
     "cost": "Kosten",
+    "charges": "Ladungen",
     "cancel": "Abbrechen",
     "combatskillcountdivider": "aus",
     "closeCombatAttacks": "Nahkampfangriffe",
     "Current": "Aktuell",
     "career": "Profession",
     "cummulatedQS": "Gesammelte QS",
     "creatureClass": "Typus",
+    "consumable": "Verbrauchsgegenstand",
     "conjuringDifficulty": "Anrufungsschw.",
     "clericspecialtalents": "Klerikale Sonderfertigkeiten",
     "camplocation": "Lagerplatz",
@@ -294,13 +297,15 @@
     "previousFailedTests": "Gescheiterte Proben",
     "probe": "Probe",
     "qualityStep": "Qualitätsstufe",
+    "qualitySteps": "Qualitätsstufen",
     "quantity": "Anzahl",
     "RPr": "Routineprobe",
     "reach": "Reichweite",
     "ritual": "Ritual",
     "ritualTest": "Ritualprobe",
     "rituals": "Rituale",
     "price": "Preis",
+    "priceEachQL": "Preis pro QS",
     "probes": "Proben",
     "poison": "Gift",
     "pamod": "Parademodifikator",
@@ -572,7 +577,8 @@
         "Library": "Bibliothek öffnen",
         "showToPlayers": "Allen zeigen",
         "imageView": "Bildeintrag",
-        "textView": "Texteintrag"
+        "textView": "Texteintrag",
+        "ConsumeItem": "Gegenstand verbrauchen"
     },
 
     "ITEMSHEET": {
@@ -603,12 +609,14 @@
         "unableReroll": "Würfel {die} wegen Unfähigkeit erneut geworfen ({oldVal}/{newVal})",
         "requestRoll": "{user} fordert einen Wurf in {item}",
         "editRoll": "Wurf editieren",
-        "BlindRoll": "Blinder Wurf."
+        "BlindRoll": "Blinder Wurf.",
+        "usesItem": "{actor} benutzt {item}."
     },
 
     "TT": {
         "careerSkills": "Komma separierte Talentliste, z.b. (Betören 2,Etikette 4)",
-        "commaSeparated": "Komma separierte Liste"
+        "commaSeparated": "Komma separierte Liste",
+        "oneQualityPerLine": "Beschreibe eine Qualitätsstufe pro Zeile"
     },
 
     "HELP": {
@@ -653,6 +661,7 @@
     "ITEM.TypeSpecies": "Spezies",
     "ITEM.TypeSpell": "Zauber",
     "ITEM.TypeTrait": "Eigenschaft (Tier)",
+    "ITEM.TypeConsumable": "Verbrauchsgegenstand",
 
     "ACTOR.TypeCharacter": "Charakter",
     "ACTOR.TypeNpc": "Nichtspielercharakter",
@@ -708,6 +717,12 @@
         "selbst": "self"
     },
 
+    "LocalizedAbilityModifiers": {
+        "at": "at",
+        "pa": "pa",
+        "tp": "tp"
+    },
+
     "LocalizedIDs": {
         "deaf": "Taub",
         "blind": "Blind",
@@ -736,17 +751,15 @@
         "magicalRestriction": "Magische Einschränkung",
         "magicalAttunement": "Magische Einstimmung",
         "traditionWitch": "Tradition (Hexen)",
-        "combatReflexes": "Kampfreflexe",
-        "improvedDodge": "Verbessertes Ausweichen",
         "inuredToEncumbrance": "Belastungsgewöhnung",
         "quickload": "Schnellladen",
         "automaticSuccess": "Automatischer Erfolg",
         "automaticFail": "Automatischer Misserfolg",
-        "blessed": "Geweihter",
-        "spellcaster": "Zauberer",
         "familiar": "Vertrauter",
         "shields": "Schilde",
-        "localKnowledge": "Ortskenntnis"
+        "localKnowledge": "Ortskenntnis",
+        "naturalArmor": "Natürliche Rüstung",
+        "all": "alle"
     },
 
     "DSAError": {
@@ -759,11 +772,11 @@
         "NotEnoughXP": "Nicht genug Abenteuerpunkte",
         "NotEnoughAsP": "Nicht genug Astralpunkte",
         "NotEnoughKaP": "Nicht genug Astralpunkte",
+        "NotEnoughCharges": "Nicht genug Ladungen",
         "AdvanceMaximumReached": "Maximale Steigerung bereits erreicht",
         "notFound": "{category} {name} nicht gefunden",
         "itemNotFound": "Dieser Eintrag wurde nicht in der Datenbank gefunden, bitte manuell anlegen",
-        "notUnderstoodCareer": "Folgende Einträge der Profession konnten nicht umgesetzt werden. Bitte manuell anpassen.",
-        "notUnderstoodCulture": "Folgende Einträge der Kultur konnten nicht umgesetzt werden. Bitte manuell anpassen.",
+        "notUnderstood": "Folgende Einträge  konnten nicht umgesetzt bzw. in der Datenbank gefunden werden. Bitte manuell anpassen/hinzufügen.",
         "canNotBeAdded": "{item} der Kategory {category} kann nicht hinzugefügt werden. Dies ist keine unterstützte Kategorie.",
         "NoAmmo": "Nicht genug Munition.",
         "MissingChoices": "Noch nicht alle Optionen ausgefüllt.",

lang/en.json

@@ -78,7 +78,8 @@
         "ItemRequiresAdoptionDescription": "The addition requires an Adaptation first. Select the matching entry for ",
         "alreadyAddedCharacterpart": "You already have a {category}. Do you want to override it? Already added modifications of the former {category} can not be removed automatically.",
         "warning": "Attention",
-        "deselectWithStrg": "CTRL + click to deselect"
+        "deselectWithStrg": "CTRL + click to deselect",
+        "noCombatskills": "No matching Combat Special Abilities"
     },
 
     "Equipment": {
@@ -90,7 +91,7 @@
         "bags": "Bags",
         "wealth": "Valuables",
         "writing": "Stationery",
-        "alchemy": "Alchemy and Poison",
+        "alchemy": "Alchemy",
         "service": "Services",
         "luxus": "Luxury",
         "armor": "Armor",
@@ -143,6 +144,7 @@
     "biography": "Biography",
     "Category": "Category",
     "clerical": "clerical",
+    "charges": "Charges",
     "condition": "Condition",
     "combatspecialtalents": "Combat Special Abilities",
     "CriticalSuccess": "Critical success",
@@ -152,6 +154,7 @@
     "ceremonies": "Ceremonies",
     "ceremonyTest": "Ceremony test",
     "castingTime": "Casting time",
+    "consumable": "Consumable",
     "Combat": "Combat",
     "combatskill": "Combat Technique",
     "culture": "Culture",
@@ -293,6 +296,7 @@
     "previousFailedTests": "Failed checks",
     "probe": "Check",
     "qualityStep": "Quality level",
+    "qualitySteps": "Quality levels",
     "quantity": "Amount",
     "RPr": "Routine check",
     "reach": "Range",
@@ -301,6 +305,7 @@
     "rituals": "Rituals",
     "remainingStructure": "Rem. structure",
     "price": "Price",
+    "priceEachQL": "Price each QL",
     "probes": "Checks",
     "pamod": "Parry modifier",
     "parryWeaponless": "Unarmed defense",
@@ -569,7 +574,8 @@
         "Library": "Open library",
         "showToPlayers": "Show to everyone",
         "imageView": "Image entry",
-        "textView": "Text entry"
+        "textView": "Text entry",
+        "ConsumeItem": "Consume item"
     },
 
     "ITEMSHEET": {
@@ -601,12 +607,14 @@
         "unableReroll": "Die {die} rolled again because of Incompetence ({oldVal}/{newVal})",
         "requestRoll": "{user} requests a roll in {item}",
         "editRoll": "Edit roll",
-        "BlindRoll": "Blinder Wurf."
+        "BlindRoll": "Blinder Wurf.",
+        "usesItem": "{actor} uses {item}."
     },
 
     "TT": {
         "careerSkills": "Comma separated talent list, f.e. (Alchemy 2,Carousing 4)",
-        "commaSeparated": "Comma separated list"
+        "commaSeparated": "Comma separated list",
+        "oneQualityPerLine": "Describe one quality level each line"
     },
 
     "HELP": {
@@ -651,6 +659,7 @@
     "ITEM.TypeSpecies": "Species",
     "ITEM.TypeSpell": "Spell",
     "ITEM.TypeTrait": "Trait (Animal)",
+    "ITEM.TypeConsumable": "Consumable",
 
     "ACTOR.TypeCharacter": "Character",
     "ACTOR.TypeNpc": "Non Player Character",
@@ -705,6 +714,12 @@
         "self": "self"
     },
 
+    "LocalizedAbilityModifiers": {
+        "at": "at",
+        "pa": "pa",
+        "tp": "dp"
+    },
+
     "LocalizedIDs": {
         "deaf": "Deaf",
         "blind": "Blind",
@@ -733,17 +748,15 @@
         "magicalRestriction": "Magical Restriction",
         "magicalAttunement": "Magical Attunement",
         "traditionWitch": "Tradition (Witch)",
-        "combatReflexes": "Combat Reflexes",
-        "improvedDodge": "Improved Dodge",
         "inuredToEncumbrance": "Inured to Encumbrance",
         "quickload": "Quickload",
         "automaticSuccess": "Automatic Succes",
         "automaticFail": "Automatic Failure",
-        "blessed": "Blessed",
-        "spellcaster": "Spellcaster",
         "familiar": "Familiar",
         "shields": "Shields",
-        "localKnowledge": "Area Knowledge"
+        "localKnowledge": "Area Knowledge",
+        "naturalArmor": "Natural Armor",
+        "all": "all"
     },
 
     "DSAError": {
@@ -756,11 +769,11 @@
         "NotEnoughXP": "Not enough adventure points",
         "NotEnoughAsP": "Not enough Astral Energy",
         "NotEnoughKaP": "Not enough Karma Points",
+        "NotEnoughCharges": "Not enough charges",
         "AdvanceMaximumReached": "Max advancements already reached",
         "notFound": "{category} {name} not found",
         "itemNotFound": "This entry was not found in the database. Please create it manually.",
-        "notUnderstoodCareer": "Following entries of the profession could not be adopted. Please configure manually.",
-        "notUnderstoodCulture": "Following entries of the culture could not be adopted. Please configure manually.",
+        "notUnderstood": "Following entries could not be adopted or found in the database. Please add/configure manually.",
         "canNotBeAdded": "{item} of the category {category} can not be added. This is not a supported category.",
         "NoAmmo": "Not enough ammunition.",
         "MissingChoices": "There are missing choices.",