-
NAME:
-
+
+
@@ -19916,12 +20260,11 @@ on('change:close_changelog', function() {
'changelog_1.0.0': 'on',
});
});
- const stdProgress = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten' ]
-const vowProgress = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ]
+ const stdProgress = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
-on('change:repeating_progress:mark_progress change:repeating_vow:mark_progress change:repeating_sites:mark_progress', function(values) {
+on('change:repeating_progress:mark_progress change:repeating_vow:mark_progress change:repeating_connection:mark_progress', function(values) {
const type = values.sourceAttribute.match(/repeating_(.*?)_/)[1];
- const progressStrings = type === 'vow' ? vowProgress : stdProgress;
+ const progressStrings = stdProgress
const rankValue = `repeating_${type}_rank`;
const progressBoxAttrs = [
`repeating_${type}_progress_${progressStrings[0]}`,
@@ -20002,9 +20345,9 @@ function chosenDifficulty (rank) {
}
}
-on('change:repeating_progress:clear_progress change:repeating_vow:clear_progress change:repeating_sites:clear_progress', function(values) {
+on('change:repeating_progress:clear_progress change:repeating_vow:clear_progress change:repeating_connection:clear_progress', function(values) {
const type = values.sourceAttribute.match(/repeating_(.*?)_/)[1]
- const progressStrings = type === 'vow' ? vowProgress : stdProgress
+ const progressStrings = stdProgress
setAttrs({
['repeating_' + type + '_progress_' + progressStrings[0]]: '0',
@@ -20061,12 +20404,12 @@ on('change:supply', function(eventinfo) {
});
if (parseInt(eventinfo.newValue) === 0) setAttrs({impactUnprepared: "on"});
});
- on("remove:repeating_vow remove:repeating_bonds remove:repeating_progress remove:repeating_assets", function() {
+ on("remove:repeating_vow remove:repeating_connection remove:repeating_progress remove:repeating_assets", function() {
const timestamp = Number(new Date());
setAttrs({ repeat_delete: timestamp });
-});on('change:repeating_bonds:details_button', function(eventinfo) {
+});on('change:repeating_connection:details_button', function(eventinfo) {
setAttrs({
- repeating_bonds_details: eventinfo.newValue,
+ repeating_connection_details: eventinfo.newValue,
});
});
on('change:clear_legacy_quests_button change:clear_legacy_bonds_button change:clear_legacy_discoveries_button', function(values) {
diff --git a/Ironsworn-Starforged/src/app/Ironsworn-starforged.styl b/Ironsworn-Starforged/src/app/Ironsworn-starforged.styl
index 09188a57bf..2e557131ad 100644
--- a/Ironsworn-Starforged/src/app/Ironsworn-starforged.styl
+++ b/Ironsworn-Starforged/src/app/Ironsworn-starforged.styl
@@ -462,7 +462,7 @@
// Components
@import './components/resources/resources'
@import './components/impacts/impacts'
- @import './components/bonds/bonds'
+ @import './components/connections/connections'
@import './components/vows/vows'
@import './components/progress/progress'
@import './components/nav/nav-bar'
diff --git a/Ironsworn-Starforged/src/app/components/bonds/bonds.pug b/Ironsworn-Starforged/src/app/components/bonds/bonds.pug
deleted file mode 100644
index d29a6c600d..0000000000
--- a/Ironsworn-Starforged/src/app/components/bonds/bonds.pug
+++ /dev/null
@@ -1,29 +0,0 @@
-//-
- Generates a repeating fieldset for bonds.
- Expands when clicking the DETAILS label.
-
- @mixin
- @outputs repeating html fieldset
-
- @memberof components/bonds
-
-mixin bonds()
- .bond-component
- fieldset.repeating_bonds
- .bond-container
- p.bond-title NAME:
- input.border-bottom.bond-name(type='text' name='attr_bond-name' placeholder='Name')
- label.btn.details-btn
- input.hide-element.btn-input(type='checkbox' name='attr_details_button')
- .btn-content DETAILS
-
- input.hide-element.show-bond-info(type='checkbox' name='attr_details')
- .show-bond-info.showhide
- .full-width
- p.bond-title LOCATION:
- input.bond-location.border-bottom(type='text' name='attr_bond-location' placeholder='Location')
- .full-width
- p.bond-title DESCRIPTORS:
- input.bond-descriptors.border-bottom(type='text' name='attr_bond-descriptors' placeholder='Descriptors')
- .full-width
- textarea.bond-notes(name='attr_bond-notes')
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/components/bonds/track.pug b/Ironsworn-Starforged/src/app/components/bonds/track.pug
deleted file mode 100644
index 5fd16da5a1..0000000000
--- a/Ironsworn-Starforged/src/app/components/bonds/track.pug
+++ /dev/null
@@ -1,16 +0,0 @@
-- var track = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
-include ../progress/mixins/box
-
-mixin bondsTrack()
- .bonds-track
- .progress-row
- div
- each index in track
- +progressBoxComplex(`attr_bond-${index}`)
- input(
- type="text"
- class="hide-element"
- name="attr_bond-filled"
- value="floor((@{bond-0}+@{bond-1}+@{bond-2}+@{bond-3}+@{bond-4}+@{bond-5}+@{bond-6}+@{bond-7}+@{bond-8}+@{bond-9})/4)"
- disabled="true"
- )
diff --git a/Ironsworn-Starforged/src/app/components/connections/connections.pug b/Ironsworn-Starforged/src/app/components/connections/connections.pug
new file mode 100644
index 0000000000..3a4f098e38
--- /dev/null
+++ b/Ironsworn-Starforged/src/app/components/connections/connections.pug
@@ -0,0 +1,32 @@
+include ../progress/mixins/box
+
+mixin connections()
+ .connection-component
+ fieldset.repeating_connection
+ .connection-container
+ p.connection-title NAME:
+ input.border-bottom.connection-name(type='text' name='attr_connection-name' placeholder='Name')
+ label.btn.details-btn
+ input.hide-element.btn-input(type='checkbox' name='attr_details_button')
+ .btn-content DETAILS
+
+ input.hide-element.show-connection-info(type='checkbox' name='attr_details')
+ .show-connection-info.showhide
+ .full-width
+ p.connection-title LOCATION:
+ input.connection-location.border-bottom(type='text' name='attr_connection-location' placeholder='Location')
+ .full-width
+ p.connection-title DESCRIPTORS:
+ input.connection-descriptors.border-bottom(type='text' name='attr_connection-descriptors' placeholder='Descriptors')
+ .full-width
+ .progress-header
+ each difficulty, index in difficulties
+ label.difficulty
+ if difficulty.checked
+ input(type="radio" class="hide-element" name="attr_rank" value=index checked)
+ else
+ input(type="radio" class="hide-element" name="attr_rank" value=index)
+ h5=difficulty.text
+ +progressTrack(track, 'connection-name')
+ .full-width
+ textarea.connection-notes(name='attr_connection-notes')
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/components/bonds/bonds.styl b/Ironsworn-Starforged/src/app/components/connections/connections.styl
similarity index 75%
rename from Ironsworn-Starforged/src/app/components/bonds/bonds.styl
rename to Ironsworn-Starforged/src/app/components/connections/connections.styl
index ecfff6c505..7957438b36 100644
--- a/Ironsworn-Starforged/src/app/components/bonds/bonds.styl
+++ b/Ironsworn-Starforged/src/app/components/connections/connections.styl
@@ -5,10 +5,10 @@
.progress-row
grid-template-columns: 0px repeat(10, 43.5px) 110px;
-.bonds
+.connections
margin-bottom 0px
-.bond-component
+.connection-component
margin-top 1em
.bond
@@ -17,33 +17,33 @@
justify-content center
align-items center
-.bond-container
+.connection-container
border 2px solid #4C4D4F
border-radius 1em
margin-bottom 1em
padding 0.5em 1em
-.bond-notes
+.connection-notes
width 98.5%
resize vertical
-.bond-name,
-.bond-location,
-.bond-descriptors
+.connection-name,
+.connection-location,
+.connection-descriptors
border none
border-radius 0em
background transparent
padding 0
padding-left 0.5em
-.bond-descriptors
+.connection-descriptors
width 43%
-.bond-location
+.connection-location
width 40%
p
- &.bond-title
+ &.connection-title
text-align left
font-weight bold
margin 0 0 0px
@@ -62,12 +62,12 @@ p
margin 0.3em 0.5em
border-radius 2em
-.bond-name::placeholder,
-.bond-location::placeholder,
-.bond-descriptors::placeholder
+.connection-name::placeholder,
+.connection-location::placeholder,
+.connection-descriptors::placeholder
color #8a8a8a
-input[type="checkbox"].show-bond-info
+input[type="checkbox"].show-connection-info
width 4.5em
height 18px
top 0
@@ -76,12 +76,12 @@ input[type="checkbox"].show-bond-info
padding 2px 4px
&:checked
& ~ div
- &.show-bond-info
+ &.show-connection-info
display flex
flex-flow row wrap
show-hide()
& ~ span
- &.show-bond-info
+ &.show-connection-info
border-radius 0
padding 2px 4px
border 1px solid
@@ -89,7 +89,7 @@ input[type="checkbox"].show-bond-info
color #fff
&:hover
& ~ span
- &.show-bond-info
+ &.show-connection-info
border-radius 0
padding 2px 4px
background-color #ccc
@@ -97,7 +97,7 @@ input[type="checkbox"].show-bond-info
transition 0.5s ease
span
- &.show-bond-info
+ &.show-connection-info
margin-left -4.9em
border-radius 0
padding 2px 4px
diff --git a/Ironsworn-Starforged/src/app/components/legacies/tracks.pug b/Ironsworn-Starforged/src/app/components/legacies/tracks.pug
index 25d57525e5..9b8102b2a5 100644
--- a/Ironsworn-Starforged/src/app/components/legacies/tracks.pug
+++ b/Ironsworn-Starforged/src/app/components/legacies/tracks.pug
@@ -1,7 +1,6 @@
include ../progress/mixins/box
- var legacies = [ 'quests', 'bonds', 'discoveries' ]
-- var track = [ 1, 2 , 3, 4, 5, 6, 7, 8, 9, 10]
//-
@mixin
diff --git a/Ironsworn-Starforged/src/app/components/progress/mixins/box.pug b/Ironsworn-Starforged/src/app/components/progress/mixins/box.pug
index 8aec9fd8bf..c3a0490b6a 100644
--- a/Ironsworn-Starforged/src/app/components/progress/mixins/box.pug
+++ b/Ironsworn-Starforged/src/app/components/progress/mixins/box.pug
@@ -13,8 +13,8 @@ mixin progressTrack(track, name)
input(class="mark-vow hide-element" type="checkbox" name="attr_mark_progress")
label.btn CLEAR
input(class="clear-vow hide-element" type="checkbox" name="attr_clear_progress")
- each index in track
- +progressBoxComplex(`attr_progress_${index}`)
+ each value in track
+ +progressBoxComplex(`attr_progress_${value}`)
div
label.btn CONCLUDE
button(
@@ -23,7 +23,7 @@ mixin progressTrack(track, name)
name="rollProgress"
value=`&{template:starforged_progress} {{progress_name=@{${name}}}} {{progress=[[@{progress-filled}]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}}`
)
- input.hide-element(type='text' name='attr_progress-filled' value='floor((@{progress_one}+@{progress_two}+@{progress_three}+@{progress_four}+@{progress_five}+@{progress_six}+@{progress_seven}+@{progress_eight}+@{progress_nine}+@{progress_ten})/4)' disabled='true')
+ input.hide-element(type='text' name='attr_progress-filled' value=`floor((@{progress_${track[0]}}+@{progress_${track[1]}}+@{progress_${track[2]}}+@{progress_${track[3]}}+@{progress_${track[4]}}+@{progress_${track[5]}}+@{progress_${track[6]}}+@{progress_${track[7]}}+@{progress_${track[8]}}+@{progress_${track[9]}})/4)` disabled='true')
mixin progressBoxComplex(attribute_name)
.progress-input-holder
diff --git a/Ironsworn-Starforged/src/app/components/progress/progress.pug b/Ironsworn-Starforged/src/app/components/progress/progress.pug
index 92f8b0504a..0527884d2e 100644
--- a/Ironsworn-Starforged/src/app/components/progress/progress.pug
+++ b/Ironsworn-Starforged/src/app/components/progress/progress.pug
@@ -1,5 +1,5 @@
-- var track = [ 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten' ]
- var challenge = [ 'one', 'two', 'three', 'four' ]
+
include ./mixins/box
fieldset.repeating_progress
diff --git a/Ironsworn-Starforged/src/app/components/vows/vow-container.pug b/Ironsworn-Starforged/src/app/components/vows/vow-container.pug
index 8707fdf832..6b51a57213 100644
--- a/Ironsworn-Starforged/src/app/components/vows/vow-container.pug
+++ b/Ironsworn-Starforged/src/app/components/vows/vow-container.pug
@@ -1,9 +1,5 @@
include ../progress/mixins/box
-- var track = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
-- var menaceTrack = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
-- var legacyVows = [ 1, 2, 3, 4, 5 ]
-
mixin input(id, nameValue)
input(
type="text"
@@ -50,6 +46,6 @@ mixin repeatingVow()
type="text"
class="hide-element"
name="attr_vow-filled"
- value="floor((@{progress_0}+@{progress_1}+@{progress_2}+@{progress_3}+@{progress_4}+@{progress_5}+@{progress_6}+@{progress_7}+@{progress_8}+@{progress_9})/4)"
+ value=`floor((@{progress_${track[0]}}+@{progress_${track[1]}}+@{progress_${track[2]}}+@{progress_${track[3]}}+@{progress_${track[4]}}+@{progress_${track[5]}}+@{progress_${track[6]}}+@{progress_${track[7]}}+@{progress_${track[8]}}+@{progress_${track[9]}})/4)`
disabled
)
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/data/pages.json b/Ironsworn-Starforged/src/app/data/pages.json
index 190de71690..36253239a5 100644
--- a/Ironsworn-Starforged/src/app/data/pages.json
+++ b/Ironsworn-Starforged/src/app/data/pages.json
@@ -4,7 +4,7 @@
{ "id": "4", "text": "progress" },
{ "id": "7", "text": "oracles" },
{ "id": "6", "text": "moves" },
- { "id": "3", "text": "bonds" },
+ { "id": "3", "text": "connections" },
{ "id": "10", "text": "legacies" }
],
[
@@ -17,7 +17,7 @@
[
{ "id": "2", "text": "vows", "checked": true},
{ "id": "4", "text": "progress" },
- { "id": "3", "text": "bonds" }
+ { "id": "3", "text": "connections" }
]
]
}
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/data/track.json b/Ironsworn-Starforged/src/app/data/track.json
new file mode 100644
index 0000000000..6de2546904
--- /dev/null
+++ b/Ironsworn-Starforged/src/app/data/track.json
@@ -0,0 +1 @@
+[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/pages/character/index.pug b/Ironsworn-Starforged/src/app/pages/character/index.pug
index 04d67614c8..f77c3614d4 100644
--- a/Ironsworn-Starforged/src/app/pages/character/index.pug
+++ b/Ironsworn-Starforged/src/app/pages/character/index.pug
@@ -1,6 +1,6 @@
include ../../components/nav/nav-bar
include ../../components/resources/resources
-include ../common/bonds
+include ../common/connections
include ../common/vows
include ../common/progress
include ./moves
@@ -22,7 +22,7 @@ include ./legacies
//- Pages
+summaryPage
-+bondsPage(type)
++connectionsPage(type)
+vowsPage(type)
+assetsPage
+movesPage
diff --git a/Ironsworn-Starforged/src/app/pages/common/bonds.pug b/Ironsworn-Starforged/src/app/pages/common/bonds.pug
deleted file mode 100644
index 5c2b6a3005..0000000000
--- a/Ironsworn-Starforged/src/app/pages/common/bonds.pug
+++ /dev/null
@@ -1,8 +0,0 @@
-include ../../components/bonds/track
-include ../../components/bonds/bonds
-
-mixin bondsPage(sheetType)
- div.page-container
- input(type='radio' name=`attr_${sheetType}_page` class='bonds hide-element' value='3')
- div.bonds.showhide
- +bonds
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/pages/common/connections.pug b/Ironsworn-Starforged/src/app/pages/common/connections.pug
new file mode 100644
index 0000000000..2a44f3cbad
--- /dev/null
+++ b/Ironsworn-Starforged/src/app/pages/common/connections.pug
@@ -0,0 +1,7 @@
+include ../../components/connections/connections
+
+mixin connectionsPage(sheetType)
+ div.page-container
+ input(type='radio' name=`attr_${sheetType}_page` class='connections hide-element' value='3')
+ div.connections.showhide
+ +connections
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/pages/index.styl b/Ironsworn-Starforged/src/app/pages/index.styl
index 25cf162ecf..6237d2ad24 100644
--- a/Ironsworn-Starforged/src/app/pages/index.styl
+++ b/Ironsworn-Starforged/src/app/pages/index.styl
@@ -68,7 +68,7 @@ div.mode
.mode-image
display flex
-input[type=radio].bonds:checked ~ div.bonds,
+input[type=radio].connections:checked ~ div.connections,
input[type=radio].summary:checked ~ div.summary,
input[type=radio].vows:checked ~ div.vows,
input[type=radio].assets:checked ~ div.assets,
diff --git a/Ironsworn-Starforged/src/app/pages/shared/index.pug b/Ironsworn-Starforged/src/app/pages/shared/index.pug
index f4895fe939..70963e0b06 100644
--- a/Ironsworn-Starforged/src/app/pages/shared/index.pug
+++ b/Ironsworn-Starforged/src/app/pages/shared/index.pug
@@ -1,7 +1,7 @@
include ../../components/nav/nav-bar
include ../../components/resources/resources
include ../common/vows
-include ../common/bonds
+include ../common/connections
include ../common/progress
- var type = 'shared'
@@ -12,5 +12,5 @@ div.header
//- Pages
+navBar(type)
+vowsPage(type)
-+bondsPage(type)
++connectionsPage(type)
+progressPage(type)
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/workers/Ironsworn.pug b/Ironsworn-Starforged/src/app/workers/Ironsworn.pug
index fbe7845f35..4c8605d023 100644
--- a/Ironsworn-Starforged/src/app/workers/Ironsworn.pug
+++ b/Ironsworn-Starforged/src/app/workers/Ironsworn.pug
@@ -7,6 +7,6 @@ script(type="text/worker")
include ./scripts/progress.js
include ./scripts/stats.js
include ./scripts/vows.js
- include ./scripts/bonds.js
+ include ./scripts/connections.js
include ./scripts/legacies.js
include ./scripts/impacts.js
\ No newline at end of file
diff --git a/Ironsworn-Starforged/src/app/workers/scripts/bonds.js b/Ironsworn-Starforged/src/app/workers/scripts/bonds.js
deleted file mode 100644
index e1228b6e1e..0000000000
--- a/Ironsworn-Starforged/src/app/workers/scripts/bonds.js
+++ /dev/null
@@ -1,5 +0,0 @@
-on('change:repeating_bonds:details_button', function(eventinfo) {
- setAttrs({
- repeating_bonds_details: eventinfo.newValue,
- });
-});
diff --git a/Ironsworn-Starforged/src/app/workers/scripts/connections.js b/Ironsworn-Starforged/src/app/workers/scripts/connections.js
new file mode 100644
index 0000000000..c38725715a
--- /dev/null
+++ b/Ironsworn-Starforged/src/app/workers/scripts/connections.js
@@ -0,0 +1,5 @@
+on('change:repeating_connection:details_button', function(eventinfo) {
+ setAttrs({
+ repeating_connection_details: eventinfo.newValue,
+ });
+});
diff --git a/Ironsworn-Starforged/src/app/workers/scripts/progress.js b/Ironsworn-Starforged/src/app/workers/scripts/progress.js
index 737e971df5..78e4ffe5f7 100644
--- a/Ironsworn-Starforged/src/app/workers/scripts/progress.js
+++ b/Ironsworn-Starforged/src/app/workers/scripts/progress.js
@@ -1,9 +1,8 @@
-const stdProgress = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten' ]
-const vowProgress = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ]
+const stdProgress = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
-on('change:repeating_progress:mark_progress change:repeating_vow:mark_progress change:repeating_sites:mark_progress', function(values) {
+on('change:repeating_progress:mark_progress change:repeating_vow:mark_progress change:repeating_connection:mark_progress', function(values) {
const type = values.sourceAttribute.match(/repeating_(.*?)_/)[1];
- const progressStrings = type === 'vow' ? vowProgress : stdProgress;
+ const progressStrings = stdProgress
const rankValue = `repeating_${type}_rank`;
const progressBoxAttrs = [
`repeating_${type}_progress_${progressStrings[0]}`,
@@ -84,9 +83,9 @@ function chosenDifficulty (rank) {
}
}
-on('change:repeating_progress:clear_progress change:repeating_vow:clear_progress change:repeating_sites:clear_progress', function(values) {
+on('change:repeating_progress:clear_progress change:repeating_vow:clear_progress change:repeating_connection:clear_progress', function(values) {
const type = values.sourceAttribute.match(/repeating_(.*?)_/)[1]
- const progressStrings = type === 'vow' ? vowProgress : stdProgress
+ const progressStrings = stdProgress
setAttrs({
['repeating_' + type + '_progress_' + progressStrings[0]]: '0',
diff --git a/Ironsworn-Starforged/src/app/workers/scripts/vows.js b/Ironsworn-Starforged/src/app/workers/scripts/vows.js
index 0a6ea8fc8a..be2ca89de4 100644
--- a/Ironsworn-Starforged/src/app/workers/scripts/vows.js
+++ b/Ironsworn-Starforged/src/app/workers/scripts/vows.js
@@ -1,4 +1,4 @@
-on("remove:repeating_vow remove:repeating_bonds remove:repeating_progress remove:repeating_assets", function() {
+on("remove:repeating_vow remove:repeating_connection remove:repeating_progress remove:repeating_assets", function() {
const timestamp = Number(new Date());
setAttrs({ repeat_delete: timestamp });
});
\ No newline at end of file
diff --git a/Ironsworn-Starforged/translation.json b/Ironsworn-Starforged/translation.json
index 7fde6116bf..3d12cbe39b 100644
--- a/Ironsworn-Starforged/translation.json
+++ b/Ironsworn-Starforged/translation.json
@@ -14,7 +14,7 @@
"nav-sites": "Sites",
"nav-progress": "Progress",
"nav-oracles": "Oracles",
- "nav-bonds": "Bonds",
+ "nav-connections": "Connections",
"nav-settings": "Settings",
"nav-moves": "Moves",
"nav-summary": "Summary",