Skip to content

Commit

Permalink
Merge pull request #696 from sw5e-foundry/beta
Browse files Browse the repository at this point in the history
Beta 2.1.5.2.4.8
unrealkakeman89 authored Jul 25, 2023
2 parents b6bd58f + f494c2c commit 9c8ed57
Showing 742 changed files with 3,657 additions and 3,147 deletions.
21 changes: 20 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,26 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.1.5.2.4.7]
## [2.1.5.2.4.8] - 2023-07-19

### Fixed

- Icon Backdrops should work correctly on linux.
- Removing a deployed actor should once again work properly.
- Backpacks with no rarity no longer show '&Nbsp;'.
- Website character importer should now have the correct abilities for each skill.
- Website character importer should now work with profiencies like `all martial vibroweapons with the finesse property` (treated as `all martial vibroweapons`).
- Module Art Config button should now work.
- Datamodel issues on starship creation.
- Species characteristics should once again be editable.

### Changes

- Compendium Updates.
- The deployment features compendium has been updated to match the website. (Credits to GreyCouncil#8804).


## [2.1.5.2.4.7] - 2023-06-9

### Fixed

3 changes: 2 additions & 1 deletion module/character-importer.mjs
Original file line number Diff line number Diff line change
@@ -115,6 +115,7 @@ export default class CharacterImporter {
value: sourceCharacter.attribs.find(e => e.name === "technology_type").current
}
};
for (const id of skills) skills[id] = globalThis.sw5e.dataModels.actor.CharacterData._initialSkillValue(id, skills[id]);

const targetCharacter = {
name: sourceCharacter.name,
@@ -344,7 +345,7 @@ export default class CharacterImporter {
case "WEAPON":
case "OTHER":
name = name.toLowerCase().replace(/\s/g, "");
const match = name.match(/(all|simple|martial|exotic)(\w+)s/);
const match = name.match(/(all|simple|martial|exotic)(blaster|vibroweapon|lightweapon)s/);
if (match) {
const weapons = {
blaster: ["smb", "mrb", "exb"],
8 changes: 4 additions & 4 deletions module/data/actor/starship.mjs
Original file line number Diff line number Diff line change
@@ -268,12 +268,12 @@ export default class StarshipData extends CommonTemplate {
traits: new foundry.data.fields.SchemaField(
{
ci: TraitsFields.makeSimpleTrait({ label: "SW5E.ConImm" }),
dr: TraitsFields.makeDamageTrait({ label: "SW5E.HullDamRes", initial: ["ion", "lightning", "necrotic"] }),
dr: TraitsFields.makeDamageTrait({ label: "SW5E.HullDamRes" }, { initial: ["ion", "lightning", "necrotic"] }),
dv: TraitsFields.makeDamageTrait({ label: "SW5E.HullDamVuln" }),
di: TraitsFields.makeDamageTrait({ label: "SW5E.HullDamImm", initial: ["poison", "psychic"] }),
sdr: TraitsFields.makeDamageTrait({ label: "SW5E.ShieldDamRes", initial: ["acid", "cold", "fire", "necrotic"] }),
di: TraitsFields.makeDamageTrait({ label: "SW5E.HullDamImm" }, { initial: ["poison", "psychic"] }),
sdr: TraitsFields.makeDamageTrait({ label: "SW5E.ShieldDamRes" }, { initial: ["acid", "cold", "fire", "necrotic"] }),
sdv: TraitsFields.makeDamageTrait({ label: "SW5E.ShieldDamVuln" }),
sdi: TraitsFields.makeDamageTrait({ label: "SW5E.ShieldDamImm", initial: ["poison", "psychic"] })
sdi: TraitsFields.makeDamageTrait({ label: "SW5E.ShieldDamImm" }, { initial: ["poison", "psychic"] })
},
{ label: "SW5E.Traits" }
)
60 changes: 59 additions & 1 deletion module/data/item/species.mjs
Original file line number Diff line number Diff line change
@@ -14,7 +14,65 @@ export default class SpeciesData extends SystemDataModel.mixin(ItemDescriptionTe
static defineSchema() {
return this.mergeSchema(super.defineSchema(), {
identifier: new IdentifierField({ required: true, label: "SW5E.Identifier" }),
advancement: new foundry.data.fields.ArrayField(new AdvancementField(), { label: "SW5E.AdvancementTitle" })
advancement: new foundry.data.fields.ArrayField(new AdvancementField(), { label: "SW5E.AdvancementTitle" }),
details: new foundry.data.fields.SchemaField(
{
isDroid: new foundry.data.fields.BooleanField({ required: true, label: "SW5E.IsDroid" })
},
{ label: "SW5E.Details" }
),

// non-droid visual characteristics
skinColorOptions: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.skinColorOptions" }),
}),
hairColorOptions: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.hairColorOptions" }),
}),
eyeColorOptions: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.eyeColorOptions" }),
}),
distinctions: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.distinctions" }),
}),

// droid visual characteristics
colorScheme: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.ColorScheme" }),
}),
droidDistinctions: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.DroidDistinctions" }),
}),

// physical characteristics
heightAverage: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.HeightAverage" }),
}),
heightRollMod: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.HeightRollMod" }),
}),
weightAverage: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.WeightAverage" }),
}),
weightRollMod: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.WeightRollMod" }),
}),

// non-droid sociocultural characteristics
homeworld: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.homeworld" }),
}),
slanguage: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.slanguage" }),
}),

// droid sociocultural characteristics
manufacturer: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.manufacturer" }),
}),
droidLanguage: new foundry.data.fields.SchemaField({
value: new foundry.data.fields.StringField({ required: true, label: "SW5E.slanguage" }),
})
});
}
}
4 changes: 2 additions & 2 deletions module/documents/actor/actor.mjs
Original file line number Diff line number Diff line change
@@ -4651,7 +4651,7 @@ export default class Actor5e extends Actor {
if (ssDeployment) {
if (ssDeployment.items) {
ssDeployment.items.delete(target.uuid);
ssUpdates[`system.attributes.deployment.${key}.items`] = ssDeployment.items;
ssUpdates[`system.attributes.deployment.${key}.items`] = Array.from(ssDeployment.items);
} else ssUpdates[`system.attributes.deployment.${key}.value`] = null;

if (ssDeploy.active.value === target.uuid) {
@@ -4661,7 +4661,7 @@ export default class Actor5e extends Actor {

if (tDeployed?.deployments?.has(key)) {
tDeployed?.deployments?.delete(key);
tUpdates[`system.attributes.deployed.deployments`] = tDeployed.deployments;
tUpdates[`system.attributes.deployed.deployments`] = Array.from(tDeployed.deployments);
}
}

2 changes: 1 addition & 1 deletion module/documents/item.mjs
Original file line number Diff line number Diff line change
@@ -439,7 +439,7 @@ export default class Item5e extends Item {
*/
get iconBackground() {
if (this.system.rarity === undefined) return null;
const rarity = this.system.rarity?.toUpperCase() || "Mundane";
const rarity = this.system.rarity?.capitalize() || "Mundane";
return `systems/sw5e/packs/Icons/ItemBackdrop/${rarity}.webp`;
}

2 changes: 1 addition & 1 deletion module/module-art.mjs
Original file line number Diff line number Diff line change
@@ -122,7 +122,7 @@ export class ModuleArtConfig extends FormApplication {
return foundry.utils.mergeObject(super.defaultOptions, {
title: game.i18n.localize("SW5E.ModuleArtConfigL"),
id: "module-art-config",
template: "systems/sw5e/templates/apps/module-art-config.html",
template: "systems/sw5e/templates/apps/module-art-config.hbs",
popOut: true,
width: 600,
height: "auto"
18 changes: 9 additions & 9 deletions packs/blasters/martialB/shoulder-blaster-rapid.json
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@
"quantity": 1,
"weight": 3,
"price": {
"denomination": "gc",
"value": 1275
"value": 1275,
"denomination": "gc"
},
"attunement": 0,
"equipped": false,
@@ -65,9 +65,9 @@
"amount": null,
"ammount": null
},
"ability": "str",
"ability": "",
"actionType": "save",
"attackBonus": "2 - @abilities.str.mod + 2 - @attributes.prof",
"attackBonus": "",
"chatFlavor": "",
"critical": {
"threshold": null,
@@ -76,7 +76,7 @@
"damage": {
"parts": [
[
"2d6 + 2",
"1d6 + 2",
"energy"
]
],
@@ -85,8 +85,8 @@
"formula": "",
"save": {
"ability": "dex",
"dc": null,
"scaling": "dex"
"dc": 12,
"scaling": "flat"
},
"armor": {
"value": 10
@@ -131,10 +131,10 @@
},
"_stats": {
"systemId": "sw5e",
"systemVersion": "2.1.5.2.4.4",
"systemVersion": "2.1.5.2.4.7",
"coreVersion": "10.291",
"createdTime": 1674493961313,
"modifiedTime": 1684819088105,
"modifiedTime": 1686621161851,
"lastModifiedBy": "sw5ebuilder0000"
}
}
16 changes: 8 additions & 8 deletions packs/blasters/martialB/shoulder-cannon-burst.json
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@
"quantity": 1,
"weight": null,
"price": {
"denomination": "gc",
"value": 1625
"value": 1625,
"denomination": "gc"
},
"attunement": 0,
"equipped": false,
@@ -65,9 +65,9 @@
"amount": 480,
"ammount": null
},
"ability": "str",
"ability": "",
"actionType": "save",
"attackBonus": "2 - @abilities.str.mod + 2 - @attributes.prof",
"attackBonus": "",
"chatFlavor": "",
"critical": {
"threshold": null,
@@ -85,8 +85,8 @@
"formula": "",
"save": {
"ability": "dex",
"dc": null,
"scaling": "dex"
"dc": 12,
"scaling": "flat"
},
"armor": {
"value": 10
@@ -134,10 +134,10 @@
},
"_stats": {
"systemId": "sw5e",
"systemVersion": "2.1.5.2.4.4",
"systemVersion": "2.1.5.2.4.7",
"coreVersion": "10.291",
"createdTime": 1674493961311,
"modifiedTime": 1684819088105,
"modifiedTime": 1686621161851,
"lastModifiedBy": "sw5ebuilder0000"
}
}
16 changes: 8 additions & 8 deletions packs/blasters/martialB/smart-cannon-burst.json
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@
"quantity": 1,
"weight": null,
"price": {
"denomination": "gc",
"value": 2250
"value": 2250,
"denomination": "gc"
},
"attunement": 0,
"equipped": false,
@@ -65,9 +65,9 @@
"amount": null,
"ammount": null
},
"ability": "str",
"ability": "",
"actionType": "save",
"attackBonus": "2 - @abilities.str.mod + 2 - @attributes.prof",
"attackBonus": "",
"chatFlavor": "",
"critical": {
"threshold": null,
@@ -85,8 +85,8 @@
"formula": "",
"save": {
"ability": "dex",
"dc": null,
"scaling": "dex"
"dc": 12,
"scaling": "flat"
},
"armor": {
"value": 10
@@ -133,10 +133,10 @@
},
"_stats": {
"systemId": "sw5e",
"systemVersion": "2.1.5.2.4.4",
"systemVersion": "2.1.5.2.4.7",
"coreVersion": "10.291",
"createdTime": 1674493961234,
"modifiedTime": 1684819088100,
"modifiedTime": 1686621161850,
"lastModifiedBy": "sw5ebuilder0000"
}
}
18 changes: 9 additions & 9 deletions packs/blasters/martialB/smart-cannon-rapid.json
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@
"quantity": 1,
"weight": null,
"price": {
"denomination": "gc",
"value": 2250
"value": 2250,
"denomination": "gc"
},
"attunement": 0,
"equipped": false,
@@ -65,9 +65,9 @@
"amount": null,
"ammount": null
},
"ability": "str",
"ability": "",
"actionType": "save",
"attackBonus": "2 - @abilities.str.mod + 2 - @attributes.prof",
"attackBonus": "",
"chatFlavor": "",
"critical": {
"threshold": null,
@@ -76,7 +76,7 @@
"damage": {
"parts": [
[
"2d10 + 2",
"1d10 + 2",
"kinetic"
]
],
@@ -85,8 +85,8 @@
"formula": "",
"save": {
"ability": "dex",
"dc": null,
"scaling": "dex"
"dc": 12,
"scaling": "flat"
},
"armor": {
"value": 10
@@ -133,10 +133,10 @@
},
"_stats": {
"systemId": "sw5e",
"systemVersion": "2.1.5.2.4.4",
"systemVersion": "2.1.5.2.4.7",
"coreVersion": "10.291",
"createdTime": 1674493961238,
"modifiedTime": 1684819088100,
"modifiedTime": 1686621161850,
"lastModifiedBy": "sw5ebuilder0000"
}
}
Loading

0 comments on commit 9c8ed57

Please sign in to comment.