Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip

# Create a zip file with all files required by the system to add to the release
- run: zip -r ./system.zip system.json template.json readme.md LICENSE.txt module/ assets/ build/ fonts/ lang/ templates/ packs/ readme/ styles/
- run: zip -r ./system.zip system.json template.json readme.md LICENSE.txt module/ assets/ build/ fonts/ lang/ templates/ packs/ readme/ css/

# Update Release with Files
- name: Update Release with Files
Expand Down
302 changes: 154 additions & 148 deletions lang/en.json

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions lang/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"Toggle": "Alternar efeito"
},
"Item": {
"SpecialActivity": {"long": "Atividade Especial", "abbr": "AE" },
"specialActivity": {"long": "Atividade Especial", "abbr": "AE" },
"Spell": {
"AddLVL": "Add LVL {level}",
"SpellLVL": "Level {level} Spells"
Expand All @@ -49,7 +49,7 @@
"Effect": "Efeito",
"Item": "Coisa Nova",
"Mutation": "Mutação nova",
"Special_activity": "Nova Atividade Especial",
"SpecialActivity": "Nova Atividade Especial",
"Talent": "Talento Novo",
"Trait": "Traço Novo",
"VehiclePart": "Parte de Veículo",
Expand Down Expand Up @@ -100,6 +100,7 @@
"SheetLabels": {
"Abilities": "Habilidades",
"Actor": "Punkapocalyptic Actor Sheet",
"Acessories": "Acessórios",
"Attributes": "Atributos",
"Background": "Histórico",
"Benefits": "Benefícios",
Expand Down Expand Up @@ -127,7 +128,8 @@
"RollRange": "Rolar Alcance",
"SpecialActivities": "Atividades Especiais",
"Traits": "Traços",
"Type": "Tipo"
"Type": "Tipo",
"Upgrades": "Aprimoramentos"
},
"Statuses": {
"Blinded": { "long": "Cego", "abbr": "" },
Expand Down Expand Up @@ -192,16 +194,19 @@
"vehicle": "Veículo"
},
"Item": {
"SpecialActivity": "Atividade Especial",
"armor": "Veste",
"background": "Histórico",
"benefit": "Benefício",
"effect": "Efeito",
"item": "Coisa",
"mutation": "Mutação",
"path": "Caminho",
"specialActivity": "Atividade Especial",
"talent": "Talento",
"trait": "Traço",
"vehiclePart": "Parte (Veículo)",
"vehicleAccessory": "Acessório (Veículo)",
"vehicleUpgrade": "Aprimoramento (Veículo)",
"weapon": "Arma"
}
}
Expand Down
10 changes: 7 additions & 3 deletions module/helpers/config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -141,27 +141,31 @@ PUNKAPOCALYPTIC.items = {
trait: "TYPES.Item.trait",
weapon: "TYPES.Item.weapon",
item: "TYPES.Item.item",
special_activity: "TYPES.Item.special_activity",
specialActivity: "TYPES.Item.specialActivity",
background: "TYPES.Item.background",
//talent: "TYPES.Item.talent",
benefit: "TYPES.Item.benefit",
path: "TYPES.Item.path",
mutation: "TYPES.Item.mutation",
vehiclePart: "TYPES.Item.vehiclePart"
vehiclePart: "TYPES.Item.vehiclePart",
vehicleUpgrade: "TYPES.Item.vehicleUpgrade",
vehicleAccessory: "TYPES.Item.vehicleAccessory"
}

PUNKAPOCALYPTIC.itemImages = {
armor: "icons/equipment/shield/buckler-wooden-boss-lightning.webp",
trait: "icons/skills/trades/academics-investigation-puzzles.webp",
weapon: "icons/weapons/clubs/club-spiked-glowing.webp",
item: "icons/tools/fasteners/washer-square-steel-grey.webp",
special_activity: "icons/magic/control/silhouette-aura-energy.webp",
specialActivity: "icons/magic/control/silhouette-aura-energy.webp",
background: "icons/sundries/documents/document-sealed-signatures-red.webp",
//talent: "icons/magic/perception/eye-slit-orange.webp",
benefit: "icons/magic/perception/eye-slit-orange.webp",
path: "icons/skills/social/intimidation-impressing.webp",
mutation: "icons/magic/symbols/triangle-glowing-green.webp",
vehiclePart: "icons/tools/smithing/plate-steel-grey.webp",
vehicleUpgrade: "icons/commodities/metal/pin-cottar-steel.webp",
vehicleAccessory: "icons/commodities/metal/clasp-steel.webp",
default: "icons/svg/item-bag.svg"
}

Expand Down
2 changes: 2 additions & 0 deletions module/helpers/templates.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export const preloadHandlebarsTemplates = async function () {
// Vehicles partials
'systems/punkapocalyptic/templates/actor/parts/vehicle-occupants-item.hbs',
'systems/punkapocalyptic/templates/actor/parts/vehicle-parts-item.hbs',
'systems/punkapocalyptic/templates/actor/parts/vehicle-vehicleAccessories.hbs',
'systems/punkapocalyptic/templates/actor/parts/vehicle-vehicleUpgrades.hbs',
// Item partials
'systems/punkapocalyptic/templates/item/parts/item-effects.hbs',
'systems/punkapocalyptic/templates/item/parts/item-talents.hbs',
Expand Down
2 changes: 1 addition & 1 deletion module/punkapocalyptic.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Hooks.once('init', async function () {
//spell: models.PunkapocalypticSpell,
weapon: models.PunkapocalypticItemWeapon,
trait: models.PunkapocalypticTrait,
special_activity: models.PunkapocalypticSpecialActivity,
specialActivity: models.PunkapocalypticSpecialActivity,
background: models.PunkapocalypticBackgroundItem,
talent: models.PunkapocalypticItemTalent,
benefit: models.PunkapocalypticItemBenefit,
Expand Down
2 changes: 1 addition & 1 deletion module/sheets/actor-sheet.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export class PunkapocalypticActorSheet extends ActorSheet {
features.push(i);
} else if (CONFIG.PUNKAPOCALYPTIC.inventoryTypes.includes(i.type)) {
inventory.push(i);
} else if (i.type === 'special_activity') {
} else if (i.type === 'specialActivity') {
activities.push(i);
} else if (CONFIG.PUNKAPOCALYPTIC.benefitSubTypes.includes(i.type)) {
benefits.push(i);
Expand Down
2 changes: 1 addition & 1 deletion module/sheets/npc-sheet.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export class PunkapocalypticNPCSheet extends ActorSheet {
features.push(i);
} else if (CONFIG.PUNKAPOCALYPTIC.inventoryTypes.includes(i.type)) {
inventory.push(i);
} else if (i.type === 'special_activity') {
} else if (i.type === 'specialActivity') {
activities.push(i);
} else if (CONFIG.PUNKAPOCALYPTIC.benefitSubTypes.includes(i.type)) {
benefits.push(i);
Expand Down
9 changes: 8 additions & 1 deletion module/sheets/vehicle-sheet.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ export class PunkapocalypticVehicleSheet extends ActorSheet {
// Initialize containers.
const occupants = [];
const parts = [];
const vehicleUpgrades = [];
const vehicleAccessories = [];

for (let i of this.actor.system.occupants) {
const actor = await fromUuid(i.uuid);
Expand All @@ -292,6 +294,10 @@ export class PunkapocalypticVehicleSheet extends ActorSheet {
// Append to gear.
if (i.type === "vehiclePart") {
parts.push(i);
} else if (i.type === "vehicleUpgrade") {
vehicleUpgrades.push(i);
} else if (i.type === "vehicleAccessory") {
vehicleAccessories.push(i);
}
}

Expand All @@ -302,7 +308,8 @@ export class PunkapocalypticVehicleSheet extends ActorSheet {


context.parts = parts;

context.vehicleUpgrades = vehicleUpgrades;
context.vehicleAccessories = vehicleAccessories;
const effects = Array.from(context.effects);
context.showeffects = effects.filter(i => !i.disabled);
context.occupants = occupants;
Expand Down
2 changes: 1 addition & 1 deletion template.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"types": ["character", "npc", "vehicle"]
},
"Item": {
"types": ["armor", "benefit", "item", "weapon", "trait", "mutation", "background","special_activity", "path", "talent", "vehicleUpgrade", "vehicleAccessory", "vehiclePart"]
"types": ["armor", "benefit", "item", "weapon", "trait", "mutation", "background","specialActivity", "path", "talent", "vehicleUpgrade", "vehicleAccessory", "vehiclePart"]
}
}
16 changes: 8 additions & 8 deletions templates/actor/actor-vehicle-sheet.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -333,16 +333,16 @@
<section class="sheet-body">
<nav class="sheet-tabs tabs nav-punk" data-group="primary">
{{!-- Default tab is specified in actor-sheet.mjs --}}
<a class="item header-tab" data-tab="features">Principal</a>
<a class="item header-tab" data-tab="accessories">Acessórios</a>
<a class="item header-tab" data-tab="upgrades">Aprimoramentos</a>
<a class="item header-tab" data-tab="description">Descrição</a>
<a class="item header-tab" data-tab="features">{{localize "PUNKAPOCALYPTIC.SheetLabels.Main"}}</a>
<a class="item header-tab" data-tab="accessories">{{localize "PUNKAPOCALYPTIC.SheetLabels.Acessories"}}</a>
<a class="item header-tab" data-tab="upgrades">{{localize "PUNKAPOCALYPTIC.SheetLabels.Upgrades"}}</a>
<a class="item header-tab" data-tab="description">{{localize "PUNKAPOCALYPTIC.SheetLabels.Description"}}</a>
<!--a class="item header-tab" data-tab="effects">Effects</a-->
</nav>
<div class="tab features" data-group="primary" data-tab="features">
<div class="grid grid-2col">
<div class="grid-span-1">
<h2>{{localize "PUNKAPOCALYPTIC.Vehicle.Occupants" }}</h2>
<h2>{{localize "PUNKAPOCALYPTIC.Vehicle.Occupants.long" }}</h2>
{{> "systems/punkapocalyptic/templates/actor/parts/vehicle-occupants-item.hbs" }}
</div>
<div class="grid-span-1">
Expand All @@ -354,11 +354,11 @@
</div>

<div class="tab accessories" data-group="primary" data-tab="accessories">
{{> "systems/punkapocalyptic/templates/actor/parts/actor-category-item.hbs" category="accessories" items="" }}
{{> "systems/punkapocalyptic/templates/actor/parts/vehicle-vehicleAccessories.hbs" category="accessories" items="" }}
</div>

<div class="tab uprades" data-group="primary" data-tab="uprades">
{{> "systems/punkapocalyptic/templates/actor/parts/actor-category-item.hbs" category="upgrades" items="" }}
<div class="tab upgrades" data-group="primary" data-tab="upgrades">
{{> "systems/punkapocalyptic/templates/actor/parts/vehicle-vehicleUpgrades.hbs" category="upgrades" items="" }}
</div>


Expand Down
8 changes: 4 additions & 4 deletions templates/actor/parts/actor-special-activities.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<div class='item-controls'>
<a
class='item-control item-create'
title='{{localize "PUNKAPOCALYPTIC.CreateNewItemFem" type=(localize 'TYPES.Item.special_activity') }}'
data-type='special_activity'
title='{{localize "PUNKAPOCALYPTIC.CreateNewItemFem" type=(localize 'TYPES.Item.specialActivity') }}'
data-type='specialActivity'
>
<i class='fas fa-plus'></i>
{{localize 'PUNKAPOCALYPTIC.NewItemFem' type=(localize 'PUNKAPOCALYPTIC.Item.SpecialActivity.abbr') }}
{{localize 'PUNKAPOCALYPTIC.NewItemFem' type=(localize 'PUNKAPOCALYPTIC.Item.specialActivity.abbr') }}
</a>
</div>
</li>
{{#each activities as |item id|}}
<li class='item flexrow' data-item-id='{{item._id}}'>
<div class='item-name'>
<div class='item-image'>
<a class='rollable' data-roll-type='special_activity'>
<a class='rollable' data-roll-type='specialActivity'>
<img
src='{{item.img}}'
title='{{item.name}}'
Expand Down
41 changes: 41 additions & 0 deletions templates/actor/parts/vehicle-vehicleAccessories.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<ol class='items-list'>
<li class='item flexrow items-header'>
<div class='item-name'>{{localize 'Name'}}</div>
<div class='item-dano'>{{localize 'Vida'}}</div>
<div class='item-controls'>
<a class='item-control item-create' title='{{localize "PUNKAPOCALYPTIC.CreateNewItemFem" type=(localize 'TYPES.Item.vehiclePart')}}' data-type='vehiclePart'>
<i class='fas fa-plus'></i>
{{localize 'PUNKAPOCALYPTIC.NewItemFem' type=(localize 'TYPES.Item.vehiclePart') }}
</a>
</div>
</li>
{{#each vehicleAccessories as |item id|}}
<li class='item flexrow' data-item-id='{{item._id}}'>
<div class='item-name'>
<div class='item-image'>
<a class='rollable' data-roll-type='item'>
<img src='{{item.img}}' title='{{item.name}}' width='24' height='24' />
</a>
</div>

<h4 style="text-shadow: .1em .1em 0 hsl(250, 2.69%, 74.17%);">{{item.name}}</h4>

</div>



<div class='item-dano item-prop' data-roll-type='damage' style="text-shadow: .1em .1em 0 hsl(250, 2.69%, 74.17%); font-weight: bold;"> {{item.system.health.value}} / {{item.system.health.max}}</div>
<div class='item-controls'>
<a class='item-control item-damage' title='{{localize "PUNKAPOCALYPTIC.Vehicle.Damage" }}'>
<i class="fas fa-burst"></i>
</a>
<a class='item-control item-edit' title='{{localize "DOCUMENT.Update" type=' Item'}}'>
<i class='fas fa-edit'></i>
</a>
<a class='item-control item-delete' title='{{localize "DOCUMENT.Delete" type=' Item'}}'>
<i class='fas fa-trash'></i>
</a>
</div>
</li>
{{/each}}
</ol>
39 changes: 39 additions & 0 deletions templates/actor/parts/vehicle-vehicleUpgrades.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<ol class='items-list'>
<li class='item flexrow items-header'>
<div class='item-name'>{{localize 'Name'}}</div>
<div class='item-dano'>{{localize 'Vida'}}</div>
<div class='item-controls'>
<a class='item-control item-create' title='{{localize "PUNKAPOCALYPTIC.CreateNewItemFem" type=(localize 'TYPES.Item.vehiclePart')}}' data-type='vehiclePart'>
<i class='fas fa-plus'></i>
{{localize 'PUNKAPOCALYPTIC.NewItemFem' type=(localize 'TYPES.Item.vehiclePart') }}
</a>
</div>
</li>
{{#each vehicleUpgrades as |item id|}}
<li class='item flexrow' data-item-id='{{item._id}}'>
<div class='item-name'>
<div class='item-image'>
<a class='rollable' data-roll-type='item'>
<img src='{{item.img}}' title='{{item.name}}' width='24' height='24' />
</a>
</div>
<h4 style="text-shadow: .1em .1em 0 hsl(250, 2.69%, 74.17%);">{{item.name}}</h4>
</div>



<div class='item-dano item-prop' data-roll-type='damage' style="text-shadow: .1em .1em 0 hsl(250, 2.69%, 74.17%); font-weight: bold;"> {{item.system.health.value}} / {{item.system.health.max}}</div>
<div class='item-controls'>
<a class='item-control item-damage' title='{{localize "PUNKAPOCALYPTIC.Vehicle.Damage" }}'>
<i class="fas fa-burst"></i>
</a>
<a class='item-control item-edit' title='{{localize "DOCUMENT.Update" type=' Item'}}'>
<i class='fas fa-edit'></i>
</a>
<a class='item-control item-delete' title='{{localize "DOCUMENT.Delete" type=' Item'}}'>
<i class='fas fa-trash'></i>
</a>
</div>
</li>
{{/each}}
</ol>
2 changes: 1 addition & 1 deletion templates/item/item-benefit-sheet.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{! Sheet Tab Navigation }}
<nav class='sheet-tabs tabs nav-punk' data-group='primary'>
<!--a class='item' data-tab='description'>Description</a-->
<a class='item' data-tab='attributes'>Descrição</a>
<a class='item' data-tab='attributes'>{{localize "PUNKAPOCALYPTIC.SheetLabels.Description"}}</a>
</nav>

{{! Sheet Body }}
Expand Down
2 changes: 1 addition & 1 deletion templates/item/item-item-sheet.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{{! Sheet Tab Navigation }}
<nav class='sheet-tabs tabs nav-punk' data-group='primary'>
<!--a class='item' data-tab='description'>Description</a-->
<a class='item' data-tab='attributes'>Descrição</a>
<a class='item' data-tab='attributes'>{{localize "PUNKAPOCALYPTIC.SheetLabels.Description"}}</a>
</nav>

{{! Sheet Body }}
Expand Down
48 changes: 48 additions & 0 deletions templates/item/item-vehicleAccessory-sheet.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<form class='{{cssClass}}' autocomplete='off'>
<header class='sheet-header'>
<img class='profile-img' src='{{item.img}}' data-edit='img' title='{{item.name}}' />
<div class='header-fields'>
<h1 class='charname'>
<input class="title-punk" name='name' type='text' value='{{item.name}}' placeholder='Name' />
</h1>
<div class='grid grid-2col'>
<div class='resource flexcol flex-group-center'>
<label class='resource-label'>{{localize "PUNKAPOCALYPTIC.SheetLabels.Quantity" }}</label>
<input type='text' name='system.quantity' value='{{system.quantity}}' data-dtype='Number' />
</div>
<div class='resource flexcol flex-group-center'>
<label class='resource-label'>{{localize "PUNKAPOCALYPTIC.SheetLabels.Price" }}</label>
<input type='text' name='system.price' value='{{system.price}}' data-dtype='Number' />
</div>

</div>
</div>
</header>

{{! Sheet Tab Navigation }}
<nav class='sheet-tabs tabs nav-punk' data-group='primary'>
<!--a class='item' data-tab='description'>Description</a-->
<a class='item' data-tab='attributes'>{{localize "PUNKAPOCALYPTIC.SheetLabels.Description"}}</a>
</nav>

{{! Sheet Body }}
<section class='sheet-body'>

{{! Description Tab }}
<!--div class='tab' data-group='primary' data-tab='description'>

</div-->

{{! Attributes Tab }}
<div class='tab attributes' data-group='primary' data-tab='attributes'>
{{! Editors must receive enriched text data from getData to properly handle rolls }}
{{editor
enrichedDescription
target='system.description'
engine='prosemirror'
button=true
editable=editable
}}
</div>
</section>
</form>
Loading