diff --git a/src/module/sheets/TwodsixAnimalSheet.ts b/src/module/sheets/TwodsixAnimalSheet.ts
index ab160a3e7..b01f04bbd 100644
--- a/src/module/sheets/TwodsixAnimalSheet.ts
+++ b/src/module/sheets/TwodsixAnimalSheet.ts
@@ -61,7 +61,7 @@ export class TwodsixAnimalSheet extends AbstractTwodsixActorSheet {
useFoundryStandardStyle: game.settings.get('twodsix', 'useFoundryStandardStyle'),
showReferences: game.settings.get('twodsix', 'usePDFPagerForRefs'),
showSpells: game.settings.get('twodsix', 'showSpells'),
- animalsUseHits: game.settings.get('twodsix', 'animalsUseHits'),
+ useHits: game.settings.get('twodsix', 'animalsUseHits'),
dontShowStatBlock: (game.settings.get("twodsix", "showLifebloodStamina") | game.settings.get('twodsix', 'lifebloodInsteadOfCharacteristics')),
animalsUseLocations: game.settings.get('twodsix', 'animalsUseLocations'),
displayReactionMorale: game.settings.get('twodsix', 'displayReactionMorale'),
@@ -72,9 +72,8 @@ export class TwodsixAnimalSheet extends AbstractTwodsixActorSheet {
showActorReferences: game.settings.get('twodsix', 'showActorReferences'),
useCTData: game.settings.get('twodsix', 'rangeModifierType') === 'CT_Bands' || game.settings.get('twodsix', 'ruleset') === 'CT'
};
- //returnData.data.settings = returnData.settings; // DELETE WHEN CONVERSION IS COMPLETE
- returnData.config = TWODSIX;
+ returnData.config = TWODSIX;
return returnData;
}
diff --git a/src/module/sheets/TwodsixRobotSheet.ts b/src/module/sheets/TwodsixRobotSheet.ts
index 826cc6146..cefe9dd71 100644
--- a/src/module/sheets/TwodsixRobotSheet.ts
+++ b/src/module/sheets/TwodsixRobotSheet.ts
@@ -59,7 +59,7 @@ export class TwodsixRobotSheet extends AbstractTwodsixActorSheet {
useProseMirror: game.settings.get('twodsix', 'useProseMirror'),
useFoundryStandardStyle: game.settings.get('twodsix', 'useFoundryStandardStyle'),
showReferences: game.settings.get('twodsix', 'usePDFPagerForRefs'),
- robotsUseHits: game.settings.get('twodsix', 'robotsUseHits'),
+ useHits: game.settings.get('twodsix', 'robotsUseHits'),
dontShowStatBlock: (game.settings.get("twodsix", "showLifebloodStamina") | game.settings.get('twodsix', 'lifebloodInsteadOfCharacteristics')),
hideUntrainedSkills: game.settings.get('twodsix', 'hideUntrainedSkills'),
damageTypes: getDamageTypes(false),
diff --git a/static/styles/twodsix.css b/static/styles/twodsix.css
index d5bb04029..b6a0c2433 100644
--- a/static/styles/twodsix.css
+++ b/static/styles/twodsix.css
@@ -1278,7 +1278,7 @@ span.stat-name {
/* left: 0.7em; */
/* top: -1.1em; */
/* font-size: 1em; */
- /* display: block; */
+ display: block;
/*width: 65%;*/
cursor: pointer;
text-align: center;
diff --git a/static/templates/actors/parts/actor/actor-animal-robot-damage.html b/static/templates/actors/parts/actor/actor-animal-robot-damage.html
new file mode 100644
index 000000000..380eaa313
--- /dev/null
+++ b/static/templates/actors/parts/actor/actor-animal-robot-damage.html
@@ -0,0 +1,47 @@
+{{#if settings.useHits}}
+ :-
+
+
+ :
+ {{else if settings.lifebloodInsteadOfCharacteristics}}
+
+ {{#iff system.characteristics.endurance.value "===" system.characteristics.endurance.current}}
+
+ {{else iff system.characteristics.endurance.damage "===" system.characteristics.endurance.value}}
+
+ {{else}}
+
+ {{/iff}}:-
+
+ :-
+
+
+ {{#if settings.showContaminationBelowLifeblood}}
+ :
+ {{/if}}
+
+ {{else}}
+ {{#if settings.showLifebloodStamina}}
+
+ {{#iff system.characteristics.stamina.value "===" system.characteristics.stamina.current}}
+
+ {{else iff system.characteristics.stamina.damage "===" system.characteristics.stamina.value}}
+
+ {{else}}
+
+ {{/iff}}:-
+
+ :-
+
+
+ {{/if}}
+ :
+ {{/if}}
diff --git a/static/templates/actors/parts/actor/actor-animal-robot-protection.html b/static/templates/actors/parts/actor/actor-animal-robot-protection.html
new file mode 100644
index 000000000..c5e9db99b
--- /dev/null
+++ b/static/templates/actors/parts/actor/actor-animal-robot-protection.html
@@ -0,0 +1,16 @@
+{{#if settings.useCTData}}
+ :
+ {{localize "TWODSIX.Items.Armor.armorDM"}}:
+{{else}}
+ :+
+
+ :
+
+ {{selectOptions settings.damageTypes selected=system.secondaryArmor.protectionTypes}}
+
+
+{{/if}}
diff --git a/static/templates/actors/parts/actor/actor-bgi-animal.html b/static/templates/actors/parts/actor/actor-bgi-animal.html
index 309d998be..fad8b4cf3 100644
--- a/static/templates/actors/parts/actor/actor-bgi-animal.html
+++ b/static/templates/actors/parts/actor/actor-bgi-animal.html
@@ -61,78 +61,15 @@
{{/if}}
+
- {{#if settings.useCTData}}
- :
- {{localize "TWODSIX.Items.Armor.armorDM"}}:
- {{else}}
- :+
- :
-
- {{selectOptions settings.damageTypes selected=system.secondaryArmor.protectionTypes}}
-
-
- {{/if}}
+ {{> "systems/twodsix/templates/actors/parts/actor/actor-animal-robot-protection.html"}}
- {{#if settings.animalsUseHits}}
- :-
-
-
- :
- {{else if settings.lifebloodInsteadOfCharacteristics}}
-
- {{#iff system.characteristics.endurance.value "===" system.characteristics.endurance.current}}
-
- {{else iff system.characteristics.endurance.damage "===" system.characteristics.endurance.value}}
-
- {{else}}
-
- {{/iff}}:-
-
- :-
-
-
- {{#if settings.showContaminationBelowLifeblood}}
- :
- {{/if}}
-
- {{else}}
- {{#if settings.showLifebloodStamina}}
-
- {{#iff system.characteristics.stamina.value "===" system.characteristics.stamina.current}}
-
- {{else iff system.characteristics.stamina.damage "===" system.characteristics.stamina.value}}
-
- {{else}}
-
- {{/iff}}:-
-
- :-
-
-
- {{/if}}
- :
- {{/if}}
+ {{> "systems/twodsix/templates/actors/parts/actor/actor-animal-robot-damage.html"}}
+
- :
-
-
-
+ {{> "systems/twodsix/templates/actors/parts/actor/actor-movement.html"}}
{{#unless settings.dontShowStatBlock}}
diff --git a/static/templates/actors/parts/actor/actor-bgi-cd.html b/static/templates/actors/parts/actor/actor-bgi-cd.html
index eabdbb71e..bf50d9851 100644
--- a/static/templates/actors/parts/actor/actor-bgi-cd.html
+++ b/static/templates/actors/parts/actor/actor-bgi-cd.html
@@ -75,12 +75,7 @@
name="system.radiationDose.value" value={{system.radiationDose.value}} min="0" type="number" data-tooltip="{{twodsix_getTooltip actor 'system.radiationDose.value'}}"/>
-:
-
-
-
+{{> "systems/twodsix/templates/actors/parts/actor/actor-movement.html"}}
:
diff --git a/static/templates/actors/parts/actor/actor-bgi-robot.html b/static/templates/actors/parts/actor/actor-bgi-robot.html
index d8914cf13..00e209276 100644
--- a/static/templates/actors/parts/actor/actor-bgi-robot.html
+++ b/static/templates/actors/parts/actor/actor-bgi-robot.html
@@ -16,78 +16,13 @@
{{#unless limited}}
-{{#if settings.useCTData}}
- :
- {{localize "TWODSIX.Items.Armor.armorDM"}}:
-{{else}}
- :+
-
- :
-
- {{selectOptions settings.damageTypes selected=system.secondaryArmor.protectionTypes}}
-
-
-{{/if}}
+{{> "systems/twodsix/templates/actors/parts/actor/actor-animal-robot-protection.html"}}
-{{#if settings.robotsUseHits}}
- :-
-
-
- :
-{{else if settings.lifebloodInsteadOfCharacteristics}}
-
- {{#iff system.characteristics.endurance.value "===" system.characteristics.endurance.current}}
-
- {{else iff system.characteristics.endurance.damage "===" system.characteristics.endurance.value}}
-
- {{else}}
-
- {{/iff}}:-
-
- :-
-
-
- {{#if settings.showContaminationBelowLifeblood}}
- :
- {{/if}}
-
-{{else}}
- {{#if settings.showLifebloodStamina}}
-
- {{#iff system.characteristics.stamina.value "===" system.characteristics.stamina.current}}
-
- {{else iff system.characteristics.stamina.damage "===" system.characteristics.stamina.value}}
-
- {{else}}
-
- {{/iff}}:-
-
- :-
-
-
- {{/if}}
- :
-{{/if}}
+{{> "systems/twodsix/templates/actors/parts/actor/actor-animal-robot-damage.html"}}
+
-:
-
-
-
+{{> "systems/twodsix/templates/actors/parts/actor/actor-movement.html"}}
:
diff --git a/static/templates/actors/parts/actor/actor-bgi-std.html b/static/templates/actors/parts/actor/actor-bgi-std.html
index 00d0bd7b3..080876f86 100644
--- a/static/templates/actors/parts/actor/actor-bgi-std.html
+++ b/static/templates/actors/parts/actor/actor-bgi-std.html
@@ -42,12 +42,7 @@
type="number" value="{{system.radiationDose.value}}" placeholder='0' min="0" onClick="this.select();" data-tooltip="{{twodsix_getTooltip actor 'system.radiationDose.value'}}"/>
- {{localize "TWODSIX.Actor.Movement.MovementWalk"}}:
-
-
-
+ {{> "systems/twodsix/templates/actors/parts/actor/actor-movement.html"}}
:
diff --git a/static/templates/actors/parts/actor/actor-movement.html b/static/templates/actors/parts/actor/actor-movement.html
new file mode 100644
index 000000000..cc09c3933
--- /dev/null
+++ b/static/templates/actors/parts/actor/actor-movement.html
@@ -0,0 +1,6 @@
+:
+
+
+