diff --git a/images/icons/.directory b/images/icons/.directory index b68f2ff..b449055 100644 --- a/images/icons/.directory +++ b/images/icons/.directory @@ -1,6 +1,6 @@ [Dolphin] -SortRole=creationtime -Timestamp=2021,4,13,9,23,48.267 +SortRole=modificationtime +Timestamp=2022,9,8,20,43,38.73 Version=4 ViewMode=1 VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails diff --git a/images/icons/icon_vehicle_ad.webp b/images/icons/icon_vehicle_ad.webp new file mode 100644 index 0000000..6c8fe25 Binary files /dev/null and b/images/icons/icon_vehicle_ad.webp differ diff --git a/images/icons/icon_vehicle_fc.webp b/images/icons/icon_vehicle_fc.webp new file mode 100644 index 0000000..ab4d4c0 Binary files /dev/null and b/images/icons/icon_vehicle_fc.webp differ diff --git a/images/icons/icon_vehicle_hr.webp b/images/icons/icon_vehicle_hr.webp new file mode 100644 index 0000000..d908f5d Binary files /dev/null and b/images/icons/icon_vehicle_hr.webp differ diff --git a/images/icons/icon_vehicle_man.webp b/images/icons/icon_vehicle_man.webp new file mode 100644 index 0000000..0326809 Binary files /dev/null and b/images/icons/icon_vehicle_man.webp differ diff --git a/images/icons/icon_vehicle_mr.webp b/images/icons/icon_vehicle_mr.webp new file mode 100644 index 0000000..813eff3 Binary files /dev/null and b/images/icons/icon_vehicle_mr.webp differ diff --git a/images/icons/icon_vehicle_pc.webp b/images/icons/icon_vehicle_pc.webp new file mode 100644 index 0000000..c3d4627 Binary files /dev/null and b/images/icons/icon_vehicle_pc.webp differ diff --git a/modules/pegasus-actor.js b/modules/pegasus-actor.js index 4e9b845..2f1733c 100644 --- a/modules/pegasus-actor.js +++ b/modules/pegasus-actor.js @@ -106,6 +106,42 @@ export class PegasusActor extends Actor { let comp = this.items.filter(item => item.type == 'effect'); return comp; } + /* -------------------------------------------- */ + getCombatModules() { + let comp = this.items.filter(item => item.type == 'combatmodule'); + return comp; + } + /* -------------------------------------------- */ + getVehicleHull() { + let comp = this.items.filter(item => item.type == 'vehiclehull'); + return comp; + } + /* -------------------------------------------- */ + getPowercoreModules() { + let comp = this.items.filter(item => item.type == 'powercoremodule'); + return comp; + } + /* -------------------------------------------- */ + getMobilityModules() { + let comp = this.items.filter(item => item.type == 'mobilitymodule'); + return comp; + } + /* -------------------------------------------- */ + getPropulsionModules() { + let comp = this.items.filter(item => item.type == 'propulsionmodule'); + return comp; + } + /* -------------------------------------------- */ + getVehicleModules() { + let comp = this.items.filter(item => item.type == 'vehiclemodule'); + return comp; + } + /* -------------------------------------------- */ + getVehicleWeaponModules() { + let comp = this.items.filter(item => item.type == 'vehicleweaponmodule'); + return comp; + } + /* -------------------------------------------- */ getPowers() { let comp = this.items.filter(item => item.type == 'power'); diff --git a/modules/pegasus-vehicle-sheet.js b/modules/pegasus-vehicle-sheet.js index 99d39be..dfce82f 100644 --- a/modules/pegasus-vehicle-sheet.js +++ b/modules/pegasus-vehicle-sheet.js @@ -43,6 +43,13 @@ export class PegasusVehicleSheet extends ActorSheet { optionsLevel: PegasusUtility.getOptionsLevel(), subActors: duplicate(this.actor.getSubActors()), effects: duplicate(this.actor.getEffects()), + combatModules: duplicate(this.actor.getCombatModules()), + powerCoreModules: duplicate(this.actor.getPowercoreModules()), + vehicleHull: duplicate(this.actor.getVehicleHull()), + mobilityModules: duplicate(this.actor.getMobilityModules()), + propulsionModules: duplicate(this.actor.getPropulsionModules()), + vehicleModules: duplicate(this.actor.getVehicleModules()), + vehicleWeaponModules: duplicate(this.actor.getVehicleWeaponModules()), options: this.options, owner: this.document.isOwner, editScore: this.options.editScore, diff --git a/styles/simple.css b/styles/simple.css index ebb8569..5fd077a 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1235,8 +1235,7 @@ ul, li { /*************************************************************/ #pause -{ - font-size: 2rem; +{ font-size: 2rem; } #pause > h3 { @@ -1285,6 +1284,8 @@ Focus FOC: #ff0084 background-color: black; background: black; } +.color-class-fc, +.color-class-man, .color-class-agi, .color-class-ranged-attack { background-color: #02a41d; @@ -1303,10 +1304,12 @@ Focus FOC: #ff0084 .color-class-meleedmg { background-color: #5f3d00; } +.color-class-hr, .color-class-phy, .color-class-dmgres { background-color: #990304; } +.color-class-ad, .color-class-mr { background-color: #050505; } @@ -1325,6 +1328,7 @@ Focus FOC: #ff0084 .color-class-ranged-damage { background-color: #f9c801; } +.color-class-pc, .color-class-foc { background-color: #ff0084; } @@ -1377,8 +1381,8 @@ Focus FOC: #ff0084 min-height: 36px; } .item-stat-roll-vehicle { - max-height: 96px; - min-height: 90px; + max-height: 102px; + min-height: 102px; } .item-stat-roll select, .item-stat-roll input { margin-top: 4px; diff --git a/system.json b/system.json index 135769b..919d2c4 100644 --- a/system.json +++ b/system.json @@ -1,6 +1,6 @@ { "description": "Pegasus RPG system for FoundryVTT", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.4.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.5.zip", "esmodules": [ "modules/pegasus-main.js" ], @@ -10,7 +10,8 @@ { "lang": "en", "name": "English", - "path": "lang/en.json" + "path": "lang/en.json", + "flags": {} } ], "authors": [ @@ -19,11 +20,8 @@ "flags": {} } ], - "library": false, "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/raw/branch/master/system.json", - "manifestPlusVersion": "1.0.0", - "media": [], "compatibility": { "minimum": "10", "verified": "10.284", @@ -35,241 +33,217 @@ "type": "Item", "label": "Specialisations", "name": "specialisations", - "path": "./packs/specialisations.db", + "path": "packs/specialisations.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "specialisation" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Racial Abilities", "name": "racial-abilities", - "path": "./packs/racial-abilities.db", + "path": "packs/racial-abilities.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "ability" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Perks", "name": "perk", - "path": "./packs/perk.db", + "path": "packs/perk.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "perk" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Powers", "name": "powers", - "path": "./packs/powers.db", + "path": "packs/powers.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "power" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Race", "name": "race", - "path": "./packs/race.db", + "path": "packs/race.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "race" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Role", "name": "role", - "path": "./packs/role.db", + "path": "packs/role.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "role" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Effects", "name": "effects", - "path": "./packs/effects.db", + "path": "packs/effects.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "effect" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Armour", "name": "armour", - "path": "./packs/armour.db", + "path": "packs/armour.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "armour" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Equipment", "name": "equipment", - "path": "./packs/equipment.db", + "path": "packs/equipment.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "equipment" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Shields", "name": "shields", - "path": "./packs/shields.db", + "path": "packs/shields.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "shield" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Melee Weapons", "name": "melee-weapons", - "path": "./packs/melee-weapons.db", + "path": "packs/melee-weapons.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "weapon", "melee" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Ranged Weapons", "name": "ranged-weapons", - "path": "./packs/ranged-weapons.db", + "path": "packs/ranged-weapons.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "weapon", "ranged" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Currency", "name": "currency", - "path": "./packs/currency.db", + "path": "packs/currency.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "currency", "money" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Macros", "name": "macro-commands", - "path": "./packs/macro-commands.db", + "path": "packs/macro-commands.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "macro", "command" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vehicle - Weapon modules", "name": "vm-vehicle-weapons-modules", - "path": "./packs/vm-vehicle-weapons-modules.db", + "path": "packs/vm-vehicle-weapons-modules.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "weapon", "vehicle" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vehicle - Propulsion modules", "name": "vm-vehicle-propulsion-modules", - "path": "./packs/vm-vehicle-propulsion-modules.db", + "path": "packs/vm-vehicle-propulsion-modules.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "propulsion", "vehicle" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vehicle - Power core modules", "name": "vm-vehicle-power-core-module", - "path": "./packs/vm-vehicle-power-core-module.db", + "path": "packs/vm-vehicle-power-core-module.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "propulsion", "vehicle" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vehicle - Modules", "name": "vm-vehicle-modules", - "path": "./packs/vm-vehicle-modules.db", + "path": "packs/vm-vehicle-modules.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "module", "vehicle" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vehicle - Mobility module", "name": "vm-vehicle-mobility-module", - "path": "./packs/vm-vehicle-mobility-module.db", + "path": "packs/vm-vehicle-mobility-module.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "mobility", "vehicle" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vehicle - Hull module", "name": "vm-vehicle-hulls", - "path": "./packs/vm-vehicle-hulls.db", + "path": "packs/vm-vehicle-hulls.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "hull", "vehicle" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vehicle - Combat module", "name": "vm-vehicle-combat-module", - "path": "./packs/vm-vehicle-combat-module.db", + "path": "packs/vm-vehicle-combat-module.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "combat", "vehicle" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Vices", "name": "vices", - "path": "./packs/vices.db", + "path": "packs/vices.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "vice" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "Virtues", "name": "virtues", - "path": "./packs/virtues.db", + "path": "packs/virtues.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "virtue" - ] + "private": false, + "flags": {} }, { "type": "Item", "label": "ZZ-Admin-FX", "name": "zz-adminfx-zz", - "path": "./packs/zz-adminfx-zz.db", + "path": "packs/zz-adminfx-zz.db", "system": "fvtt-pegasus-rpg", - "tags": [ - "fx" - ] + "private": false, + "flags": {} } ], "primaryTokenAttribute": "secondary.health", @@ -278,9 +252,8 @@ "styles": [ "styles/simple.css" ], - "templateVersion": 112, "title": "Pegasus RPG", "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg", - "version": "10.0.4", - "background" : "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp" -} + "version": "10.0.5", + "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp" +} \ No newline at end of file diff --git a/template.json b/template.json index 574b13f..d04529f 100644 --- a/template.json +++ b/template.json @@ -214,6 +214,7 @@ "dicevalue": "", "level": 0, "currentlevel": 0, + "turningarc45": 0, "col": 1 }, "hr": { diff --git a/templates/partial-vehicle-stat-block.html b/templates/partial-vehicle-stat-block.html index 7c57f2b..8ddb632 100644 --- a/templates/partial-vehicle-stat-block.html +++ b/templates/partial-vehicle-stat-block.html @@ -2,11 +2,11 @@
- +

{{stat.abbrev}}

+ data-stat-key="{{key}}">{{upper stat.abbrev}}
-
+
Current level
+ {{#if (eq key "man")}} +
+ 45° Turning Arcs + +
+ {{/if}} + + {{#if (eq key "size")}} +
+ Size + +
+ {{/if}} + + {{#if (eq key "pc")}} +
+ Av NRG + + Cur NRG + +
+ {{/if}} + + {{#if (eq key "ad")}} +
+ Acc Mode + + Curr. speed + +
+ {{/if}} +
\ No newline at end of file diff --git a/templates/vehicle-sheet.html b/templates/vehicle-sheet.html index 05f1917..992a9e6 100644 --- a/templates/vehicle-sheet.html +++ b/templates/vehicle-sheet.html @@ -253,35 +253,260 @@ + + + + + + + + + + + + -
-