diff --git a/Changelog.md b/Changelog.md
index 0231e9f9..916f3353 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,13 @@
# TORG Eternity Changelog
+## v.12.3.2
+
+- Fixing some standard item-icons related things [#483](https://github.com/gmmatt/torgeternity/issues/483)
+
+## v.12.3.1
+
+- Fixing a bug that didn't order the cards inside a deck (just on the interface (app), not the cards themself).
+
## v. 12.3.0
- Active Defense will now automatically be disposed, when the combat round is over or the combat ends. [#438](https://github.com/gmmatt/torgeternity/issues/438)
diff --git a/images/icons/ammo-icon.webp b/images/icons/ammo-icon.webp
index bdd4e35c..1affd81b 100644
Binary files a/images/icons/ammo-icon.webp and b/images/icons/ammo-icon.webp differ
diff --git a/images/icons/armor-icon.webp b/images/icons/armor-icon.webp
index d90365ef..a7b9a074 100644
Binary files a/images/icons/armor-icon.webp and b/images/icons/armor-icon.webp differ
diff --git a/images/icons/aspirant-icon.webp b/images/icons/aspirant-icon.webp
index a904f73a..25534071 100644
Binary files a/images/icons/aspirant-icon.webp and b/images/icons/aspirant-icon.webp differ
diff --git a/images/icons/axe-icon.webp b/images/icons/axe-icon.webp
index 1412e7cb..4bb8c85d 100644
Binary files a/images/icons/axe-icon.webp and b/images/icons/axe-icon.webp differ
diff --git a/images/icons/bite-icon.webp b/images/icons/bite-icon.webp
index 1e45558e..2491a1eb 100644
Binary files a/images/icons/bite-icon.webp and b/images/icons/bite-icon.webp differ
diff --git a/images/icons/custom-skills.webp b/images/icons/custom-skills.webp
new file mode 100644
index 00000000..a6dc8f71
Binary files /dev/null and b/images/icons/custom-skills.webp differ
diff --git a/images/icons/cyberware-icon.webp b/images/icons/cyberware-icon.webp
index f2f207cd..3cb5f443 100644
Binary files a/images/icons/cyberware-icon.webp and b/images/icons/cyberware-icon.webp differ
diff --git a/images/icons/darkvision-icon.webp b/images/icons/darkvision-icon.webp
deleted file mode 100644
index 97763b3b..00000000
Binary files a/images/icons/darkvision-icon.webp and /dev/null differ
diff --git a/images/icons/dragon-warrior-icon.webp b/images/icons/dragon-warrior-icon.webp
deleted file mode 100644
index f77447a3..00000000
Binary files a/images/icons/dragon-warrior-icon.webp and /dev/null differ
diff --git a/images/icons/dwarf-icon.webp b/images/icons/dwarf-icon.webp
index ac6a43ef..b1c22104 100644
Binary files a/images/icons/dwarf-icon.webp and b/images/icons/dwarf-icon.webp differ
diff --git a/images/icons/edeinos-icon.webp b/images/icons/edeinos-icon.webp
index e7a88088..66743c11 100644
Binary files a/images/icons/edeinos-icon.webp and b/images/icons/edeinos-icon.webp differ
diff --git a/images/icons/elf-icon.webp b/images/icons/elf-icon.webp
index f6440ef2..242f1eae 100644
Binary files a/images/icons/elf-icon.webp and b/images/icons/elf-icon.webp differ
diff --git a/images/icons/enhancement.webp b/images/icons/enhancement.webp
index d1079f09..f9f8bcbf 100644
Binary files a/images/icons/enhancement.webp and b/images/icons/enhancement.webp differ
diff --git a/images/icons/eternityshard.webp b/images/icons/eternityshard.webp
index a8865010..b4f9559f 100644
Binary files a/images/icons/eternityshard.webp and b/images/icons/eternityshard.webp differ
diff --git a/images/icons/explosion-icon.webp b/images/icons/explosion-icon.webp
index b65483ab..173979e6 100644
Binary files a/images/icons/explosion-icon.webp and b/images/icons/explosion-icon.webp differ
diff --git a/images/icons/firearm-icon-alt.webp b/images/icons/firearm-icon-alt.webp
new file mode 100644
index 00000000..f29b856c
Binary files /dev/null and b/images/icons/firearm-icon-alt.webp differ
diff --git a/images/icons/firearm-icon.webp b/images/icons/firearm-icon.webp
index 4829e71c..153201ff 100644
Binary files a/images/icons/firearm-icon.webp and b/images/icons/firearm-icon.webp differ
diff --git a/images/icons/firearm-icon2.webp b/images/icons/firearm-icon2.webp
deleted file mode 100644
index c703c05f..00000000
Binary files a/images/icons/firearm-icon2.webp and /dev/null differ
diff --git a/images/icons/fist-icon.webp b/images/icons/fist-icon.webp
index 6b89fd9c..0102dd19 100644
Binary files a/images/icons/fist-icon.webp and b/images/icons/fist-icon.webp differ
diff --git a/images/icons/frame-icon-alt.webp b/images/icons/frame-icon-alt.webp
new file mode 100644
index 00000000..9142f0be
Binary files /dev/null and b/images/icons/frame-icon-alt.webp differ
diff --git a/images/icons/frame-icon.webp b/images/icons/frame-icon.webp
new file mode 100644
index 00000000..cc3da50f
Binary files /dev/null and b/images/icons/frame-icon.webp differ
diff --git a/images/icons/gear-icon.webp b/images/icons/gear-icon.webp
index b2c09a28..94377e43 100644
Binary files a/images/icons/gear-icon.webp and b/images/icons/gear-icon.webp differ
diff --git a/images/icons/genemod-icon.webp b/images/icons/genemod-icon.webp
index 5621c539..ec54bf94 100644
Binary files a/images/icons/genemod-icon.webp and b/images/icons/genemod-icon.webp differ
diff --git a/images/icons/groundsloth-icon.webp b/images/icons/groundsloth-icon.webp
index 47f0981c..019b747c 100644
Binary files a/images/icons/groundsloth-icon.webp and b/images/icons/groundsloth-icon.webp differ
diff --git a/images/icons/heavyweapon-icon-alt.webp b/images/icons/heavyweapon-icon-alt.webp
new file mode 100644
index 00000000..3e43174b
Binary files /dev/null and b/images/icons/heavyweapon-icon-alt.webp differ
diff --git a/images/icons/heavyweapon-icon2.webp b/images/icons/heavyweapon-icon2.webp
deleted file mode 100644
index 12fca462..00000000
Binary files a/images/icons/heavyweapon-icon2.webp and /dev/null differ
diff --git a/images/icons/human-icon.webp b/images/icons/human-icon.webp
index ac3a6203..4b5e2fdb 100644
Binary files a/images/icons/human-icon.webp and b/images/icons/human-icon.webp differ
diff --git a/images/icons/implant.webp b/images/icons/implant.webp
index 77a2c835..7515f9ef 100644
Binary files a/images/icons/implant.webp and b/images/icons/implant.webp differ
diff --git a/images/icons/melee-weapon-icon.webp b/images/icons/melee-weapon-icon.webp
index cad94f16..80f4a738 100644
Binary files a/images/icons/melee-weapon-icon.webp and b/images/icons/melee-weapon-icon.webp differ
diff --git a/images/icons/miracles-icon.webp b/images/icons/miracles-icon.webp
index 7f10141e..f3523b21 100644
Binary files a/images/icons/miracles-icon.webp and b/images/icons/miracles-icon.webp differ
diff --git a/images/icons/missile-weapon-icon.webp b/images/icons/missile-weapon-icon.webp
index f6410de1..a9624272 100644
Binary files a/images/icons/missile-weapon-icon.webp and b/images/icons/missile-weapon-icon.webp differ
diff --git a/images/icons/nile-empire.webp b/images/icons/nile-empire.webp
deleted file mode 100644
index 2dd0b62c..00000000
Binary files a/images/icons/nile-empire.webp and /dev/null differ
diff --git a/images/icons/occultech-icon.webp b/images/icons/occultech-icon.webp
new file mode 100644
index 00000000..7515f9ef
Binary files /dev/null and b/images/icons/occultech-icon.webp differ
diff --git a/images/icons/potion-icon.webp b/images/icons/potion-icon.webp
deleted file mode 100644
index f19226f8..00000000
Binary files a/images/icons/potion-icon.webp and /dev/null differ
diff --git a/images/icons/prowess-icon.webp b/images/icons/prowess-icon.webp
deleted file mode 100644
index 74989f81..00000000
Binary files a/images/icons/prowess-icon.webp and /dev/null differ
diff --git a/images/icons/psionicpower.webp b/images/icons/psionicpower.webp
index ce863924..5dbe16ae 100644
Binary files a/images/icons/psionicpower.webp and b/images/icons/psionicpower.webp differ
diff --git a/images/icons/race-icon.webp b/images/icons/race-icon.webp
index 94525adc..88033636 100644
Binary files a/images/icons/race-icon.webp and b/images/icons/race-icon.webp differ
diff --git a/images/icons/reality-icon.webp b/images/icons/reality-icon.webp
index 390450fb..d79da44d 100644
Binary files a/images/icons/reality-icon.webp and b/images/icons/reality-icon.webp differ
diff --git a/images/icons/savagery-icon.webp b/images/icons/savagery-icon.webp
deleted file mode 100644
index 02c535a8..00000000
Binary files a/images/icons/savagery-icon.webp and /dev/null differ
diff --git a/images/icons/shield.webp b/images/icons/shield.webp
index c8e597f7..88d2cbb7 100644
Binary files a/images/icons/shield.webp and b/images/icons/shield.webp differ
diff --git a/images/icons/spell-icon.webp b/images/icons/spell-icon.webp
index 1e24334e..74bf3e09 100644
Binary files a/images/icons/spell-icon.webp and b/images/icons/spell-icon.webp differ
diff --git a/images/icons/stalenger-icon.webp b/images/icons/stalenger-icon.webp
index 9b6b357e..f7a18e02 100644
Binary files a/images/icons/stalenger-icon.webp and b/images/icons/stalenger-icon.webp differ
diff --git a/images/icons/therace-icon.webp b/images/icons/therace-icon.webp
index 36fc77be..2bd4f76d 100644
Binary files a/images/icons/therace-icon.webp and b/images/icons/therace-icon.webp differ
diff --git a/images/icons/torgeternity-icon.webp b/images/icons/torgeternity-icon.webp
index e0400811..6416b580 100644
Binary files a/images/icons/torgeternity-icon.webp and b/images/icons/torgeternity-icon.webp differ
diff --git a/images/icons/vehicle-addon-icon.webp b/images/icons/vehicle-addon-icon.webp
new file mode 100644
index 00000000..a9f1c16c
Binary files /dev/null and b/images/icons/vehicle-addon-icon.webp differ
diff --git a/images/icons/vehicle-icon.webp b/images/icons/vehicle-icon.webp
new file mode 100644
index 00000000..b32c8f35
Binary files /dev/null and b/images/icons/vehicle-icon.webp differ
diff --git a/lang/de.json b/lang/de.json
index ae81f3c6..25d4fc94 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -358,6 +358,7 @@
"damageType": "Schadensart",
"description": "Beschreibung",
"gunner": "Schütze",
+ "implantType": "Implantattyp",
"maxDex": "Max Ges",
"minStrength": "Min Stä",
"mr": "MF",
diff --git a/lang/en.json b/lang/en.json
index b2063677..d4e17f21 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -358,6 +358,7 @@
"damageType": "Damage Type",
"description": "Description",
"gunner": "Gunner",
+ "implantType": "Implant Type",
"maxDex": "Max Dex",
"minStrength": "Min Str",
"mr": "Maneuver",
diff --git a/lang/es.json b/lang/es.json
index 20f270e0..ff527a3b 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -358,6 +358,7 @@
"damageType": "Tipo Daño",
"description": "Descripción",
"gunner": "Gunner",
+ "implantType": "Implant Type",
"maxDex": "DES Máxima",
"minStrength": "FUE Min",
"mr": "VM",
diff --git a/lang/fr.json b/lang/fr.json
index e0a96e26..2d41fbb8 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -358,6 +358,7 @@
"damageType": "Type de dommages",
"description": "Description",
"gunner": "Opérateur",
+ "implantType": "Type d'implant",
"maxDex": "Dex max",
"minStrength": "Force min",
"mr": "MA",
diff --git a/module/config.js b/module/config.js
index 0f51aa1e..add093bd 100644
--- a/module/config.js
+++ b/module/config.js
@@ -373,6 +373,12 @@ torgeternity.magnitudes = {
billions: 'torgeternity.magnitudes.billions',
};
+torgeternity.implantTypes = {
+ cyberware: 'torgeternity.perkTypes.cyberware',
+ occultech: 'torgeternity.perkTypes.occultech',
+ geneMod: 'torgeternity.perkTypes.biotech',
+}
+
torgeternity.statusEffects = [
{
img: 'systems/torgeternity/images/status-markers/stymied.webp',
diff --git a/module/data/item/implant.js b/module/data/item/implant.js
index df5e4bfe..12c4d3fb 100644
--- a/module/data/item/implant.js
+++ b/module/data/item/implant.js
@@ -12,6 +12,7 @@ export class ImplantItemData extends GeneralItemData {
return {
...super.defineSchema(),
notes: new fields.StringField({ initial: '' }),
+ implantType: new fields.StringField({ initial: game.i18n.localize('torgeternity.perkTypes.cyberware') })
};
}
diff --git a/module/documents/item/torgeternityItem.js b/module/documents/item/torgeternityItem.js
index 7481c780..667aeeff 100644
--- a/module/documents/item/torgeternityItem.js
+++ b/module/documents/item/torgeternityItem.js
@@ -53,9 +53,6 @@ export default class TorgeternityItem extends Item {
}
static DEFAULT_ICONS = {
- // genemod:'genemod-icon.webp',
- // occultech: 'implant.webp',
- // cyberware: 'cyberware-icon.webp',
ammunition: 'ammo-icon.webp',
gear: 'gear-icon.webp',
eternityshard: 'eternityshard.webp',
@@ -64,17 +61,20 @@ export default class TorgeternityItem extends Item {
meleeweapon: 'axe-icon.webp',
missileweapon: 'missile-weapon-icon.webp',
firearm: 'firearm-icon.webp',
- implant: 'implant.webp',
+ implant: 'cyberware-icon.webp',
heavyweapon: 'explosion-icon.webp',
- vehicle: 'vehicle.webp',
+ vehicle: 'vehicle-icon.webp',
+ vehicleAddOn: 'vehicle-addon-icon.webp',
perk: 'reality-icon.webp',
enhancement: 'enhancement.webp',
specialability: 'torgeternity-icon.webp',
- 'specialability-rollable': 'specialability-rollable.webp',
+ 'specialability-rollable': 'bite-icon.webp',
spell: 'spell-icon.webp',
miracle: 'miracles-icon.webp',
psionicpower: 'psionicpower.webp',
race: 'race-icon.webp',
+ customSkill: 'custom-skills.webp',
+ customAttack: 'melee-weapon-icon.webp',
};
/**
@@ -158,6 +158,13 @@ export default class TorgeternityItem extends Item {
}
}
+ async _onUpdate(changed, options, userId) {
+ await super._onUpdate(changed, options, userId);
+
+ if (changed?.system && this.type === 'implant' && Object.keys(changed?.system)[0] === 'implantType' && this.img.includes('systems/torgeternity/images/icons/'))
+ await this.update({img: `systems/torgeternity/images/icons/${this.system.implantType}-icon.webp`});
+ }
+
/**
*
* @param {Item} item the item that gets equipped or unequipped
diff --git a/system.json b/system.json
index 10258242..b576723e 100644
--- a/system.json
+++ b/system.json
@@ -15,7 +15,7 @@
"flags": {}
}
],
- "version": "12.3.0",
+ "version": "12.3.2",
"compatibility": {
"minimum": "12",
"verified": "12.331"
diff --git a/templates/sheets/implant-sheet.html b/templates/sheets/implant-sheet.html
index 1092b165..7db7f224 100644
--- a/templates/sheets/implant-sheet.html
+++ b/templates/sheets/implant-sheet.html
@@ -19,6 +19,10 @@
{{selectOptions config.cosmTypes selected=item.system.cosm localize=true sort=true}}
+
{{localize "torgeternity.gear.implantType"}}
+
{{localize "torgeternity.gear.techlevel"}}