diff --git a/images/icons/Language.webp b/images/icons/Language.webp deleted file mode 100644 index be23cfb..0000000 Binary files a/images/icons/Language.webp and /dev/null differ diff --git a/images/icons/Mist_Items_And_Services.webp b/images/icons/Mist_Items_And_Services.webp deleted file mode 100644 index 13b130c..0000000 Binary files a/images/icons/Mist_Items_And_Services.webp and /dev/null differ diff --git a/images/icons/Outfit.webp b/images/icons/Outfit.webp deleted file mode 100644 index 5fcce0f..0000000 Binary files a/images/icons/Outfit.webp and /dev/null differ diff --git a/images/icons/Perks.webp b/images/icons/Perks.webp deleted file mode 100644 index d219429..0000000 Binary files a/images/icons/Perks.webp and /dev/null differ diff --git a/images/icons/Races.webp b/images/icons/Races.webp deleted file mode 100644 index c7cca36..0000000 Binary files a/images/icons/Races.webp and /dev/null differ diff --git a/images/icons/Research.webp b/images/icons/Research.webp deleted file mode 100644 index 4da4c67..0000000 Binary files a/images/icons/Research.webp and /dev/null differ diff --git a/images/icons/Skills.webp b/images/icons/Skills.webp deleted file mode 100644 index 00c840d..0000000 Binary files a/images/icons/Skills.webp and /dev/null differ diff --git a/images/icons/Trade_Goods.webp b/images/icons/Trade_Goods.webp deleted file mode 100644 index 3af15e9..0000000 Binary files a/images/icons/Trade_Goods.webp and /dev/null differ diff --git a/images/icons/Traits.webp b/images/icons/Traits.webp deleted file mode 100644 index 8844e03..0000000 Binary files a/images/icons/Traits.webp and /dev/null differ diff --git a/images/icons/Utility.webp b/images/icons/Utility.webp deleted file mode 100644 index ba186ed..0000000 Binary files a/images/icons/Utility.webp and /dev/null differ diff --git a/images/icons/Weapon_General.webp b/images/icons/Weapon_General.webp deleted file mode 100644 index 4139871..0000000 Binary files a/images/icons/Weapon_General.webp and /dev/null differ diff --git a/images/icons/icon_advantage.webp b/images/icons/icon_advantage.webp deleted file mode 100644 index 58e8170..0000000 Binary files a/images/icons/icon_advantage.webp and /dev/null differ diff --git a/images/icons/icon_armor.webp b/images/icons/icon_armor.webp deleted file mode 100644 index 054ecaf..0000000 Binary files a/images/icons/icon_armor.webp and /dev/null differ diff --git a/images/icons/icon_art.webp b/images/icons/icon_art.webp deleted file mode 100644 index 4f31d3c..0000000 Binary files a/images/icons/icon_art.webp and /dev/null differ diff --git a/images/icons/icon_disadvantage.webp b/images/icons/icon_disadvantage.webp deleted file mode 100644 index 2f59f53..0000000 Binary files a/images/icons/icon_disadvantage.webp and /dev/null differ diff --git a/images/icons/icon_equipment.webp b/images/icons/icon_equipment.webp deleted file mode 100644 index df10619..0000000 Binary files a/images/icons/icon_equipment.webp and /dev/null differ diff --git a/images/icons/icon_skill.webp b/images/icons/icon_skill.webp deleted file mode 100644 index 3bb4293..0000000 Binary files a/images/icons/icon_skill.webp and /dev/null differ diff --git a/images/icons/icon_skills.webp b/images/icons/icon_skills.webp deleted file mode 100644 index 00c840d..0000000 Binary files a/images/icons/icon_skills.webp and /dev/null differ diff --git a/images/icons/icon_style.webp b/images/icons/icon_style.webp deleted file mode 100644 index 2ed656b..0000000 Binary files a/images/icons/icon_style.webp and /dev/null differ diff --git a/images/icons/icon_technique.webp b/images/icons/icon_technique.webp deleted file mode 100644 index 2856d2b..0000000 Binary files a/images/icons/icon_technique.webp and /dev/null differ diff --git a/images/icons/icon_weapon.webp b/images/icons/icon_weapon.webp deleted file mode 100644 index d7f5d09..0000000 Binary files a/images/icons/icon_weapon.webp and /dev/null differ diff --git a/images/icons/image_corporation.webp b/images/icons/image_corporation.webp deleted file mode 100644 index 6399faa..0000000 Binary files a/images/icons/image_corporation.webp and /dev/null differ diff --git a/images/icons/unlocked.svg b/images/icons/unlocked.svg deleted file mode 100644 index f86c359..0000000 --- a/images/icons/unlocked.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/modules/pegasus-item-sheet.js b/modules/pegasus-item-sheet.js index 551e233..15821a5 100644 --- a/modules/pegasus-item-sheet.js +++ b/modules/pegasus-item-sheet.js @@ -60,6 +60,7 @@ export class PegasusItemSheet extends ItemSheet { editable: this.isEditable, cssClass: this.isEditable ? "editable" : "locked", optionsDiceList: PegasusUtility.getOptionsDiceList(), + optionsStatusList: PegasusUtility.getOptionsStatusList(), data: itemData, limited: this.object.limited, options: this.options, diff --git a/modules/pegasus-utility.js b/modules/pegasus-utility.js index 8f6d2d6..fc4f5fd 100644 --- a/modules/pegasus-utility.js +++ b/modules/pegasus-utility.js @@ -55,9 +55,15 @@ export class PegasusUtility { this.optionsDiceList = optionsDiceList; this.optionsLevel = optionsLevel; + this.optionsStatusList = ''; + console.log("Defautl dice List", diceList, diceFoundryList); } + /* -------------------------------------------- */ + static getOptionsStatusList() { + return this.optionsStatusList; + } /* -------------------------------------------- */ static getOptionsDiceList() { return this.optionsDiceList; @@ -125,6 +131,7 @@ export class PegasusUtility { 'systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html', 'systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html', 'systems/fvtt-pegasus-rpg/templates/partial-options-level.html', + 'systems/fvtt-pegasus-rpg/templates/partial-options-range.html', 'systems/fvtt-pegasus-rpg/templates/partial-options-equipment-types.html' ] return loadTemplates(templatePaths); diff --git a/styles/simple.css b/styles/simple.css index b3fd01f..eb4fc03 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1162,8 +1162,8 @@ ul, li { #logo { content : url(../images/ui/pegasus_logo_v1.webp); - width: 110px; - height: 70px; + width: 100px; + height: 60px; } .dice-cell { diff --git a/system.json b/system.json index bfbdb27..3eb36b5 100644 --- a/system.json +++ b/system.json @@ -40,9 +40,9 @@ "styles": [ "styles/simple.css" ], - "templateVersion": 6, + "templateVersion": 9, "title": "Pegasus RPG", "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg", - "version": "0.0.6", - "background" : "" + "version": "0.0.9", + "background" : "./images/ui/pegasus_welcome_page.webp" } \ No newline at end of file diff --git a/template.json b/template.json index c688850..8a5c2d8 100644 --- a/template.json +++ b/template.json @@ -29,61 +29,61 @@ "statistics": { "agi":{ "label": "Agility", - "abbrev": "agi", + "abbrev": "AGI", "level": 1, "mod": 0 }, "mnd":{ "label": "Mind", - "abbrev": "mnd", + "abbrev": "MND", "level": 1, "mod": 0 }, "soc":{ "label": "Social", - "abbrev": "soc", + "abbrev": "SOC", "level": 1, "mod": 0 }, "str":{ "label": "Strength", - "abbrev": "str", + "abbrev": "STR", "level": 1, "mod": 0 }, "phy":{ "label": "Physique", - "abbrev": "phy", + "abbrev": "PHY", "level": 1, "mod": 0 }, "com":{ "label": "Combat", - "abbrev": "com", + "abbrev": "COM", "level": 1, "mod": 0 }, "def":{ "label": "Defence", - "abbrev": "def", + "abbrev": "DEF", "level": 1, "mod": 0 }, "stl":{ "label": "Stealth", - "abbrev": "stl", + "abbrev": "STL", "level": 1, "mod": 0 }, "per":{ "label": "Perception", - "abbrev": "per", + "abbrev": "PER", "level": 1, "mod": 0 }, "foc":{ "label": "Focus", - "abbrev": "foc", + "abbrev": "FOC", "level": 1, "mod": 0 } @@ -142,6 +142,16 @@ "statistics": "" }, "ability": { + "affectedstat": "", + "statmodifier": 0, + "statlevelincrease": 0, + "bonusdice": 0, + "otherdice": 0, + "statusaffected": "", + "statusmodifier": 0, + "powergained": 0, + "specgained": "", + "aoe": "", "description": "" }, "specialisation": { @@ -154,6 +164,17 @@ "active": false, "roundcount": 0, "nbuse": "", + "gainstatdice": "", + "gainbonusdice": 0, + "gainotherdice": 0, + "specialisation": "", + "range": "", + "aoe": "", + "nbtargets": 0, + "nrgcost": 0, + "effectscaused": "", + "stataffected": "", + "targetresists": "", "description": "", "upgrades": "", "rules": "" @@ -201,6 +222,7 @@ "cost": 0, "weight": 0, "idr": "", + "range": "", "equipped": false, "description": "" } diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index c430ba2..f555a2a 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -36,7 +36,7 @@ + +
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-
+ + diff --git a/templates/item-perk-sheet.html b/templates/item-perk-sheet.html index 1f768bc..0a82d12 100644 --- a/templates/item-perk-sheet.html +++ b/templates/item-perk-sheet.html @@ -17,27 +17,72 @@
    • -
  • - -
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
    {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} diff --git a/templates/item-weapon-sheet.html b/templates/item-weapon-sheet.html index 0820d8b..8eaae9f 100644 --- a/templates/item-weapon-sheet.html +++ b/templates/item-weapon-sheet.html @@ -25,6 +25,13 @@ {{/select}} +
  • + +
  • diff --git a/templates/partial-options-level.html b/templates/partial-options-level.html index 11fbe37..0fb86c0 100644 --- a/templates/partial-options-level.html +++ b/templates/partial-options-level.html @@ -1,3 +1,6 @@ +{{#if notapplicable}} + +{{/if}} diff --git a/templates/partial-options-statistics.html b/templates/partial-options-statistics.html index 77d236e..eac07c5 100644 --- a/templates/partial-options-statistics.html +++ b/templates/partial-options-statistics.html @@ -1,3 +1,6 @@ +{{#if notapplicable}} + +{{/if}} @@ -8,3 +11,6 @@ +{{#if mr}} + +{{/if}}