From 8a2f9259148c11946dbe4c3e53b3a3efcc813f23 Mon Sep 17 00:00:00 2001 From: ChtiKenny Date: Tue, 19 Jan 2021 11:59:54 +0100 Subject: [PATCH 01/20] shifted the zero for DoF --- ShadowbaneInquisition/Shadowbane.html | 128 +++++++++++++------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html index a52fa73123..27b4335d66 100644 --- a/ShadowbaneInquisition/Shadowbane.html +++ b/ShadowbaneInquisition/Shadowbane.html @@ -65,16 +65,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -180,7 +180,7 @@
- + @@ -188,14 +188,14 @@

Unnatural Characteristics

- - + + - +

WS

@@ -450,7 +450,7 @@ - +

Athletics

@@ -463,7 +463,7 @@ - +

Awareness

@@ -477,7 +477,7 @@ - +

Charm

@@ -490,7 +490,7 @@ - +

Command

@@ -505,7 +505,7 @@ - +

Commerce

@@ -518,7 +518,7 @@ - +

Deceive

@@ -531,7 +531,7 @@ - +

Dodge

@@ -543,7 +543,7 @@ - +

Inquiry

@@ -557,7 +557,7 @@ - +

Interrogation

@@ -570,7 +570,7 @@ - +

Intimidate

@@ -583,7 +583,7 @@ - +

Logic

@@ -596,7 +596,7 @@ - +

Medicae

@@ -610,7 +610,7 @@ - +

Navigate: Surface

@@ -623,7 +623,7 @@ - +

Navigate: Stellar

@@ -636,7 +636,7 @@ - +

Navigate: Warp

@@ -649,7 +649,7 @@ - +

Operate: Aeronautica

@@ -662,7 +662,7 @@ - +

Operate: Surface

@@ -675,7 +675,7 @@ - +

Operate: Voidship

@@ -688,7 +688,7 @@ - +

Parry

@@ -700,7 +700,7 @@ - +

Psyniscience

@@ -713,7 +713,7 @@ - +

Scrutiny

@@ -726,7 +726,7 @@ - +

Security

@@ -739,7 +739,7 @@ - +

Sleight of Hand

@@ -752,7 +752,7 @@ - +

Stealth

@@ -765,7 +765,7 @@ - +

Survival

@@ -779,7 +779,7 @@ - +

Tech-Use

@@ -792,7 +792,7 @@ - +
@@ -814,7 +814,7 @@ - +
@@ -843,7 +843,7 @@
@@ -859,7 +859,7 @@
@@ -889,7 +889,7 @@
@@ -905,7 +905,7 @@
@@ -935,7 +935,7 @@
@@ -951,7 +951,7 @@
@@ -981,7 +981,7 @@
@@ -997,7 +997,7 @@
@@ -1028,7 +1028,7 @@
@@ -1045,7 +1045,7 @@
@@ -1127,7 +1127,7 @@ - +
@@ -1259,7 +1259,7 @@ - +
@@ -1686,21 +1686,21 @@ - + - + - + - + - + - + - +

CREW AND COMPLEMENT

Crew
@@ -1775,7 +1775,7 @@ - +
@@ -1907,7 +1907,7 @@ - +
@@ -2107,7 +2107,7 @@
Power Mod
-
From 0e386a5abfd0e499457e19bf7f27437c5a9cbe13 Mon Sep 17 00:00:00 2001 From: ChtiKenny Date: Fri, 22 Jan 2021 14:04:50 +0100 Subject: [PATCH 02/20] added hit roll option for psykana --- ShadowbaneInquisition/Shadowbane.css | 4 +++- ShadowbaneInquisition/Shadowbane.html | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ShadowbaneInquisition/Shadowbane.css b/ShadowbaneInquisition/Shadowbane.css index 7b8bbbd74b..491acb2927 100644 --- a/ShadowbaneInquisition/Shadowbane.css +++ b/ShadowbaneInquisition/Shadowbane.css @@ -1176,6 +1176,8 @@ ______________________________ start of Psykana tab ____________________________ .sheet-psykana_ability_gs20 { grid-area: pa20; /*color: white;*/ font-size: 12px; } .sheet-psykana_ability_gs21 { grid-area: pa21; /*color: white;*/ font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs22 { grid-area: pa22; /*color: white;*/ font-size: 12px; } +.sheet-psykana_ability_gs23 { grid-area: pa23; /*color: white;*/ font-size: 12px; padding: 0px 2px; } +.sheet-psykana_ability_gs24 { grid-area: pa24; /*color: white;*/ font-size: 12px; } .sheet-psykana_ability_grid1 { /* gs1-4, Name, Subtype */ align-items: center; @@ -1206,7 +1208,7 @@ ______________________________ start of Psykana tab ____________________________ display: grid; grid-template-columns: auto auto auto auto auto auto auto auto auto auto; grid-template-areas: - 'pa19 pa19 pa20 pa20 pa20 pa21 pa22 pa22 pa22 .'; + 'pa19 pa19 pa20 pa20 pa21 pa22 pa22 pa23 pa24 .'; } diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html index 27b4335d66..a92d0d2bd2 100644 --- a/ShadowbaneInquisition/Shadowbane.html +++ b/ShadowbaneInquisition/Shadowbane.html @@ -2107,7 +2107,7 @@
Power Mod
- @@ -2116,6 +2116,8 @@
Sustained
+
roll location?
+
From 0ed32c9b4800a8d8f635da4a58af253b0248af53 Mon Sep 17 00:00:00 2001 From: ChtiKenny Date: Sat, 23 Jan 2021 11:23:53 +0100 Subject: [PATCH 03/20] added psykana dmg type as dropdown --- ShadowbaneInquisition/Shadowbane.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html index a92d0d2bd2..f3ab35bc7e 100644 --- a/ShadowbaneInquisition/Shadowbane.html +++ b/ShadowbaneInquisition/Shadowbane.html @@ -2080,7 +2080,13 @@
Damage
Type
- +
Pen
From c4c4bbf10d0d7916eb28a2bcbeb44387806f6704 Mon Sep 17 00:00:00 2001 From: ChtiKenny Date: Tue, 26 Jan 2021 15:23:34 +0100 Subject: [PATCH 04/20] fixed inlinemod '+' problem --- ShadowbaneInquisition/Shadowbane.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html index f3ab35bc7e..ba90442164 100644 --- a/ShadowbaneInquisition/Shadowbane.html +++ b/ShadowbaneInquisition/Shadowbane.html @@ -297,7 +297,7 @@
- +

From 43d20e9c7774db1bebe8f38b42ae5c2a031d39d7 Mon Sep 17 00:00:00 2001 From: ChtiKenny Date: Tue, 26 Jan 2021 22:35:52 +0100 Subject: [PATCH 05/20] put the on.change attribute list in arrays --- ShadowbaneInquisition/Shadowbane.html | 86 ++++++++++++++------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html index ba90442164..506e8bbacc 100644 --- a/ShadowbaneInquisition/Shadowbane.html +++ b/ShadowbaneInquisition/Shadowbane.html @@ -801,13 +801,12 @@ - - - - + + + + - @@ -1052,6 +1051,7 @@
+
@@ -2210,19 +2210,20 @@ // ___________________________________________________________________________ // ____________________Movement and Weight sheet worker_______________________ // ___________________________and Fatigue Pts_________________________________ - on('sheet:opened change:size change:fatigue change:carry change:weight_total change:ws change:ws_unnat change:ws_advancement change:bs change:bs_unnat change:bs_advancement change:str change:str_unnat change:str_advancement change:tou change:tou_unnat change:tou_advancement change:int change:int_unnat change:int_advancement change:per change:per_unnat change:per_advancement change:wp change:wp_unnat change:wp_advancement change:fel change:fel_unnat change:fel_advancement change:agi change:agi_unnat change:agi_advancement change:agi_mov_mod change:armor_agi change:armor_limit', function() { - getAttrs([ - 'size', 'fatigue', 'carry', 'weight_total', - 'ws', 'ws_unnat', 'ws_advancement', - 'bs', 'bs_unnat', 'bs_advancement', - 'str', 'str_unnat', 'str_advancement', - 'tou', 'tou_unnat', 'tou_advancement', - 'int', 'int_unnat', 'int_advancement', - 'per', 'per_unnat', 'per_advancement', - 'wp', 'wp_unnat', 'wp_advancement', - 'fel', 'fel_unnat', 'fel_advancement', - 'agi', 'agi_unnat', 'agi_advancement', 'agi_mov_mod', 'armor_agi', 'armor_limit' - ], function(values) { + let fieldsMWF = [ + 'size', 'fatigue', 'carry', 'weight_total', + 'ws', 'ws_unnat', 'ws_advancement', + 'bs', 'bs_unnat', 'bs_advancement', + 'str', 'str_unnat', 'str_advancement', + 'tou', 'tou_unnat', 'tou_advancement', + 'int', 'int_unnat', 'int_advancement', + 'per', 'per_unnat', 'per_advancement', + 'wp', 'wp_unnat', 'wp_advancement', + 'fel', 'fel_unnat', 'fel_advancement', + 'agi', 'agi_unnat', 'agi_advancement', 'agi_mov_mod', 'armor_agi', 'armor_limit' + ]; + on('sheet:opened ' + fieldsMWF.map(field => 'change:' + field).join(' '), function() { + getAttrs(fieldsMWF, function(values) { // SIZE var size = parseInt(values['size'], 10) || 0; // FATIGUE @@ -2402,13 +2403,14 @@ // ___________________________________________________________________________ // ________________________Fatigue and Armor sheet worker_____________________ // ___________________________________________________________________________ - on('sheet:opened change:tou change:tou_unnat change:tou_advancement change:wp change:wp_unnat change:wp_advancement change:armor_head change:armor_arm_right change:armor_body change:armor_arm_left change:armor_leg_right change:armor_leg_left change:fatigue_mod', function() { - getAttrs([ + let fieldsFA = [ 'fatigue_mod', - 'tou', 'tou_unnat', 'tou_advancement', - 'wp', 'wp_unnat', 'wp_advancement', - 'armor_head', 'armor_arm_right', 'armor_body', 'armor_arm_left', 'armor_leg_right', 'armor_leg_left' - ], function(values) { + 'tou', 'tou_unnat', 'tou_advancement', + 'wp', 'wp_unnat', 'wp_advancement', + 'armor_head', 'armor_arm_right', 'armor_body', 'armor_arm_left', 'armor_leg_right', 'armor_leg_left' + ]; + on('sheet:opened ' + fieldsFA.map(field => 'change:' + field).join(' '), function() { + getAttrs(fieldsFA, function(values) { var fatigue_mod = parseInt(values['fatigue_mod'], 10) || 0; var tou = parseInt(values['tou'], 10) || 0; var tou_unnat = parseInt(values['tou_unnat'], 10) || 0; @@ -2416,24 +2418,24 @@ var wp = parseInt(values['wp'], 10) || 0; var wp_unnat = parseInt(values['wp_unnat'], 10) || 0; var wp_advancement = parseInt(values['wp_advancement'], 10) || 0; - var tou_mod = Math.floor((tou + tou_advancement) / 10 + tou_unnat); - var wp_mod = Math.floor((wp + wp_advancement) / 10 + wp_unnat); - var armor_head = parseInt(values['armor_head'], 10) || 0; - var armor_arm_right = parseInt(values['armor_arm_right'], 10) || 0; - var armor_body = parseInt(values['armor_body'], 10) || 0; - var armor_arm_left = parseInt(values['armor_arm_left'], 10) || 0; - var armor_leg_right = parseInt(values['armor_leg_right'], 10) || 0; - var armor_leg_left = parseInt(values['armor_leg_left'], 10) || 0; + var tou_mod = Math.floor((tou + tou_advancement) / 10 + tou_unnat); + var wp_mod = Math.floor((wp + wp_advancement) / 10 + wp_unnat); + var armor_head = parseInt(values['armor_head'], 10) || 0; + var armor_arm_right = parseInt(values['armor_arm_right'], 10) || 0; + var armor_body = parseInt(values['armor_body'], 10) || 0; + var armor_arm_left = parseInt(values['armor_arm_left'], 10) || 0; + var armor_leg_right = parseInt(values['armor_leg_right'], 10) || 0; + var armor_leg_left = parseInt(values['armor_leg_left'], 10) || 0; // normal, no modifiers ___________________________________________________ setAttrs({ - soak_head: (armor_head + tou_mod), - soak_arm_right: (armor_arm_right + tou_mod), - soak_body: (armor_body + tou_mod), - soak_arm_left: (armor_arm_left + tou_mod), - soak_leg_right: (armor_leg_right + tou_mod), - soak_leg_left: (armor_leg_left + tou_mod), - fatigue_max: (tou_mod + wp_mod + fatigue_mod) + soak_head: (armor_head + tou_mod), + soak_arm_right: (armor_arm_right + tou_mod), + soak_body: (armor_body + tou_mod), + soak_arm_left: (armor_arm_left + tou_mod), + soak_leg_right: (armor_leg_right + tou_mod), + soak_leg_left: (armor_leg_left + tou_mod), + fatigue_max: (tou_mod + wp_mod + fatigue_mod) }); }); @@ -2537,9 +2539,9 @@ // ___________________________________________________________________________ // _______________________psychic info sheet worker___________________________ // ___________________________________________________________________________ - - on('sheet:opened change:psykana_class change:psykana_limit change:psy_push change:psy_rating change:psykana_sustain change:psykana_sustain_count', function() { - getAttrs(['psykana_class', 'psykana_limit', 'psy_push', 'psy_rating','psykana_sustain','psykana_sustain_count'], function(values) { + let fieldsPsy = ['psykana_class', 'psykana_limit', 'psy_push', 'psy_rating','psykana_sustain','psykana_sustain_count']; + on('sheet:opened ' + fieldsPsy.map(field => 'change:' + field).join(' '), function() { + getAttrs(fieldsPsy, function(values) { var psykana_class = parseInt(values['psykana_class'])||0; var psykana_limit = parseInt(values['psykana_limit'])||0; var psy_push = parseInt(values['psy_push'])||0; From 90f078e2713d27766d826570d5b4666e312594ac Mon Sep 17 00:00:00 2001 From: ChtiKenny Date: Wed, 27 Jan 2021 11:51:52 +0100 Subject: [PATCH 06/20] started skill unnat bonus --- ShadowbaneInquisition/Shadowbane.html | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html index 506e8bbacc..8bf29b42f6 100644 --- a/ShadowbaneInquisition/Shadowbane.html +++ b/ShadowbaneInquisition/Shadowbane.html @@ -2184,14 +2184,13 @@ -