diff --git a/modules/pegasus-item-sheet.js b/modules/pegasus-item-sheet.js index 3ae817c..87a76e9 100644 --- a/modules/pegasus-item-sheet.js +++ b/modules/pegasus-item-sheet.js @@ -451,7 +451,8 @@ export class PegasusItemSheet extends ItemSheet { } if (this.object.type == 'weapon' || this.object.type == 'armor' || this.object.type == 'shield' - || this.object.type == 'equipment') { + || this.object.type == 'equipment' || this.object.type == 'vehiclemodule' + || this.object.type == 'vehicleweaponmodule') { let data = event.dataTransfer.getData('text/plain'); if (data) { let dataItem = JSON.parse(data); diff --git a/modules/pegasus-main.js b/modules/pegasus-main.js index 39b9c92..f298eee 100644 --- a/modules/pegasus-main.js +++ b/modules/pegasus-main.js @@ -63,7 +63,7 @@ Hooks.once("init", async function () { // Register sheet application classes Actors.unregisterSheet("core", ActorSheet); Actors.registerSheet("fvtt-pegasus", PegasusActorSheet, { types: ["character"], makeDefault: true }); - Actors.registerSheet("fvtt-pegasus", PegasusNPCSheet, { types: ["npc"], makeDefault: false }); + //Actors.registerSheet("fvtt-pegasus", PegasusVehicleSheet, { types: ["vehicle"], makeDefault: false }); Items.unregisterSheet("core", ItemSheet); Items.registerSheet("fvtt-pegasus", PegasusItemSheet, { makeDefault: true }); diff --git a/system.json b/system.json index 410df00..e401dc1 100644 --- a/system.json +++ b/system.json @@ -180,9 +180,9 @@ "styles": [ "styles/simple.css" ], - "templateVersion": 96, + "templateVersion": 99, "title": "Pegasus RPG", "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg", - "version": "0.6.7", + "version": "0.6.8", "background" : "./images/ui/pegasus_welcome_page.webp" } diff --git a/template.json b/template.json index 722aebd..86ecf23 100644 --- a/template.json +++ b/template.json @@ -1,6 +1,9 @@ { "Actor": { - "types": ["character", "npc"], + "types": [ + "character", + "vehicle" + ], "templates": { "biodata": { "biodata": { @@ -31,6 +34,7 @@ "racename": "", "rolename": "", "morality": 5, + "bonusselection": "", "moralitythreshold": 0 } }, @@ -39,7 +43,7 @@ "abilities": [], "subactors": [], "statistics": { - "agi":{ + "agi": { "label": "Agility", "abbrev": "AGI", "level": 1, @@ -47,7 +51,7 @@ "mod": 0, "col": 1 }, - "mnd":{ + "mnd": { "label": "Mind", "abbrev": "MND", "level": 1, @@ -55,7 +59,7 @@ "col": 1, "mod": 0 }, - "soc":{ + "soc": { "label": "Social", "abbrev": "SOC", "level": 1, @@ -63,7 +67,7 @@ "col": 1, "mod": 0 }, - "str":{ + "str": { "label": "Strength", "abbrev": "STR", "level": 1, @@ -71,7 +75,7 @@ "col": 1, "mod": 0 }, - "phy":{ + "phy": { "label": "Physique", "abbrev": "PHY", "level": 1, @@ -79,7 +83,7 @@ "col": 1, "mod": 0 }, - "com":{ + "com": { "label": "Combat", "abbrev": "COM", "level": 1, @@ -87,7 +91,7 @@ "col": 2, "mod": 0 }, - "def":{ + "def": { "label": "Defence", "abbrev": "DEF", "level": 1, @@ -95,7 +99,7 @@ "col": 2, "mod": 0 }, - "stl":{ + "stl": { "label": "Stealth", "abbrev": "STL", "level": 1, @@ -103,7 +107,7 @@ "col": 2, "mod": 0 }, - "per":{ + "per": { "label": "Perception", "abbrev": "PER", "level": 1, @@ -111,7 +115,7 @@ "col": 2, "mod": 0 }, - "foc":{ + "foc": { "label": "Focus", "abbrev": "FOC", "level": 1, @@ -120,7 +124,7 @@ "mod": 0 } }, - "nrg": { + "nrg": { "label": "NRG", "type": "value", "absolutemax": 0, @@ -129,6 +133,11 @@ "mod": 0, "activated": 0 }, + "ppp": { + "label": "Power Purchase Points (PPP)", + "availablePPP": 0, + "spentPPP": 0 + }, "mr": { "label": "MR (Initiative)", "type": "dice", @@ -167,7 +176,7 @@ "ismax": true, "bonus": 0, "max": 0 - }, + }, "socialhealth": { "label": "SOC Health", "type": "value", @@ -188,17 +197,152 @@ "npccore": { "npctype": "", "description": "" + }, + "vehicle": { + "statistics": { + "fc": { + "label": "FC", + "abbrev": "fc", + "level": 0, + "currentlevel": 0 + }, + "man": { + "label": "FC", + "abbrev": "fc", + "dicevalue": "", + "level": 0, + "currentlevel": 0 + }, + "hr": { + "label": "HR", + "abbrev": "hr", + "level": 0, + "currentlevel": 0, + "size": 0 + }, + "pc": { + "label": "PC", + "abbrev": "pc", + "level": 0, + "currentlevel": 0, + "avgnrg": 0, + "curnrg": 0 + }, + "mr": { + "label": "MR", + "abbrev": "mr", + "level": 0, + "currentlevel": 0 + }, + "ad": { + "label": "A/D", + "abbrev": "ad", + "level": 0, + "currentlevel": 0, + "accmode": "", + "currentspeed": "" + } + }, + "stun": { + "value": 0 + }, + "secondary": { + "traveldirection": "", + "moverange": "", + "is3Dcombat": false, + "elevation": 0, + "angle": "" + }, + "modules": { + "activatedmoduleenergy": 0, + "vdp": 0, + "vehiculevalue": 0, + "availablevms": 0, + "vmsused": 0, + "totalcost": 0 + }, + "cargo": { + "cargocapacity": 0, + "totalcargocapacity": 0, + "cargoinformation": "" + }, + "details": { + "crewcapacity": 0, + "totalcrew": 0, + "passengercapacity": 0, + "totalpassengers": 0, + "information": "" + }, + "arcs": { + "frontarc": { + "topspeed": "", + "shieldlevel": 0, + "armourlevel": 0 + }, + "reararc": { + "topspeed": "", + "shieldlevel": 0, + "armourlevel": 0 + }, + "rightarc": { + "topspeed": "", + "shieldlevel": 0, + "armourlevel": 0 + }, + "leftarc": { + "topspeed": "", + "shieldlevel": 0, + "armourlevel": 0 + }, + "toparc": { + "topspeed": "", + "shieldlevel": 0, + "armourlevel": 0 + }, + "bottomarc": { + "topspeed": "", + "shieldlevel": 0, + "armourlevel": 0 + } + } } }, "character": { - "templates": [ "biodata", "core" ] + "templates": [ + "biodata", + "core" + ] }, - "npc": { - "templates": [ "npccore" ] - } + "vehicle": { + "templates": [ + "vehicle" + ] + } }, "Item": { - "types": [ "race", "role", "ability", "specialisation", "perk", "power" , "armor", "shield", "equipment", "weapon", "effect", "money", "virtue", "vice"], + "types": [ + "race", + "role", + "ability", + "specialisation", + "perk", + "power", + "armor", + "shield", + "equipment", + "weapon", + "effect", + "money", + "virtue", + "vice", + "vehiclehull", + "powercoremodule", + "mobilitymodule", + "combatmodule", + "vehiclemodule", + "vehicleweaponmodule", + "propulsionmodule" + ], "effect": { "type": "", "genre": "", @@ -209,7 +353,7 @@ "statdice": false, "bonusdice": false, "weapondamage": false, - "hindrance" : false, + "hindrance": false, "resistedby": "", "recoveryroll": false, "recoveryrollstat": "", @@ -251,7 +395,7 @@ "ability": { "affectedstat": "str", "statmodifier": 1, - "statlevelincrease": 0, + "statlevelincrease": 0, "statusaffected": "", "statusmodifier": 0, "powersgained": [], @@ -345,10 +489,10 @@ }, "status": "", "nbuse": "", - "used1":false, - "used2":false, - "used3":false - }, + "used1": false, + "used2": false, + "used3": false + }, "power": { "rollneeded": false, "statistic": "", @@ -365,7 +509,7 @@ "dmgroll": false, "dmgstatistic": "", "description": "" - }, + }, "armor": { "statistic": "", "resistance": "", @@ -376,7 +520,7 @@ "locationprotected": "", "effects": [], "activated": false, - "description":"" + "description": "" }, "shield": { "deftype": "", @@ -387,7 +531,7 @@ "equipped": false, "effects": [], "activated": false, - "description":"" + "description": "" }, "equipment": { "type": "", @@ -407,13 +551,13 @@ "containercapacity": 0, "containerid": "", "threatlevel": 0, - "description":"" + "description": "" }, - "money" : { + "money": { "value": 0, "quantity": 0, "weight": 0, - "idr":"", + "idr": "", "description": "" }, "weapon": { @@ -430,6 +574,7 @@ "enhancedstat": "", "enhancedlevel": 0, "damagetype": "", + "itemsize": 0, "damagetypelevel": 0, "vehicledamagetype": "", "vehicledamagetypelevel": 0, @@ -439,6 +584,64 @@ "effects": [], "activated": false, "description": "" + }, + "vehiclehull": { + "size": 0, + "hulltype": "", + "hr": 0, + "man": 0, + "vms": 0 + }, + "powercoremodule": { + "coretype": "", + "pc": 0, + "nrg": 0 + }, + "mobilitymodule": { + "vehiclecategory": "", + "quality": "", + "mr": "", + "ts_f": "", + "ts_s": "", + "ts_r": "", + "man": "" + }, + "propulsionmodule": { + "quality": "", + "ad": "" + }, + "combatmodule": { + "combattype": "", + "fc": "" + }, + "vehiclemodule": { + "category": "", + "location": "", + "activated": false, + "nrg": 0, + "nrgbonus": 0, + "effects": [], + "arccoverage": "", + "armourdicevalue": "", + "shielddicevalue": "", + "securitydicevalue": "", + "range": "", + "idr": "" + }, + "vehicleweaponmodule": { + "location": "", + "weaponsize": 0, + "space": 0, + "activated": false, + "nrg": 0, + "effects": [], + "damagedicevalue": "", + "damagetype": "", + "aoe": "", + "range": "", + "turret": "", + "linkedweapon": "", + "idr": "" } } -} +} \ No newline at end of file diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 3b1f152..c94f6cd 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -393,6 +393,18 @@ data-dtype="Number" /> / {{data.nrg.absolutemax}} +