diff --git a/Esper_Genesis_5E/EG_Sheet.css b/Esper_Genesis_5E/EG_Sheet.css
index 75dcace477..fdc270baf4 100644
--- a/Esper_Genesis_5E/EG_Sheet.css
+++ b/Esper_Genesis_5E/EG_Sheet.css
@@ -61,7 +61,7 @@ input[type=radio].sheet-npc-button + span {
.sheet-advantagetoggle {
position: absolute;
top: 92px;
- left: 570px;
+ left: 440px;
z-index: 1;
}
.sheet-advantagetoggle input[type=radio] {
@@ -122,7 +122,7 @@ input[type=radio].sheet-tab-button:checked + span, .sheet-advantagetoggle input[
}
.sheet-whispertoggle {
- left: 270px;
+ left: 150px;
}
.sheet-advantagetoggle.sheet-whispertoggle input.sheet-toggle-right {
@@ -5942,14 +5942,14 @@ div.sheet-charmancer.sheet-licensedsheet .sheet-logos {
flex-flow: column;
margin-bottom: 1em;
}
-div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ * .sheet-logos, div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ .sheet-logos {
+div.sheet-charmancer .sheet-logos, div.sheet-charmancer .sheet-logos {
display: flex;
width: 100%;
text-align: center;
flex-flow: column;
margin-bottom: 1em;
}
-div.sheet-charmancer.sheet-licensedsheet .sheet-charmancer-logo {
+div.sheet-charmancer .sheet-charmancer-logo {
margin: 0 auto;
background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/charactermancer-1.png");
background-position: center;
@@ -5959,7 +5959,7 @@ div.sheet-charmancer.sheet-licensedsheet .sheet-charmancer-logo {
width: 70%;
height: 5em;
}
-div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ * .sheet-charmancer-logo, div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ .sheet-charmancer-logo {
+div.sheet-charmancer .sheet-charmancer-logo, div.sheet-charmancer .sheet-charmancer-logo {
margin: 0 auto;
background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/charactermancer-1.png");
background-position: center;
@@ -5971,7 +5971,7 @@ div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ * .sheet-charman
}
div.sheet-charmancer.sheet-licensedsheet .sheet-compendium-logo {
margin: 0 auto;
- background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/DnDlogored.png");
+ background: url("https://raw.githubusercontent.com/skydawn1/esper_genesis/master/EG_Logo.png");
background-position: center;
background-size: contain;
background-repeat: no-repeat;
@@ -5979,9 +5979,9 @@ div.sheet-charmancer.sheet-licensedsheet .sheet-compendium-logo {
width: 50%;
height: 3em;
}
-div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ * .sheet-compendium-logo, div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ .sheet-compendium-logo {
+div.sheet-charmancer .sheet-compendium-logo, div.sheet-charmancer .sheet-compendium-logo {
margin: 0 auto;
- background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/DnDlogored.png");
+ background: url("https://raw.githubusercontent.com/skydawn1/esper_genesis/master/EG_Logo.png");
background-position: center;
background-size: contain;
background-repeat: no-repeat;
diff --git a/Esper_Genesis_5E/EG_Sheet.html b/Esper_Genesis_5E/EG_Sheet.html
index dcf9879c06..3800575937 100644
--- a/Esper_Genesis_5E/EG_Sheet.html
+++ b/Esper_Genesis_5E/EG_Sheet.html
@@ -6784,7 +6784,7 @@
@@ -6985,12 +6985,12 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -11913,7 +11801,7 @@ var processDrop = function(page, currentData, repeating, looped) {
clearRepeatingSections("background_holder");
}
- if(eventinfo.newValue === "Rules::Personality%20and%20Background") {
+ if(eventinfo.newValue === "Rules:Personality%20and%20Background") {
//Clears saved data for this field
getCompendiumPage("");
setAttrs(reset, function() {
@@ -13739,6 +13627,12 @@ var processDrop = function(page, currentData, repeating, looped) {
profs.all[slide.values[sectionid + "_type"]].push(slide.values[sectionid + "_custom"])
}
}
+ if(value == "custom" && name.includes('language_choice')) {
+ const customValueAttribute = name.replace('language_choice', 'language_custom')
+ if(slide.values[customValueAttribute]) {
+ profs.all['Language'].push(slide.values[customValueAttribute]);
+ }
+ }
})
});
//Set up drops. start with class, subclass, race, subrace, background
@@ -13880,7 +13774,7 @@ var processDrop = function(page, currentData, repeating, looped) {
}
//set up background drop
if(data["l1-background"].values.background) {
- if(data["l1-background"].values.background == "Rules::Personality%20and%20Backgrounds") {
+ if(data["l1-background"].values.background == "Rules:Personality%20and%20Backgrounds") {
var customBg = {name: removeExpansionInfo(data["l1-background"].values["background_name"]), data: {Category: "Backgrounds", blobs:{}}};
if(customtraits.background.length > 0) {
customBg.data.theseblobs = ["customblob"];
diff --git a/Esper_Genesis_5E/EG_Sheet.sass b/Esper_Genesis_5E/EG_Sheet.sass
index ad5f28437f..4aa5f52d3f 100644
--- a/Esper_Genesis_5E/EG_Sheet.sass
+++ b/Esper_Genesis_5E/EG_Sheet.sass
@@ -60,7 +60,7 @@ input[type=radio]
.sheet-advantagetoggle
position: absolute
top: 92px
- left: 570px
+ left: 440px
z-index: 1
input[type=radio]
@@ -119,7 +119,7 @@ input[type=radio].sheet-tab-button:checked + span, .sheet-advantagetoggle input[
width: 110px
.sheet-whispertoggle
- left: 270px
+ left: 150px
.sheet-advantagetoggle.sheet-whispertoggle input
&.sheet-toggle-right
@@ -5837,8 +5837,7 @@ div.sheet-charmancer
flex-flow: column
margin-bottom: 1em
- div.sheet-licensedsheet-flag:not(:empty) ~
- * .sheet-logos, .sheet-logos
+ .sheet-logos, .sheet-logos
display: -webkit-box
display: -ms-flexbox
display: flex
@@ -5850,7 +5849,7 @@ div.sheet-charmancer
flex-flow: column
margin-bottom: 1em
- &.sheet-licensedsheet .sheet-charmancer-logo
+ .sheet-charmancer-logo
margin: 0 auto
background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/charactermancer-1.png")
background-position: center
@@ -5862,8 +5861,7 @@ div.sheet-charmancer
width: 70%
height: 5em
- div.sheet-licensedsheet-flag:not(:empty) ~
- * .sheet-charmancer-logo, .sheet-charmancer-logo
+ .sheet-charmancer-logo, .sheet-charmancer-logo
margin: 0 auto
background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/charactermancer-1.png")
background-position: center
@@ -5877,7 +5875,7 @@ div.sheet-charmancer
&.sheet-licensedsheet .sheet-compendium-logo
margin: 0 auto
- background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/DnDlogored.png")
+ background: url("https://raw.githubusercontent.com/skydawn1/esper_genesis/master/EG_Logo.png")
background-position: center
background-size: contain
background-repeat: no-repeat
@@ -5887,10 +5885,9 @@ div.sheet-charmancer
width: 50%
height: 3em
- div.sheet-licensedsheet-flag:not(:empty) ~
- * .sheet-compendium-logo, .sheet-compendium-logo
+ .sheet-compendium-logo, .sheet-compendium-logo
margin: 0 auto
- background: url("https://raw.githubusercontent.com/mperes/Images-for-Roll20-5E-images/master/licensedsheet/DnDlogored.png")
+ background: url("https://raw.githubusercontent.com/skydawn1/esper_genesis/master/EG_Logo.png")
background-position: center
background-size: contain
background-repeat: no-repeat
diff --git a/Esper_Genesis_5E/src/charactermancer/l1/l1.js b/Esper_Genesis_5E/src/charactermancer/l1/l1.js
index 9f8ba84f61..c8279b5a5c 100644
--- a/Esper_Genesis_5E/src/charactermancer/l1/l1.js
+++ b/Esper_Genesis_5E/src/charactermancer/l1/l1.js
@@ -1665,7 +1665,7 @@
clearRepeatingSections("background_holder");
}
- if(eventinfo.newValue === "Rules::Personality%20and%20Background") {
+ if(eventinfo.newValue === "Rules:Personality%20and%20Background") {
//Clears saved data for this field
getCompendiumPage("");
setAttrs(reset, function() {
@@ -3491,6 +3491,12 @@
profs.all[slide.values[sectionid + "_type"]].push(slide.values[sectionid + "_custom"])
}
}
+ if(value == "custom" && name.includes('language_choice')) {
+ const customValueAttribute = name.replace('language_choice', 'language_custom')
+ if(slide.values[customValueAttribute]) {
+ profs.all['Language'].push(slide.values[customValueAttribute]);
+ }
+ }
})
});
//Set up drops. start with class, subclass, race, subrace, background
@@ -3632,7 +3638,7 @@
}
//set up background drop
if(data["l1-background"].values.background) {
- if(data["l1-background"].values.background == "Rules::Personality%20and%20Backgrounds") {
+ if(data["l1-background"].values.background == "Rules:Personality%20and%20Backgrounds") {
var customBg = {name: removeExpansionInfo(data["l1-background"].values["background_name"]), data: {Category: "Backgrounds", blobs:{}}};
if(customtraits.background.length > 0) {
customBg.data.theseblobs = ["customblob"];
diff --git a/Esper_Genesis_5E/src/charactermancer/l1/l1.pug b/Esper_Genesis_5E/src/charactermancer/l1/l1.pug
index 3d800f9fc2..916dfca8e7 100644
--- a/Esper_Genesis_5E/src/charactermancer/l1/l1.pug
+++ b/Esper_Genesis_5E/src/charactermancer/l1/l1.pug
@@ -297,7 +297,7 @@ charmancer.sheet-charmancer-l1-background
span(data-i18n='choose-background')
select(accept='Category:Backgrounds' name='comp_background' required)
option(data-i18n='choose' value='')
- option.custom(data-i18n='custom' value='Rules::Personality%20and%20Background')
+ option.custom(data-i18n='custom' value='Rules:Personality%20and%20Background')
.choice.custom_background
label.hilite
span(data-i18n='name-background')
@@ -422,8 +422,8 @@ charmancer.sheet-charmancer-l1-spells
p(data-i18n='your-character-dont-have-spells-this-lvl')
.choices.spell_holder
.info.choice.spell-info-container
- .sheet-compendium-page.sheet-spell-info(accept='Rules:Spells' class=`sheet-spells-info`)
- +bottomBar('equipment', 'feat')
+ .sheet-compendium-page.sheet-spell-info(accept='Rules:Esper%20Powers' class=`sheet-spells-info`)
+ +bottomBar('equipment', 'bio')
+cancelPrompt('spells')
each val in ['race_spells', 'class_spells', 'race_number', 'class_number']
input(name=`comp_${val}` type='hidden')
@@ -444,90 +444,91 @@ mixin featChoices(type, acceptString)
option(data-i18n='choose' value='')
- choiceInt++
-charmancer.sheet-charmancer-l1-feat
- .charmancer.container
- ol.steps
- .topbar-holder
- .choice.no_feat
- p.label(data-i18n='charmancer-a-feat-represents')
- p(data-i18n='you-really-havent-done')
- .choices.choice.yes_feat
- .row
- label
- span(data-i18n='choose-a-feat:')
- select(accept='Category:Feats' name='comp_feat')
- option(data-i18n='choose' value='')
- .choice.feat_options
- .row.choice.feat_prereq.feat_possible
- label.warning
- span(data-i18n='prerequisite:')
- p.feat_prerequisite.feat_text
- p.feat_text(data-i18n='feat-pre-check')
- .row.choice.feat_ability.feat_possible
+//
+ charmancer.sheet-charmancer-l1-feat
+ .charmancer.container
+ ol.steps
+ .topbar-holder
+ .choice.no_feat
+ p.label(data-i18n='charmancer-a-feat-represents')
+ p(data-i18n='you-really-havent-done')
+ .choices.choice.yes_feat
+ .row
label
- span(data-i18n='ability-score-increase:')
- p.feat_ability_score.feat_text
- select.choice.feat_possible.feat_ability_choice(name='comp_feat_ability_choice')
+ span(data-i18n='choose-a-feat:')
+ select(accept='Category:Feats' name='comp_feat')
option(data-i18n='choose' value='')
- +featChoices('language')
- +featChoices('skill', 'Category:Proficiencies Type:Skill')
- +featChoices('weapon')
- +featChoices('armor')
- +featChoices('tool')
- .sheet-row.sheet-choice.sheet-feat_possible.sheet-feat_spell_row
- label
- span(data-i18n='spell-list') Spell List:
- span(style='color: red;')
- p.sheet-feat_text.sheet-feat_spells
- select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice1(name='comp_feat_spell_choice1')
- option(data-i18n='choose' value='') Choose
- select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice2(name='comp_feat_spell_choice2')
- option(data-i18n='choose' value='') Choose
- select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice3(name='comp_feat_spell_choice3')
- option(data-i18n='choose' value='') Choose
- select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice4(name='comp_feat_spell_choice4')
- option(data-i18n='choose' value='') Choose
- .row.choice.feat_possible.feat_expertise_row
- label
- span(data-i18n='expertise')
- each val in [1, 2]
- select(class=`choice feat_possible feat_expertise_choice${val}` name=`comp_feat_expertise_choice_${val}`)
+ .choice.feat_options
+ .row.choice.feat_prereq.feat_possible
+ label.warning
+ span(data-i18n='prerequisite:')
+ p.feat_prerequisite.feat_text
+ p.feat_text(data-i18n='feat-pre-check')
+ .row.choice.feat_ability.feat_possible
+ label
+ span(data-i18n='ability-score-increase:')
+ p.feat_ability_score.feat_text
+ select.choice.feat_possible.feat_ability_choice(name='comp_feat_ability_choice')
option(data-i18n='choose' value='')
- .row.choice.feat_possible.feat_feature_row_1
- h4.feat_feature_name_1
- span(class='feat_feature_1')
- select.feat_possible.feat_feature_choice_1(name='comp_feat_feature_choice_1')
- option(data-i18n='choose' value='')
- option.custom(data-i18n='custom')
- p.description.feat_feature_description_1
- .row.choice.feat_possible.feat_feature_row_1_double
- h4.feat_feature_name_1_double
- span.feat_feature_1_double
- select.feat_possible.feat_feature_choice_1_double(name='comp_feat_feature_choice_3')
- option(data-i18n='choose' value='')
- option.custom(data-i18n='custom')
- p.description.feat_feature_description_1_double
- .row.choice.feat_possible.feat_feature_row_2
- h4.feat_feature_name_2
- span.feat_feature_2
- select.feat_possible.feat_feature_choice_2(name='comp_feat_feature_choice_2')
- option(data-i18n='choose' value='')
- option.custom(data-i18n='custom')
- p.description.feat_feature_description_2
- .choice.row.feat_possible.other_options_and_features1
- label
- span.other_options_and_features_title1
- select.feat_possible.other_options_and_features_choice1(name='comp_other_options_and_features_choice1')
+ +featChoices('language')
+ +featChoices('skill', 'Category:Proficiencies Type:Skill')
+ +featChoices('weapon')
+ +featChoices('armor')
+ +featChoices('tool')
+ .sheet-row.sheet-choice.sheet-feat_possible.sheet-feat_spell_row
+ label
+ span(data-i18n='spell-list') Spell List:
+ span(style='color: red;')
+ p.sheet-feat_text.sheet-feat_spells
+ select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice1(name='comp_feat_spell_choice1')
+ option(data-i18n='choose' value='') Choose
+ select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice2(name='comp_feat_spell_choice2')
+ option(data-i18n='choose' value='') Choose
+ select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice3(name='comp_feat_spell_choice3')
+ option(data-i18n='choose' value='') Choose
+ select.sheet-choice.sheet-feat_possible.sheet-feat_spell_choice4(name='comp_feat_spell_choice4')
+ option(data-i18n='choose' value='') Choose
+ .row.choice.feat_possible.feat_expertise_row
+ label
+ span(data-i18n='expertise')
+ each val in [1, 2]
+ select(class=`choice feat_possible feat_expertise_choice${val}` name=`comp_feat_expertise_choice_${val}`)
+ option(data-i18n='choose' value='')
+ .row.choice.feat_possible.feat_feature_row_1
+ h4.feat_feature_name_1
+ span(class='feat_feature_1')
+ select.feat_possible.feat_feature_choice_1(name='comp_feat_feature_choice_1')
option(data-i18n='choose' value='')
- .choice.row.feat_possible.other_options_and_features2
- label
- span.other_options_and_features_title2
- select.feat_possible.other_options_and_features_choice1(name='comp_other_options_and_features_choice2')
+ option.custom(data-i18n='custom')
+ p.description.feat_feature_description_1
+ .row.choice.feat_possible.feat_feature_row_1_double
+ h4.feat_feature_name_1_double
+ span.feat_feature_1_double
+ select.feat_possible.feat_feature_choice_1_double(name='comp_feat_feature_choice_3')
option(data-i18n='choose' value='')
- .info.feat-info-container.choice.yes_feat
- .sheet-compendium-page.sheet-feat-info(accept='Rules:Feats')
- +bottomBar('spells', 'bio')
- +cancelPrompt('feat')
+ option.custom(data-i18n='custom')
+ p.description.feat_feature_description_1_double
+ .row.choice.feat_possible.feat_feature_row_2
+ h4.feat_feature_name_2
+ span.feat_feature_2
+ select.feat_possible.feat_feature_choice_2(name='comp_feat_feature_choice_2')
+ option(data-i18n='choose' value='')
+ option.custom(data-i18n='custom')
+ p.description.feat_feature_description_2
+ .choice.row.feat_possible.other_options_and_features1
+ label
+ span.other_options_and_features_title1
+ select.feat_possible.other_options_and_features_choice1(name='comp_other_options_and_features_choice1')
+ option(data-i18n='choose' value='')
+ .choice.row.feat_possible.other_options_and_features2
+ label
+ span.other_options_and_features_title2
+ select.feat_possible.other_options_and_features_choice1(name='comp_other_options_and_features_choice2')
+ option(data-i18n='choose' value='')
+ .info.feat-info-container.choice.yes_feat
+ .sheet-compendium-page.sheet-feat-info(accept='Rules:Feats')
+ +bottomBar('spells', 'bio')
+ +cancelPrompt('feat')
charmancer.sheet-charmancer-l1-bio
@@ -544,7 +545,7 @@ charmancer.sheet-charmancer-l1-bio
div(data-i18n=datai18n)
input(name=`comp_${attributeName}` type='text')
+infoDiv('race','Rules:Races')
- +bottomBar('feat', 'summary')
+ +bottomBar('spells', 'summary')
+cancelPrompt('bio')
diff --git a/Esper_Genesis_5E/translation.json b/Esper_Genesis_5E/translation.json
index 89f094855e..76eac238ce 100644
--- a/Esper_Genesis_5E/translation.json
+++ b/Esper_Genesis_5E/translation.json
@@ -583,7 +583,7 @@
"get-started": "Get started by clicking Next.",
"opt-out-u": "OPT OUT",
"charmancer-compendium": "Your Compendium Awaits.",
- "charmancer-compendium-detail": "The Charactermancer currently supports Dungeons & Dragons 5th Edition SRD and the Player's Handbook. You can add the Player's Handbook to your compendium in the Marketplace, or the game owner can share their compendium with everyone in the game.",
+ "charmancer-compendium-detail": "The Charactermancer currently supports the Esper Genesis SRD. You can add the Core Manual to your compendium in the Marketplace, or the game owner can share their compendium with everyone in the game.",
"charmancer-choose-race": "Choose a Race:",
"charmancer-custom-race-name": "Custom Race Name:",
"charmancer-custom-subclass-name:": "Custom sublass Name:",