diff --git a/3DX/3dx.css b/3DX/3dx.css
index 3f33c1f61a..a8b1aedd3c 100644
--- a/3DX/3dx.css
+++ b/3DX/3dx.css
@@ -51,7 +51,7 @@ textarea {
.characterviewer label {
font-weight: normal;
- font-size: 0.7rem;
+ font-size: 0.75rem;
margin-bottom: 0;
}
.largedialog label {
@@ -83,7 +83,10 @@ label, input, button, select, textarea {
}
.ui-dialog .charsheet button[type="roll"], .ui-dialog .charsheet button[type="compendium"] {
+ align-items: center;
+ display: flex;
font-size: 1.1rem;
+ height: 100%;
}
.btn, .btn.btn-default {
box-shadow: none;
@@ -109,9 +112,10 @@ label, input, button, select, textarea {
.OpenSans {
color: var(--fonttitle);
font-family: Arial;
- font-size: 0.7rem;
+ font-size: 0.75rem;
font-weight:normal;
- letter-spacing: 0.02rem;
+ letter-spacing: 0.025rem;
+ line-height: 0.9rem;
text-align: center;
}
#subtitle {
@@ -550,7 +554,7 @@ label, input, button, select, textarea {
width: 20%;
}
.ProficienciasNome {
- width: 60%;
+ width: 75%;
}
.Proficiencias__Input {
background: none;
@@ -647,14 +651,14 @@ label, input, button, select, textarea {
width: 1rem;
}
.ResourceButton {
- width: 10%;
+ width: 5%;
}
.ResourceNome {
margin-inline: 0.4rem;
width: 65%;
}
.ResourceQuant {
- width: 25%;
+ width: 30%;
}
.Quant__Column {
@@ -734,8 +738,10 @@ label, input, button, select, textarea {
border-radius: 10px 10px 0 0;
color: #D3D3D3;
font-family: Arial;
+ font-size: 1.2rem;
line-height: 100%;
- padding-block: 0.6rem;
+ padding-bottom: 0.6rem;
+ padding-top: 0.8rem;
text-align: center;
width: 100%;
}
@@ -743,12 +749,12 @@ label, input, button, select, textarea {
align-items: center;
display: flex;
justify-content: center;
- margin-block: 2rem;
+ margin-block: 1.6rem;
}
.sheet-rolltemplate-3dxdano div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-actionname {
color: #D3D3D3;
font-family: Arial;
- font-size: 1.4rem;
+ font-size: 1.3rem;
margin-right: 1rem;
}
.sheet-rolltemplate-3dxdano div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-macroresult span {
@@ -757,7 +763,7 @@ label, input, button, select, textarea {
border-radius: 6px;
color: #D3D3D3;
font-family: Arial;
- font-size: 2rem;
+ font-size: 1.6rem;
font-weight: normal;
padding: 0.5rem;
}
@@ -779,8 +785,10 @@ label, input, button, select, textarea {
border-radius: 10px 10px 0 0;
color: #D3D3D3;
font-family: Arial;
+ font-size: 1.2rem;
line-height: 100%;
- padding-block: 0.5rem;
+ padding-bottom: 0.6rem;
+ padding-top: 0.8rem;
text-align: center;
width: 100%;
}
@@ -788,12 +796,12 @@ label, input, button, select, textarea {
align-items: center;
display: flex;
justify-content: center;
- margin-block: 2rem;
+ margin-block: 1.6rem;
}
.sheet-rolltemplate-3dxproficiencia div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-actionname {
color: #D3D3D3;
font-family: Arial;
- font-size: 1.4rem;
+ font-size: 1.3rem;
margin-right: 1rem;
}
.sheet-rolltemplate-3dxproficiencia div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-macroresult span {
@@ -802,7 +810,7 @@ label, input, button, select, textarea {
border-radius: 6px;
color: #D3D3D3;
font-family: Arial;
- font-size: 2rem;
+ font-size: 1.6rem;
font-weight: normal;
padding: 0.5rem;
}
@@ -824,8 +832,10 @@ label, input, button, select, textarea {
border-radius: 10px 10px 0 0;
color: #D3D3D3;
font-family: Arial;
+ font-size: 1.2rem;
line-height: 100%;
- padding-block: 0.5rem;
+ padding-bottom: 0.6rem;
+ padding-top: 0.8rem;
text-align: center;
width: 100%;
}
@@ -833,12 +843,12 @@ label, input, button, select, textarea {
align-items: center;
display: flex;
justify-content: center;
- margin-block: 2rem;
+ margin-block: 1.6rem;
}
.sheet-rolltemplate-3dxrecurso div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-actionname {
color: #D3D3D3;
font-family: Arial;
- font-size: 1.4rem;
+ font-size: 1.3rem;
margin-right: 1rem;
}
.sheet-rolltemplate-3dxrecurso div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-macroresult span {
@@ -847,7 +857,7 @@ label, input, button, select, textarea {
border-radius: 6px;
color: #D3D3D3;
font-family: Arial;
- font-size: 2rem;
+ font-size: 1.6rem;
font-weight: normal;
padding: 0.5rem;
}
@@ -869,8 +879,10 @@ label, input, button, select, textarea {
border-radius: 10px 10px 0 0;
color: #D3D3D3;
font-family: Arial;
+ font-size: 1.2rem;
line-height: 100%;
- padding-block: 0.5rem;
+ padding-bottom: 0.6rem;
+ padding-top: 0.8rem;
text-align: center;
width: 100%;
}
@@ -878,7 +890,7 @@ label, input, button, select, textarea {
align-items: center;
display: flex;
justify-content: center;
- margin-block: 2rem;
+ margin-block: 1.6rem;
}
.sheet-rolltemplate-3dxiniciativa div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-macroresult span {
background-color: #282828;
@@ -886,7 +898,7 @@ label, input, button, select, textarea {
border-radius: 6px;
color: #D3D3D3;
font-family: Arial;
- font-size: 2rem;
+ font-size: 1.6rem;
font-weight: normal;
padding: 0.5rem;
}
@@ -908,8 +920,10 @@ label, input, button, select, textarea {
border-radius: 10px 10px 0 0;
color: #D3D3D3;
font-family: Arial;
+ font-size: 1.2rem;
line-height: 100%;
- padding-block: 0.5rem;
+ padding-bottom: 0.6rem;
+ padding-top: 0.8rem;
text-align: center;
width: 100%;
}
@@ -917,7 +931,7 @@ label, input, button, select, textarea {
align-items: center;
display: flex;
justify-content: center;
- margin-block: 2rem;
+ margin-block: 1.6rem;
}
.sheet-rolltemplate-3dxgenerico div.sheet-roll-container div.sheet-roll-wrap span.sheet-roll-macroresult span {
background-color: #282828;
@@ -925,7 +939,7 @@ label, input, button, select, textarea {
border-radius: 6px;
color: #D3D3D3;
font-family: Arial;
- font-size: 2rem;
+ font-size: 1.6rem;
font-weight: normal;
padding: 0.5rem;
}
diff --git a/3DX/sheet.json b/3DX/sheet.json
index 85b92347f0..bb6fb80208 100644
--- a/3DX/sheet.json
+++ b/3DX/sheet.json
@@ -1,7 +1,7 @@
{
"html":"3dx.html",
"css":"3dx.css",
- "author":"Victor Ballogh",
+ "authors":"Victor Ballogh, Gabriel Almeida",
"roll20userid":"9588130",
"preview":"3dx.png",
"instructions":"Ficha oficial do Sistema 3DX. Livro de regras disponível gratuitmente em https://www.sistema3dx.com.br (Official 3DX character sheet. Core rulebook available at https://www.sistema3dx.com.br)",
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.css b/Star Wars Saga Edition/StarWarsSagaEdition.css
index 57a4e73c44..06c00e858e 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.css
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.css
@@ -64,6 +64,7 @@
text-align: right;
font-size:14px;
width: auto;
+ margin-bottom: 0px;
}
.long {
@@ -327,10 +328,11 @@
.athleticsShow:checked ~ .noathleticsBody,
.pilotSkillShow:not(:checked) ~ .pilotBody,
.sectAttack-show:checked ~ .sectAttack,
-.sect-show:not(:checked) ~ .sect {
+.sect-show:not(:checked) ~ .sect,
+.SkillShow:not(:checked) + .SkillBody {
display: none;
}
-
+
.sheet-hidden {
display: none !important;
}
@@ -348,7 +350,7 @@
display: inline-block;
vertical-align: middle;
content: "[show]";
- width: 14px;
+ width: 25px;
height: 14px;
font-size: 12px;
}
@@ -417,19 +419,27 @@
/* ******** Start code for tabs ******** */
.charsheet div.sheet-tab-content
{ display: none; }
-
+
.charsheet input.tab1:checked ~ div.tab1,
.charsheet input.tab2:checked ~ div.tab2,
.charsheet input.tab3:checked ~ div.tab3,
.charsheet input.tab4:checked ~ div.tab4 {
display: block;
}
+
+.rule-sections {
+ border: 1px solid #777;
+ border-radius: 5px;
+ padding: 5px;
+ margin-bottom: 5px;
+}
+
.charsheet input.tab {
width: 150px;
height: 20px;
position: relative;
left: 6px;
- margin: 0px -1.5px;
+ margin: 0px -1px;
cursor: pointer;
z-index: 1;
border:none;
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 7899ee5e60..23475536f1 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html
@@ -1,6 +1,89 @@
+
+
+
@@ -22,6 +105,11 @@
Background
+
+
+ Non-Heroic
+
+
@@ -1671,9 +1758,27 @@
- Athletics skill house rule?
- Skill Focus as 1/2 level house rule?
-
+
+
+
Attack Options
@@ -1726,7 +1831,7 @@
Encumbrance
-
+
-
+
Carrying Capacity Multiplier
-
@@ -1917,11 +2022,6 @@
@@ -1995,9 +2095,9 @@
CON Constitution
-
-
-
+
+
+
INT Intelligence
@@ -2135,8 +2235,8 @@
- Total after CT
- Total
+ Total after CT
+ Formula
Reflex
@@ -2163,6 +2263,11 @@
+
+
+
+
+
Attacks
@@ -2246,21 +2351,24 @@
Skills
-
+
+
-
-
+
+
@@ -2291,23 +2400,114 @@
+
+
+
+
-
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -2377,23 +2673,445 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
-
+
+
Size
-
+
Colossal (station)
Colossal (cruiser)
Colossal (frigate)
@@ -2772,39 +3770,45 @@
Crew
-
+
Passengers
-
+
-
+
Attributes
+
-
+
-
+
Fighting Space
Character Scale
@@ -3207,7 +4211,7 @@
For help, please see the wiki page.
-Last updated : 10 August 2023
+Last updated : 31 August 2023
@@ -4109,10 +5113,10 @@ on("change:dex", function() {
ArmorUpdate();
//SkillUpdate();
});
-/* Not exactly sure why this doesn't work for attributes like it does for the level. The console log indicates success...
+/* Not exactly sure why this doesn't work for attributes like it does for the level. The console log indicates success...*/
on("change:str change:con change:int change:wis change:cha", function() {
SkillUpdate();
-});*/
+});
//Changes to Armor
on("change:armorworncheck change:armorprof", function() {
ArmorUpdate();
@@ -4127,24 +5131,33 @@ on("change:armorperception", function() {
on("change:hp_max change:con", function() {
SecondWindUpdate();
});
-on("change:IsDroid", function() {
+on("change:force-Show", function() {
+ getAttrs(["force-Show"], function(values) {
+ if(values['force-Show']==1) {setAttrs({"show-UsetheForce":1});}
+ });
+});
+on("change:NoConstitution", function() {
SecondWindUpdate();
//Set defense to STR instead of con
- getAttrs(["IsDroid", "FortTotal"], function(values) {
- let droid = parseInt(values.IsDroid)||0;
+ getAttrs(["NoConstitution", "FortTotal", "EnduranceFormula"], function(values) {
+ let nocon = parseInt(values.NoConstitution)||0;
let fortequation = values.FortTotal;
- if(droid ==1) {
+ let enduranceformula = values.EnduranceFormula;
+ if(nocon ==1) {
DTDefense="@{str|max}";
- fortequation=fortequation.replaceAll(/@{con|max}/gi,'@{str|max}');
+ fortequation=fortequation.replaceAll(/@{con\|max}/gi,'@{str\|max}');
+ enduranceformula=enduranceformula.replace('@{EnduranceMod}[Mod]','0[No Con]');
}
else {
DTDefense="@{con|max}";
- fortequation=fortequation.replaceAll('@{str|max}','@{con|max}');
+ fortequation=fortequation.replaceAll('@{str\|max}','@{con\|max}');
+ enduranceformula=enduranceformula.replace('0[No Con]','@{EnduranceMod}[Mod]');
}
console.log(fortequation);
setAttrs({
"FortMod": DTDefense,
- "FortTotal": fortequation
+ "FortTotal": fortequation,
+ "EnduranceFormula": enduranceformula
});
});
});
@@ -4217,67 +5230,92 @@ on("change:IncludeSR", function() {
});
});
on("change:FocusHouseRule", function() {
- //sheetworker triggers on any changes to the "FocusHouseRule" attribute
getAttrs(["FocusHouseRule","AcrobaticsFormula","AthleticsFormula","ClimbFormula","DeceptionFormula","EnduranceFormula","GatherInformationFormula","InitiativeFormula","JumpFormula","Knowledge-BureaucracyFormula","Knowledge-GalacticLoreFormula","Knowledge-LifeSciencesFormula","Knowledge-PhysicalScienceFormula","Knowledge-SocialScienceFormula","Knowledge-TacticsFormula","Knowledge-TechnologyFormula","MechanicsFormula","PerceptionFormula","PersuasionFormula","PilotFormula","RideFormula","StealthFormula","SurvivalFormula","SwimFormula","TreatInjuryFormula","UseComputerFormula","UsetheForceFormula"], function(values) {
- //get the values for the two attributes, so they can used.
let FHR = values.FocusHouseRule||0;
- var AcrobaticsFormula = "@{level|max}[Half Level]+@{AcrobaticsMod}[Mod]+@{AcrobaticsFeat}[Training]+@{AcrobaticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AcrobaticsMisc}[Misc]+@{CT}[CT]";
- var AthleticsFormula = "@{level|max}[Half Level]+@{AthleticsMod}[Mod]+@{AthleticsFeat}[Training]+@{AthleticsFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AthleticsMisc}[Misc]+@{CT}[CT]";
- var ClimbFormula = "@{level|max}[Half Level]+@{ClimbMod}[Mod]+@{ClimbFeat}[Training]+@{ClimbFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{ClimbMisc}[Misc]+@{CT}[CT]";
- var DeceptionFormula = "@{level|max}[Half Level]+@{DeceptionMod}[Mod]+@{DeceptionFeat}[Training]+@{DeceptionFeat|max}[Focus]+@{DeceptionMisc}[Misc]+@{CT}[CT]";
- var EnduranceFormula = "@{level|max}[Half Level]+@{EnduranceMod}[Mod]+@{EnduranceFeat}[Training]+@{EnduranceFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{EnduranceMisc}[Misc]+@{CT}[CT]";
- var GatherInformationFormula = "@{level|max}[Half Level]+@{GatherInformationMod}[Mod]+@{GatherInformationFeat}[Training]+@{GatherInformationFeat|max}[Focus]+@{GatherInformationMisc}[Misc]+@{CT}[CT]";
- var InitiativeFormula = "@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+@{InitiativeFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{InitiativeMisc}[Misc]+@{CT}[CT]";
- var JumpFormula = "@{level|max}[Half Level]+@{JumpMod}[Mod]+@{JumpFeat}[Training]+@{JumpFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{JumpMisc}[Misc]+@{CT}[CT]";
- var BureaucracyFormula = "@{level|max}[Half Level]+@{Knowledge-BureaucracyMod}[Mod]+@{Knowledge-BureaucracyFeat}[Training]+@{Knowledge-BureaucracyFeat|max}[Focus]+@{Knowledge-BureaucracyMisc}[Misc]+@{CT}[CT]";
- var GalacticLoreFormula = "@{level|max}[Half Level]+@{Knowledge-GalacticLoreMod}[Mod]+@{Knowledge-GalacticLoreFeat}[Training]+@{Knowledge-GalacticLoreFeat|max}[Focus]+@{Knowledge-GalacticLoreMisc}[Misc]+@{CT}[CT]";
- var LifeSciencesFormula = "@{level|max}[Half Level]+@{Knowledge-LifeSciencesMod}[Mod]+@{Knowledge-LifeSciencesFeat}[Training]+@{Knowledge-LifeSciencesFeat|max}[Focus]+@{Knowledge-LifeSciencesMisc}[Misc]+@{CT}[CT]";
- var PhysicalScienceFormula = "@{level|max}[Half Level]+@{Knowledge-PhysicalScienceMod}[Mod]+@{Knowledge-PhysicalScienceFeat}[Training]+@{Knowledge-PhysicalScienceFeat|max}[Focus]+@{Knowledge-PhysicalScienceMisc}[Misc]+@{CT}[CT]";
- var SocialScienceFormula = "@{level|max}[Half Level]+@{Knowledge-SocialScienceMod}[Mod]+@{Knowledge-SocialScienceFeat}[Training]+@{Knowledge-SocialScienceFeat|max}[Focus]+@{Knowledge-SocialScienceMisc}[Misc]+@{CT}[CT]";
- var TacticsFormula = "@{level|max}[Half Level]+@{Knowledge-TacticsMod}[Mod]+@{Knowledge-TacticsFeat}[Training]+@{Knowledge-TacticsFeat|max}[Focus]+@{Knowledge-TacticsMisc}[Misc]+@{CT}[CT]";
- var TechnologyFormula = "@{level|max}[Half Level]+@{Knowledge-TechnologyMod}[Mod]+@{Knowledge-TechnologyFeat}[Training]+@{Knowledge-TechnologyFeat|max}[Focus]+@{Knowledge-TechnologyMisc}[Misc]+@{CT}[CT]";
- var MechanicsFormula = "@{level|max}[Half Level]+@{MechanicsMod}[Mod]+@{MechanicsFeat}[Training]+@{MechanicsFeat|max}[Focus]+@{MechanicsMisc}[Misc]+@{CT}[CT]";
- var PerceptionFormula = "@{level|max}[Half Level]+@{PerceptionMod}[Mod]+@{PerceptionFeat}[Training]+@{PerceptionFeat|max}[Focus]+@{PerceptionMisc}[Misc]+@{CT}[CT]";
- var PersuasionFormula = "@{level|max}[Half Level]+@{PersuasionMod}[Mod]+@{PersuasionFeat}[Training]+@{PersuasionFeat|max}[Focus]+@{PersuasionMisc}[Misc]+@{CT}[CT]";
- var PilotFormula = "@{level|max}[Half Level]+@{PilotMod}[Mod]+@{PilotFeat}[Training]+@{PilotFeat|max}[Focus]+@{PilotMisc}[Misc]+@{CT}[CT]";
- var RideFormula = "@{level|max}[Half Level]+@{RideMod}[Mod]+@{RideFeat}[Training]+@{RideFeat|max}[Focus]+@{RideMisc}[Misc]+@{CT}[CT]";
- var StealthFormula = "@{level|max}[Half Level]+@{StealthMod}[Mod]+@{StealthFeat}[Training]+@{StealthFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{StealthMisc}[Misc]+@{CT}[CT]";
- var SurvivalFormula = "@{level|max}[Half Level]+@{SurvivalMod}[Mod]+@{SurvivalFeat}[Training]+@{SurvivalFeat|max}[Focus]+@{SurvivalMisc}[Misc]+@{CT}[CT]";
- var SwimFormula = "@{level|max}[Half Level]+@{SwimMod}[Mod]+@{SwimFeat}[Training]+@{SwimFeat|max}[Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{SwimMisc}[Misc]+@{CT}[CT]";
- var TreatInjuryFormula = "@{level|max}[Half Level]+@{TreatInjuryMod}[Mod]+@{TreatInjuryFeat}[Training]+@{TreatInjuryFeat|max}[Focus]+@{TreatInjuryMisc}[Misc]+@{CT}[CT]";
- var UseComputerFormula = "@{level|max}[Half Level]+@{UseComputerMod}[Mod]+@{UseComputerFeat}[Training]+@{UseComputerFeat|max}[Focus]+@{UseComputerMisc}[Misc]+@{CT}[CT]";
- var UsetheForceFormula = "@{level|max}[Half Level]+@{UsetheForceMod}[Mod]+@{UsetheForceFeat}[Training]+@{UsetheForceFeat|max}[Focus]+@{UsetheForceMisc}[Misc]+@{CT}[CT]";
- //sets the values of the variables to the default formulas.
- if(FHR ==1) {
- AcrobaticsFormula = "@{level|max}[Half Level]+@{AcrobaticsMod}[Mod]+@{AcrobaticsFeat}[Training]+[[ceil(@{level}/2)*@{AcrobaticsFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AcrobaticsMisc}[Misc]+@{CT}[CT]";
- AthleticsFormula = "@{level|max}[Half Level]+@{AthleticsMod}[Mod]+@{AthleticsFeat}[Training]+[[ceil(@{level}/2)*@{AthleticsFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{AthleticsMisc}[Misc]+@{CT}[CT]";
- ClimbFormula = "@{level|max}[Half Level]+@{ClimbMod}[Mod]+@{ClimbFeat}[Training]+[[ceil(@{level}/2)*@{ClimbFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{ClimbMisc}[Misc]+@{CT}[CT]";
- DeceptionFormula = "@{level|max}[Half Level]+@{DeceptionMod}[Mod]+@{DeceptionFeat}[Training]+[[ceil(@{level}/2)*@{DeceptionFeat|max}/5]][Focus]+@{DeceptionMisc}[Misc]+@{CT}[CT]";
- EnduranceFormula = "@{level|max}[Half Level]+@{EnduranceMod}[Mod]+@{EnduranceFeat}[Training]+[[ceil(@{level}/2)*@{EnduranceFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{EnduranceMisc}[Misc]+@{CT}[CT]";
- GatherInformationFormula = "@{level|max}[Half Level]+@{GatherInformationMod}[Mod]+@{GatherInformationFeat}[Training]+[[ceil(@{level}/2)*@{GatherInformationFeat|max}/5]][Focus]+@{GatherInformationMisc}[Misc]+@{CT}[CT]";
- InitiativeFormula = "@{level|max}[Half Level]+@{InitiativeMod}[Mod]+@{InitiativeFeat}[Training]+[[ceil(@{level}/2)*@{InitiativeFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{InitiativeMisc}[Misc]+@{CT}[CT]";
- JumpFormula = "@{level|max}[Half Level]+@{JumpMod}[Mod]+@{JumpFeat}[Training]+[[ceil(@{level}/2)*@{JumpFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{JumpMisc}[Misc]+@{CT}[CT]";
- BureaucracyFormula = "@{level|max}[Half Level]+@{Knowledge-BureaucracyMod}[Mod]+@{Knowledge-BureaucracyFeat}[Training]+[[ceil(@{level}/2)*@{Knowledge-BureaucracyFeat|max}/5]][Focus]+@{Knowledge-BureaucracyMisc}[Misc]+@{CT}[CT]";
- GalacticLoreFormula = "@{level|max}[Half Level]+@{Knowledge-GalacticLoreMod}[Mod]+@{Knowledge-GalacticLoreFeat}[Training]+[[ceil(@{level}/2)*@{Knowledge-GalacticLoreFeat|max}/5]][Focus]+@{Knowledge-GalacticLoreMisc}[Misc]+@{CT}[CT]";
- LifeSciencesFormula = "@{level|max}[Half Level]+@{Knowledge-LifeSciencesMod}[Mod]+@{Knowledge-LifeSciencesFeat}[Training]+[[ceil(@{level}/2)*@{Knowledge-LifeSciencesFeat|max}/5]][Focus]+@{Knowledge-LifeSciencesMisc}[Misc]+@{CT}[CT]";
- PhysicalScienceFormula = "@{level|max}[Half Level]+@{Knowledge-PhysicalScienceMod}[Mod]+@{Knowledge-PhysicalScienceFeat}[Training]+[[ceil(@{level}/2)*@{Knowledge-PhysicalScienceFeat|max}/5]][Focus]+@{Knowledge-PhysicalScienceMisc}[Misc]+@{CT}[CT]";
- SocialScienceFormula = "@{level|max}[Half Level]+@{Knowledge-SocialScienceMod}[Mod]+@{Knowledge-SocialScienceFeat}[Training]+[[ceil(@{level}/2)*@{Knowledge-SocialScienceFeat|max}/5]][Focus]+@{Knowledge-SocialScienceMisc}[Misc]+@{CT}[CT]";
- TacticsFormula = "@{level|max}[Half Level]+@{Knowledge-TacticsMod}[Mod]+@{Knowledge-TacticsFeat}[Training]+[[ceil(@{level}/2)*@{Knowledge-TechnologyFeat|max}/5]][Focus]+@{Knowledge-TacticsMisc}[Misc]+@{CT}[CT]";
- TechnologyFormula = "@{level|max}[Half Level]+@{Knowledge-TechnologyMod}[Mod]+@{Knowledge-TechnologyFeat}[Training]+[[ceil(@{level}/2)*@{Knowledge-TechnologyFeat|max}/5]][Focus]+@{Knowledge-TechnologyMisc}[Misc]+@{CT}[CT]";
- MechanicsFormula = "@{level|max}[Half Level]+@{MechanicsMod}[Mod]+@{MechanicsFeat}[Training]+[[ceil(@{level}/2)*@{MechanicsFeat|max}/5]][Focus]+@{MechanicsMisc}[Misc]+@{CT}[CT]";
- PerceptionFormula = "@{level|max}[Half Level]+@{PerceptionMod}[Mod]+@{PerceptionFeat}[Training]+[[ceil(@{level}/2)*@{PerceptionFeat|max}/5]][Focus]+@{PerceptionMisc}[Misc]+@{CT}[CT]";
- PersuasionFormula = "@{level|max}[Half Level]+@{PersuasionMod}[Mod]+@{PersuasionFeat}[Training]+[[ceil(@{level}/2)*@{PersuasionFeat|max}/5]][Focus]+@{PersuasionMisc}[Misc]+@{CT}[CT]";
- PilotFormula = "@{level|max}[Half Level]+@{PilotMod}[Mod]+@{PilotFeat}[Training]+[[ceil(@{level}/2)*@{PilotFeat|max}/5]][Focus]+@{PilotMisc}[Misc]+@{CT}[CT]";
- RideFormula = "@{level|max}[Half Level]+@{RideMod}[Mod]+@{RideFeat}[Training]+[[ceil(@{level}/2)*@{RideFeat|max}/5]][Focus]+@{RideMisc}[Misc]+@{CT}[CT]";
- StealthFormula = "@{level|max}[Half Level]+@{StealthMod}[Mod]+@{StealthFeat}[Training]+[[ceil(@{level}/2)*@{StealthFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{StealthMisc}[Misc]+@{CT}[CT]";
- SurvivalFormula = "@{level|max}[Half Level]+@{SurvivalMod}[Mod]+@{SurvivalFeat}[Training]+[[ceil(@{level}/2)*@{SurvivalFeat|max}/5]][Focus]+@{SurvivalMisc}[Misc]+@{CT}[CT]";
- SwimFormula = "@{level|max}[Half Level]+@{SwimMod}[Mod]+@{SwimFeat}[Training]+[[ceil(@{level}/2)*@{SwimFeat|max}/5]][Focus]+@{ArmorType|max}[Armor Penalty]+@{EquipmentLoad}[Heavy Load]+@{SwimMisc}[Misc]+@{CT}[CT]";
- TreatInjuryFormula = "@{level|max}[Half Level]+@{TreatInjuryMod}[Mod]+@{TreatInjuryFeat}[Training]+[[ceil(@{level}/2)*@{TreatInjuryFeat|max}/5]][Focus]+@{TreatInjuryMisc}[Misc]+@{CT}[CT]";
- UseComputerFormula = "@{level|max}[Half Level]+@{UseComputerMod}[Mod]+@{UseComputerFeat}[Training]+[[ceil(@{level}/2)*@{UseComputerFeat|max}/5]][Focus]+@{UseComputerMisc}[Misc]+@{CT}[CT]";
- UsetheForceFormula = "@{level|max}[Half Level]+@{UsetheForceMod}[Mod]+@{UsetheForceFeat}[Training]+[[ceil(@{level}/2)*@{UsetheForceFeat|max}/5]][Focus]+@{UsetheForceMisc}[Misc]+@{CT}[CT]";
- // If the house rule is used, sets the temporary variables to the house rule formula
- console.log("Using Skill Focus house rule");}
- else {console.log("Using Skill Focus default rules");}
+ let AcrobaticsFormula = values.AcrobaticsFormula;
+ let AthleticsFormula = values.AthleticsFormula;
+ let ClimbFormula = values.ClimbFormula;
+ let DeceptionFormula = values.DeceptionFormula;
+ let EnduranceFormula = values.EnduranceFormula;
+ let GatherInformationFormula = values.GatherInformationFormula;
+ let InitiativeFormula = values.InitiativeFormula;
+ let JumpFormula = values.JumpFormula;
+ let BureaucracyFormula = values['Knowledge-BureaucracyFormula'];
+ let GalacticLoreFormula = values['Knowledge-GalacticLoreFormula'];
+ let LifeSciencesFormula = values['Knowledge-LifeSciencesFormula'];
+ let PhysicalScienceFormula = values['Knowledge-PhysicalScienceFormula'];
+ let SocialScienceFormula = values['Knowledge-SocialScienceFormula'];
+ let TacticsFormula = values['Knowledge-TacticsFormula'];
+ let TechnologyFormula = values['Knowledge-TechnologyFormula'];
+ let MechanicsFormula = values.MechanicsFormula;
+ let PerceptionFormula = values.PerceptionFormula;
+ let PersuasionFormula = values.PersuasionFormula;
+ let PilotFormula = values.PilotFormula;
+ let RideFormula = values.RideFormula;
+ let StealthFormula = values.StealthFormula;
+ let SurvivalFormula = values.SurvivalFormula;
+ let SwimFormula = values.SwimFormula;
+ let TreatInjuryFormula = values.TreatInjuryFormula;
+ let UseComputerFormula = values.UseComputerFormula;
+ let UsetheForceFormula = values.UsetheForceFormula;
+ if(FHR==1) {
+ AcrobaticsFormula=AcrobaticsFormula.replace('@{AcrobaticsFeat\|max}[Focus]','[[ceil(@{level}/2)*@{AcrobaticsFeat\|max}/5]][Focus]');
+ AthleticsFormula=AthleticsFormula.replace('@{AthleticsFeat\|max}[Focus]','[[ceil(@{level}/2)*@{AthleticsFeat\|max}/5]][Focus]');
+ ClimbFormula=ClimbFormula.replace('@{ClimbFeat\|max}[Focus]','[[ceil(@{level}/2)*@{ClimbFeat\|max}/5]][Focus]');
+ DeceptionFormula=DeceptionFormula.replace('@{DeceptionFeat\|max}[Focus]','[[ceil(@{level}/2)*@{DeceptionFeat\|max}/5]][Focus]');
+ EnduranceFormula=EnduranceFormula.replace('@{EnduranceFeat\|max}[Focus]','[[ceil(@{level}/2)*@{EnduranceFeat\|max}/5]][Focus]');
+ GatherInformationFormula=GatherInformationFormula.replace('@{GatherInformationFeat\|max}[Focus]','[[ceil(@{level}/2)*@{GatherInformationFeat\|max}/5]][Focus]');
+ InitiativeFormula=InitiativeFormula.replace('@{InitiativeFeat\|max}[Focus]','[[ceil(@{level}/2)*@{InitiativeFeat\|max}/5]][Focus]');
+ JumpFormula=JumpFormula.replace('@{JumpFeat\|max}[Focus]','[[ceil(@{level}/2)*@{JumpFeat\|max}/5]][Focus]');
+ BureaucracyFormula=BureaucracyFormula.replace('@{Knowledge-BureaucracyFeat\|max}[Focus]','[[ceil(@{level}/2)*@{Knowledge-BureaucracyFeat\|max}/5]][Focus]');
+ GalacticLoreFormula=GalacticLoreFormula.replace('@{Knowledge-GalacticLoreFeat\|max}[Focus]','[[ceil(@{level}/2)*@{Knowledge-GalacticLoreFeat\|max}/5]][Focus]');
+ LifeSciencesFormula=LifeSciencesFormula.replace('@{Knowledge-LifeSciencesFeat\|max}[Focus]','[[ceil(@{level}/2)*@{Knowledge-LifeSciencesFeat\|max}/5]][Focus]');
+ PhysicalScienceFormula=PhysicalScienceFormula.replace('@{Knowledge-PhysicalScienceFeat\|max}[Focus]','[[ceil(@{level}/2)*@{Knowledge-PhysicalScienceFeat\|max}/5]][Focus]');
+ SocialScienceFormula=SocialScienceFormula.replace('@{Knowledge-SocialScienceFeat\|max}[Focus]','[[ceil(@{level}/2)*@{Knowledge-SocialScienceFeat\|max}/5]][Focus]');
+ TacticsFormula=TacticsFormula.replace('@{Knowledge-TacticsFeat\|max}[Focus]','[[ceil(@{level}/2)*@{Knowledge-TacticsFeat\|max}/5]][Focus]');
+ TechnologyFormula=TechnologyFormula.replace('@{Knowledge-TechnologyFeat\|max}[Focus]','[[ceil(@{level}/2)*@{Knowledge-TechnologyFeat\|max}/5]][Focus]');
+ MechanicsFormula=MechanicsFormula.replace('@{MechanicsFeat\|max}[Focus]','[[ceil(@{level}/2)*@{MechanicsFeat\|max}/5]][Focus]');
+ PerceptionFormula=PerceptionFormula.replace('@{PerceptionFeat\|max}[Focus]','[[ceil(@{level}/2)*@{PerceptionFeat\|max}/5]][Focus]');
+ PersuasionFormula=PersuasionFormula.replace('@{PersuasionFeat\|max}[Focus]','[[ceil(@{level}/2)*@{PersuasionFeat\|max}/5]][Focus]');
+ PilotFormula=PilotFormula.replace('@{PilotFeat\|max}[Focus]','[[ceil(@{level}/2)*@{PilotFeat\|max}/5]][Focus]');
+ RideFormula=RideFormula.replace('@{RideFeat\|max}[Focus]','[[ceil(@{level}/2)*@{RideFeat\|max}/5]][Focus]');
+ StealthFormula=StealthFormula.replace('@{StealthFeat\|max}[Focus]','[[ceil(@{level}/2)*@{StealthFeat\|max}/5]][Focus]');
+ SurvivalFormula=SurvivalFormula.replace('@{SurvivalFeat\|max}[Focus]','[[ceil(@{level}/2)*@{SurvivalFeat\|max}/5]][Focus]');
+ SwimFormula=SwimFormula.replace('@{SwimFeat\|max}[Focus]','[[ceil(@{level}/2)*@{SwimFeat\|max}/5]][Focus]');
+ TreatInjuryFormula=TreatInjuryFormula.replace('@{TreatInjuryFeat\|max}[Focus]','[[ceil(@{level}/2)*@{TreatInjuryFeat\|max}/5]][Focus]');
+ UseComputerFormula=UseComputerFormula.replace('@{UseComputerFeat\|max}[Focus]','[[ceil(@{level}/2)*@{UseComputerFeat\|max}/5]][Focus]');
+ UsetheForceFormula=UsetheForceFormula.replace('@{UsetheForceFeat\|max}[Focus]','[[ceil(@{level}/2)*@{UsetheForceFeat\|max}/5]][Focus]');
+ console.log("Using Skill Focus house rule");
+ }
+ else {
+ AcrobaticsFormula=AcrobaticsFormula.replace('[[ceil(@{level}/2)*@{AcrobaticsFeat\|max}/5]][Focus]','@{AcrobaticsFeat\|max}[Focus]');
+ AthleticsFormula=AthleticsFormula.replace('[[ceil(@{level}/2)*@{AthleticsFeat\|max}/5]][Focus]','@{AthleticsFeat\|max}[Focus]');
+ ClimbFormula=ClimbFormula.replace('[[ceil(@{level}/2)*@{ClimbFeat\|max}/5]][Focus]','@{ClimbFeat\|max}[Focus]');
+ DeceptionFormula=DeceptionFormula.replace('[[ceil(@{level}/2)*@{DeceptionFeat\|max}/5]][Focus]','@{DeceptionFeat\|max}[Focus]');
+ EnduranceFormula=EnduranceFormula.replace('[[ceil(@{level}/2)*@{EnduranceFeat\|max}/5]][Focus]','@{EnduranceFeat\|max}[Focus]');
+ GatherInformationFormula=GatherInformationFormula.replace('[[ceil(@{level}/2)*@{GatherInformationFeat\|max}/5]][Focus]','@{GatherInformationFeat\|max}[Focus]');
+ InitiativeFormula=InitiativeFormula.replace('[[ceil(@{level}/2)*@{InitiativeFeat\|max}/5]][Focus]','@{InitiativeFeat\|max}[Focus]');
+ JumpFormula=JumpFormula.replace('[[ceil(@{level}/2)*@{JumpFeat\|max}/5]][Focus]','@{JumpFeat\|max}[Focus]');
+ BureaucracyFormula=BureaucracyFormula.replace('[[ceil(@{level}/2)*@{Knowledge-BureaucracyFeat\|max}/5]][Focus]','@{Knowledge-BureaucracyFeat\|max}[Focus]');
+ GalacticLoreFormula=GalacticLoreFormula.replace('[[ceil(@{level}/2)*@{Knowledge-GalacticLoreFeat\|max}/5]][Focus]','@{Knowledge-GalacticLoreFeat\|max}[Focus]');
+ LifeSciencesFormula=LifeSciencesFormula.replace('[[ceil(@{level}/2)*@{Knowledge-LifeSciencesFeat\|max}/5]][Focus]','@{Knowledge-LifeSciencesFeat\|max}[Focus]');
+ PhysicalScienceFormula=PhysicalScienceFormula.replace('[[ceil(@{level}/2)*@{Knowledge-PhysicalScienceFeat\|max}/5]][Focus]','@{Knowledge-PhysicalScienceFeat\|max}[Focus]');
+ SocialScienceFormula=SocialScienceFormula.replace('[[ceil(@{level}/2)*@{Knowledge-SocialScienceFeat\|max}/5]][Focus]','@{Knowledge-SocialScienceFeat\|max}[Focus]');
+ TacticsFormula=TacticsFormula.replace('[[ceil(@{level}/2)*@{Knowledge-TacticsFeat\|max}/5]][Focus]','@{Knowledge-TacticsFeat\|max}[Focus]');
+ TechnologyFormula=TechnologyFormula.replace('[[ceil(@{level}/2)*@{Knowledge-TechnologyFeat\|max}/5]][Focus]','@{Knowledge-TechnologyFeat\|max}[Focus]');
+ MechanicsFormula=MechanicsFormula.replace('[[ceil(@{level}/2)*@{MechanicsFeat\|max}/5]][Focus]','@{MechanicsFeat\|max}[Focus]');
+ PerceptionFormula=PerceptionFormula.replace('[[ceil(@{level}/2)*@{PerceptionFeat\|max}/5]][Focus]','@{PerceptionFeat\|max}[Focus]');
+ PersuasionFormula=PersuasionFormula.replace('[[ceil(@{level}/2)*@{PersuasionFeat\|max}/5]][Focus]','@{PersuasionFeat\|max}[Focus]');
+ PilotFormula=PilotFormula.replace('[[ceil(@{level}/2)*@{PilotFeat\|max}/5]][Focus]','@{PilotFeat\|max}[Focus]');
+ RideFormula=RideFormula.replace('[[ceil(@{level}/2)*@{RideFeat\|max}/5]][Focus]','@{RideFeat\|max}[Focus]');
+ StealthFormula=StealthFormula.replace('[[ceil(@{level}/2)*@{StealthFeat\|max}/5]][Focus]','@{StealthFeat\|max}[Focus]');
+ SurvivalFormula=SurvivalFormula.replace('[[ceil(@{level}/2)*@{SurvivalFeat\|max}/5]][Focus]','@{SurvivalFeat\|max}[Focus]');
+ SwimFormula=SwimFormula.replace('[[ceil(@{level}/2)*@{SwimFeat\|max}/5]][Focus]','@{SwimFeat\|max}[Focus]');
+ TreatInjuryFormula=TreatInjuryFormula.replace('[[ceil(@{level}/2)*@{TreatInjuryFeat\|max}/5]][Focus]','@{TreatInjuryFeat\|max}[Focus]');
+ UseComputerFormula=UseComputerFormula.replace('[[ceil(@{level}/2)*@{UseComputerFeat\|max}/5]][Focus]','@{UseComputerFeat\|max}[Focus]');
+ UsetheForceFormula=UsetheForceFormula.replace('[[ceil(@{level}/2)*@{UsetheForceFeat\|max}/5]][Focus]','@{UsetheForceFeat\|max}[Focus]');
+ console.log("Using Skill Focus default rules");
+ }
setAttrs({
"AcrobaticsFormula": AcrobaticsFormula,
"AthleticsFormula": AthleticsFormula,
@@ -4305,13 +5343,129 @@ on("change:FocusHouseRule", function() {
"TreatInjuryFormula": TreatInjuryFormula,
"UseComputerFormula": UseComputerFormula,
"UsetheForceFormula": UsetheForceFormula
- // Overwrites the skill formulas
+ });
+ });
+});
+on("change:QuerySkillModifier", function() {
+ getAttrs(["QuerySkillModifier","AcrobaticsFormula_max","AthleticsFormula_max","ClimbFormula_max","DeceptionFormula_max","EnduranceFormula_max","GatherInformationFormula_max","InitiativeFormula_max","JumpFormula_max","Knowledge-BureaucracyFormula_max","Knowledge-GalacticLoreFormula_max","Knowledge-LifeSciencesFormula_max","Knowledge-PhysicalScienceFormula_max","Knowledge-SocialScienceFormula_max","Knowledge-TacticsFormula_max","Knowledge-TechnologyFormula_max","MechanicsFormula_max","PerceptionFormula_max","PersuasionFormula_max","PilotFormula_max","RideFormula_max","StealthFormula_max","SurvivalFormula_max","SwimFormula_max","TreatInjuryFormula_max","UseComputerFormula_max","UsetheForceFormula_max"], function(values) {
+ let QSM = values.QuerySkillModifier||0;
+ let AcrobaticsFormula_max = values.AcrobaticsFormula_max;
+ let AthleticsFormula_max = values.AthleticsFormula_max;
+ let ClimbFormula_max = values.ClimbFormula_max;
+ let DeceptionFormula_max = values.DeceptionFormula_max;
+ let EnduranceFormula_max = values.EnduranceFormula_max;
+ let GatherInformationFormula_max = values.GatherInformationFormula_max;
+ let InitiativeFormula_max = values.InitiativeFormula_max;
+ let JumpFormula_max = values.JumpFormula_max;
+ let BureaucracyFormula_max = values['Knowledge-BureaucracyFormula_max'];
+ let GalacticLoreFormula_max = values['Knowledge-GalacticLoreFormula_max'];
+ let LifeSciencesFormula_max = values['Knowledge-LifeSciencesFormula_max'];
+ let PhysicalScienceFormula_max = values['Knowledge-PhysicalScienceFormula_max'];
+ let SocialScienceFormula_max = values['Knowledge-SocialScienceFormula_max'];
+ let TacticsFormula_max = values['Knowledge-TacticsFormula_max'];
+ let TechnologyFormula_max = values['Knowledge-TechnologyFormula_max'];
+ let MechanicsFormula_max = values.MechanicsFormula_max;
+ let PerceptionFormula_max = values.PerceptionFormula_max;
+ let PersuasionFormula_max = values.PersuasionFormula_max;
+ let PilotFormula_max = values.PilotFormula_max;
+ let RideFormula_max = values.RideFormula_max;
+ let StealthFormula_max = values.StealthFormula_max;
+ let SurvivalFormula_max = values.SurvivalFormula_max;
+ let SwimFormula_max = values.SwimFormula_max;
+ let TreatInjuryFormula_max = values.TreatInjuryFormula_max;
+ let UseComputerFormula_max = values.UseComputerFormula_max;
+ let UsetheForceFormula_max = values.UsetheForceFormula_max;
+ if(QSM==1) {
+ AcrobaticsFormula_max=AcrobaticsFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ AthleticsFormula_max=AthleticsFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ ClimbFormula_max=ClimbFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ DeceptionFormula_max=DeceptionFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ EnduranceFormula_max=EnduranceFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ GatherInformationFormula_max=GatherInformationFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ InitiativeFormula_max=InitiativeFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ JumpFormula_max=JumpFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ BureaucracyFormula_max=BureaucracyFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ GalacticLoreFormula_max=GalacticLoreFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ LifeSciencesFormula_max=LifeSciencesFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ PhysicalScienceFormula_max=PhysicalScienceFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ SocialScienceFormula_max=SocialScienceFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ TacticsFormula_max=TacticsFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ TechnologyFormula_max=TechnologyFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ MechanicsFormula_max=MechanicsFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ PerceptionFormula_max=PerceptionFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ PersuasionFormula_max=PersuasionFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ PilotFormula_max=PilotFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ RideFormula_max=RideFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ StealthFormula_max=StealthFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ SurvivalFormula_max=SurvivalFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ SwimFormula_max=SwimFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ TreatInjuryFormula_max=TreatInjuryFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ UseComputerFormula_max=UseComputerFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ UsetheForceFormula_max=UsetheForceFormula_max.replace('0[Other]','?{Other Modifiers\|0}[Other]');
+ console.log("Querying other modifiers for skills");
+ }
+ else {
+ AcrobaticsFormula_max=AcrobaticsFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ AthleticsFormula_max=AthleticsFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ ClimbFormula_max=ClimbFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ DeceptionFormula_max=DeceptionFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ EnduranceFormula_max=EnduranceFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ GatherInformationFormula_max=GatherInformationFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ InitiativeFormula_max=InitiativeFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ JumpFormula_max=JumpFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ BureaucracyFormula_max=BureaucracyFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ GalacticLoreFormula_max=GalacticLoreFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ LifeSciencesFormula_max=LifeSciencesFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ PhysicalScienceFormula_max=PhysicalScienceFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ SocialScienceFormula_max=SocialScienceFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ TacticsFormula_max=TacticsFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ TechnologyFormula_max=TechnologyFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ MechanicsFormula_max=MechanicsFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ PerceptionFormula_max=PerceptionFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ PersuasionFormula_max=PersuasionFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ PilotFormula_max=PilotFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ RideFormula_max=RideFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ StealthFormula_max=StealthFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ SurvivalFormula_max=SurvivalFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ SwimFormula_max=SwimFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ TreatInjuryFormula_max=TreatInjuryFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ UseComputerFormula_max=UseComputerFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ UsetheForceFormula_max=UsetheForceFormula_max.replace('?{Other Modifiers\|0}[Other]','0[Other]');
+ console.log("Not querying other modifiers for skills");
+ }
+ setAttrs({
+ "AcrobaticsFormula_max": AcrobaticsFormula_max,
+ "AthleticsFormula_max": AthleticsFormula_max,
+ "ClimbFormula_max": ClimbFormula_max,
+ "DeceptionFormula_max": DeceptionFormula_max,
+ "EnduranceFormula_max": EnduranceFormula_max,
+ "GatherInformationFormula_max": GatherInformationFormula_max,
+ "InitiativeFormula_max": InitiativeFormula_max,
+ "JumpFormula_max": JumpFormula_max,
+ "Knowledge-BureaucracyFormula_max": BureaucracyFormula_max,
+ "Knowledge-GalacticLoreFormula_max": GalacticLoreFormula_max,
+ "Knowledge-LifeSciencesFormula_max": LifeSciencesFormula_max,
+ "Knowledge-PhysicalScienceFormula_max": PhysicalScienceFormula_max,
+ "Knowledge-SocialScienceFormula_max": SocialScienceFormula_max,
+ "Knowledge-TacticsFormula_max": TacticsFormula_max,
+ "Knowledge-TechnologyFormula_max": TechnologyFormula_max,
+ "MechanicsFormula_max": MechanicsFormula_max,
+ "PerceptionFormula_max": PerceptionFormula_max,
+ "PersuasionFormula_max": PersuasionFormula_max,
+ "PilotFormula_max": PilotFormula_max,
+ "RideFormula_max": RideFormula_max,
+ "StealthFormula_max": StealthFormula_max,
+ "SurvivalFormula_max": SurvivalFormula_max,
+ "SwimFormula_max": SwimFormula_max,
+ "TreatInjuryFormula_max": TreatInjuryFormula_max,
+ "UseComputerFormula_max": UseComputerFormula_max,
+ "UsetheForceFormula_max": UsetheForceFormula_max
});
});
});
// ====== Vehicle Sheet ====== \\
-on("change:vehicle-size", function() {
+on("change:vehicle-size change:vehicle-CapitalGrapple", function() {
VehicleSizeUpdate();
});
on("change:vehicle-DEX change:repeating_CrewAssn:vehicle-PilotMod_max change:repeating_CrewAssn:vehicle-CrewStation change:repeating_CrewAssn:vehicle-PilotMod change:repeating_CrewAssn:vehicle-PilotMisc change:repeating_CrewAssn:vehicle-InitiativeMod change:repeating_CrewAssn:vehicle-InitiativeMisc change:repeating_CrewAssn:vehicle-DeceptionDiversionMod change:repeating_CrewAssn:vehicle-DeceptionAppearanceMisc",function(){
@@ -4580,13 +5734,13 @@ var SizeUpdate = function() {
});
};
var SecondWindUpdate = function() {
- getAttrs(["hp_max","CON", "hidden_second_wind", "IsDroid"], function(values) {
+ getAttrs(["hp_max","CON", "hidden_second_wind", "NoConstitution"], function(values) {
//get the values for the two attributes, so they can used.
let hp_max = parseInt(values.hp_max)||0;
let con = parseInt(values.CON)||0;
- let droid = parseInt(values.IsDroid)||0;
+ let nocon = parseInt(values.NoConstitution)||0;
//saves the current values of the two attributes on two temporary variables, which then can be used easily in calculations.
- if(droid ==1 || Math.floor((hp_max / 4)) > con) {SecondWindValue = Math.floor((hp_max / 4));} else {SecondWindValue=con}
+ if(nocon ==1 || Math.floor((hp_max / 4)) > con) {SecondWindValue = Math.floor((hp_max / 4));} else {SecondWindValue=con}
// Selects which is higher con score of 1/4 of health
setAttrs({
"hidden_second_wind": SecondWindValue
@@ -4596,32 +5750,33 @@ var SecondWindUpdate = function() {
}
var SkillUpdate = function() {
getAttrs(["AcrobaticsFormula","AthleticsFormula","ClimbFormula","DeceptionFormula","EnduranceFormula","GatherInformationFormula","InitiativeFormula","JumpFormula","Knowledge-BureaucracyFormula","Knowledge-GalacticLoreFormula","Knowledge-LifeSciencesFormula","Knowledge-PhysicalScienceFormula","Knowledge-SocialScienceFormula","Knowledge-TacticsFormula","Knowledge-TechnologyFormula","MechanicsFormula","PerceptionFormula","PersuasionFormula","PilotFormula","RideFormula","StealthFormula","SurvivalFormula","SwimFormula","TreatInjuryFormula","UseComputerFormula","UsetheForceFormula"], function(values) {
- var AcrobaticsFormula = values.AcrobaticsFormula;
- var AthleticsFormula = values.AthleticsFormula;
- var ClimbFormula = values.ClimbFormula;
- var DeceptionFormula = values.DeceptionFormula;
- var EnduranceFormula = values.EnduranceFormula;
- var GatherInformationFormula = values.GatherInformationFormula;
- var InitiativeFormula = values.InitiativeFormula;
- var JumpFormula = values.JumpFormula;
- var BureaucracyFormula = values.Knowledge-BureaucracyFormula;
- var GalacticLoreFormula = values.Knowledge-GalacticLoreFormula;
- var LifeSciencesFormula = values.Knowledge-LifeSciencesFormula;
- var PhysicalScienceFormula = values.Knowledge-PhysicalScienceFormula;
- var SocialScienceFormula = values.Knowledge-SocialScienceFormula;
- var TacticsFormula = values.Knowledge-TacticsFormula;
- var TechnologyFormula = values.Knowledge-TechnologyFormula;
- var MechanicsFormula = values.MechanicsFormula;
- var PerceptionFormula = values.PerceptionFormula;
- var PersuasionFormula = values.PersuasionFormula;
- var PilotFormula = values.PilotFormula;
- var RideFormula = values.RideFormula;
- var StealthFormula = values.StealthFormula;
- var SurvivalFormula = values.SurvivalFormula;
- var SwimFormula = values.SwimFormula;
- var TreatInjuryFormula = values.TreatInjuryFormula;
- var UseComputerFormula = values.UseComputerFormula;
- var UsetheForceFormula = values.UsetheForceFormula;
+ let AcrobaticsFormula = values.AcrobaticsFormula;
+ let AthleticsFormula = values.AthleticsFormula;
+ let ClimbFormula = values.ClimbFormula;
+ let DeceptionFormula = values.DeceptionFormula;
+ let EnduranceFormula = values.EnduranceFormula;
+ let GatherInformationFormula = values.GatherInformationFormula;
+ let InitiativeFormula = values.InitiativeFormula;
+ let JumpFormula = values.JumpFormula;
+ let BureaucracyFormula = values['Knowledge-BureaucracyFormula'];
+ let GalacticLoreFormula = values['Knowledge-GalacticLoreFormula'];
+ let LifeSciencesFormula = values['Knowledge-LifeSciencesFormula'];
+ let PhysicalScienceFormula = values['Knowledge-PhysicalScienceFormula'];
+ let SocialScienceFormula = values['Knowledge-SocialScienceFormula'];
+ let TacticsFormula = values['Knowledge-TacticsFormula'];
+ let TechnologyFormula = values['Knowledge-TechnologyFormula'];
+ let MechanicsFormula = values.MechanicsFormula;
+ let PerceptionFormula = values.PerceptionFormula;
+ let PersuasionFormula = values.PersuasionFormula;
+ let PilotFormula = values.PilotFormula;
+ let RideFormula = values.RideFormula;
+ let StealthFormula = values.StealthFormula;
+ let SurvivalFormula = values.SurvivalFormula;
+ let SwimFormula = values.SwimFormula;
+ let TreatInjuryFormula = values.TreatInjuryFormula;
+ let UseComputerFormula = values.UseComputerFormula;
+ let UsetheForceFormula = values.UsetheForceFormula;
+ /*setAttrs({"AcrobaticsFormula": 0});*/
setAttrs({
"AcrobaticsFormula": AcrobaticsFormula,
"AthleticsFormula": AthleticsFormula,
@@ -4655,17 +5810,17 @@ var SkillUpdate = function() {
console.log("Updated skill modifiers");
};
var VehicleSizeUpdate = function() {
- getAttrs(["vehicle-size"], function(v) {
+ getAttrs(["vehicle-size","vehicle-CapitalGrapple"], function(v) {
console.log("Size = " + v["vehicle-size"])
switch (v["vehicle-size"]){
case "Colossal (station)":
- sizeMod = -10; dtSize = 500; grappleSize = 20;
+ sizeMod = -10; dtSize = 500; if(v["vehicle-CapitalGrapple"]=="1") {grappleSize = 35;} else {grappleSize = 20;}
break;
case "Colossal (cruiser)":
- sizeMod = -10; dtSize = 200; grappleSize = 20;
+ sizeMod = -10; dtSize = 200; if(v["vehicle-CapitalGrapple"]=="1") {grappleSize = 30;} else {grappleSize = 20;}
break;
case "Colossal (frigate)":
- sizeMod = -10; dtSize = 100; grappleSize = 20;
+ sizeMod = -10; dtSize = 100; if(v["vehicle-CapitalGrapple"]=="1") {grappleSize = 25;} else {grappleSize = 20;}
break;
case "Colossal":
sizeMod = -10; dtSize = 50; grappleSize = 20;
diff --git a/Star Wars Saga Edition/sheet.json b/Star Wars Saga Edition/sheet.json
index 4ee84ee068..a48a45ea70 100644
--- a/Star Wars Saga Edition/sheet.json
+++ b/Star Wars Saga Edition/sheet.json
@@ -4,7 +4,7 @@
"authors": " Alicia G (original author), Stephen C (maintainer)",
"roll20userid": "2889, 436906",
"preview": "StarWarsSagaEditionpreview.png",
- "instructions": "# Character Sheet\r Inspired by the Saga Edition sheet by Mad Irishman Productions. This sheet auto-calculates statistics using the rules as written. Most (but not all) supplement rules have been taken into account. If you feel that there is something incorrect or missing, please contact the authors. \r\r\r **Last Updated:** 10 August, 2023\r\r\r View the Wiki for the Change Log and more information on the sheet including complete list of attributes and rolls: https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet",
+ "instructions": "# Character Sheet\r Inspired by the Saga Edition sheet by Mad Irishman Productions. This sheet auto-calculates statistics using the rules as written. Most (but not all) supplement rules have been taken into account. If you feel that there is something incorrect or missing, please contact the authors. \r\r\r **Last Updated:** 31 August, 2023\r\r\r View the Wiki for the Change Log and more information on the sheet including complete list of attributes and rolls: https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet",
"legacy": false,
"printable": true
}
diff --git a/Star Wars Saga Edition/translation.json b/Star Wars Saga Edition/translation.json
index fe57fd29ee..940e973f75 100644
--- a/Star Wars Saga Edition/translation.json
+++ b/Star Wars Saga Edition/translation.json
@@ -44,7 +44,7 @@
"flatfooted":"Flatfooted",
"fortitude":"Fortitude",
"will":"Will",
-"ignore_ct":"Ignore CT?",
+"ignore_ct":"Damage Threshold ignores CT",
"damage_reduction":"Damage Reduction",
"shield_rating":"Shield Rating",
"immune":"Immune",
@@ -107,8 +107,8 @@
"use_computer":"Use Computer",
"use_the_force":"Use the Force",
"notes":"Notes",
-"athletics_house_rule":"Athletics skill house rule?",
-"skill_focus_house_rule":"Skill Focus as 1/2 level house rule?",
+"athletics_house_rule":"Athletics skill house rule",
+"skill_focus_house_rule":"Skill Focus as 1/2 level house rule",
"critical_info":"Critical Info",
"range":"Range",
"multiplier":"Multiplier",
diff --git a/dragonbane/dragonbane.html b/dragonbane/dragonbane.html
index 4c714424d9..b2e2854f54 100644
--- a/dragonbane/dragonbane.html
+++ b/dragonbane/dragonbane.html
@@ -12,17 +12,17 @@
-
-
-
-
-