slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added option to ask which charact to use for abilities

Browse Source
This commit is contained in:
Riernar
2021-02-12 10:29:22 +01:00
parent 5306ac71b5
commit c3b432e440
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ars_Magica_5th/Ars_Magica_5th.html
+11 -5
View File
@@ -597,8 +597,8 @@
<table class="sheet-table_2" style="width:400px;">
<tr>
<td width="30px"><div class="sheet-flex-container">
<button type="roll" class="sheet-button sheet-simple-roll" name="roll_ability_simple" value="&{template:ability} {{name= @{character_name}}} {{label4=^{circumstances-m}}} {{result4=[[(?{@{circumstantial_i18n}|0})]]}} {{label0=@{Ability_name}}} {{banner=@{Ability_Speciality}}} {{label1=^{rank}}} {{result1= [[ @{Ability_Score} + @{Ability_Puissant} ]]}} {{label2=@{Ability_CharacName}}} {{result2=[[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]}} {{label3=^{weakness-m}}} {{result3=[[ ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (@{wound_total}) [@{wounds_i18n}] ]]}} {{result0=[[ @{simple-die} + (@{Ability_Score} + @{Ability_Puissant}) [@{Ability_name}] + ([[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]) [@{Ability_CharacName}] + (@{wound_total}) [@{wounds_i18n}] + ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (?{@{circumstantial_i18n}|0}) [@{circumstances_i18n}] ]]}} {{botch-button=[@{botch_i18n}!](~@{character_name}|botch)}} {{crit-button=[@{critical_i18n}!](~@{character_name}|critical)}}"></button>
<button type="roll" class="sheet-button sheet-stress-roll" name="roll_ability_stress" value="&{template:ability} {{name= @{character_name}}} {{label4=^{circumstances-m}}} {{result4=[[(?{@{circumstantial_i18n}|0})]]}} {{label0=@{Ability_name}}} {{banner=@{Ability_Speciality}}} {{label1=^{rank}}} {{result1= [[ @{Ability_Score} + @{Ability_Puissant} ]]}} {{label2=@{Ability_CharacName}}} {{result2=[[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]}} {{label3=^{weakness-m}}} {{result3=[[ ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (@{wound_total}) [@{wounds_i18n}] ]]}} {{result0=[[ @{stress-die} + (@{Ability_Score} + @{Ability_Puissant}) [@{Ability_name}] + ([[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]) [@{Ability_CharacName}] + (@{wound_total}) [@{wounds_i18n}] + ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (?{@{circumstantial_i18n}|0}) [@{circumstances_i18n}] ]]}} {{botch-button=[@{botch_i18n}!](~@{character_name}|botch)}} {{crit-button=[@{critical_i18n}!](~@{character_name}|critical)}} {{stress=1}}"></button>
<button type="roll" class="sheet-button sheet-simple-roll" name="roll_ability_simple" value="&{template:ability} {{name= @{character_name}}} {{label0=@{Ability_name}}} {{banner=@{Ability_Speciality}}} {{label1=^{rank}}} {{result1= [[ @{Ability_Score} + @{Ability_Puissant} ]]}} {{label2=@{Ability_CharacName}}} {{result2=[[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]}} {{label3=^{weakness-m}}} {{result3=[[ ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (@{wound_total}) [@{wounds_i18n}] ]]}} {{label4=^{circumstances-m}}} {{result4=[[(?{@{circumstantial_i18n}|0})]]}} {{result0=[[ @{simple-die} + (@{Ability_Score} + @{Ability_Puissant}) [@{Ability_name}] + (@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}) [@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_i18n@{sys_lbk}] + (@{wound_total}) [@{wounds_i18n}] + ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (?{@{circumstantial_i18n}|0}) [@{circumstances_i18n}] ]]}} {{botch-button=[@{botch_i18n}!](~@{character_name}|botch)}} {{crit-button=[@{critical_i18n}!](~@{character_name}|critical)}}"></button>
<button type="roll" class="sheet-button sheet-stress-roll" name="roll_ability_stress" value="&{template:ability} {{name= @{character_name}}} {{label0=@{Ability_name}}} {{banner=@{Ability_Speciality}}} {{label1=^{rank}}} {{result1= [[ @{Ability_Score} + @{Ability_Puissant} ]]}} {{label2=@{Ability_CharacName}}} {{result2=[[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]}} {{label3=^{weakness-m}}} {{result3=[[ ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (@{wound_total}) [@{wounds_i18n}] ]]}} {{label4=^{circumstances-m}}} {{result4=[[(?{@{circumstantial_i18n}|0})]]}} {{result0=[[ @{stress-die} + (@{Ability_Score} + @{Ability_Puissant}) [@{Ability_name}] + (@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}) [@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_i18n@{sys_lbk}] + (@{wound_total}) [@{wounds_i18n}] + ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (?{@{circumstantial_i18n}|0}) [@{circumstances_i18n}] ]]}} {{botch-button=[@{botch_i18n}!](~@{character_name}|botch)}} {{crit-button=[@{critical_i18n}!](~@{character_name}|critical)}} {{stress=1}}"></button>
</div></td>
<td width="240px"><input type="text" style="width:220px;" class="sheet-heading_4" name="attr_Ability_name"/></td>
<td><input type="number" class="sheet-number_2" name="attr_Ability_TotalScore" value="[[(@{Ability_Score}) + (@{Ability_Puissant})]]" disabled="true" /></td>
@@ -617,8 +617,8 @@
<tr>
<td>
<select class="sheet-select_1" name="attr_Ability_CharacName">
<option class="sheet-italic" value="Unselected" data-i18n="characteristic" >Characteristic</option>
<!-- <option class="sheet-italic" value="[[?{@{characteristic_i18n}|@{intelligence_i18n},intelligence| @{perception_i18n},perception| @{strength_i18n},strength| @{stamina_i18n},stamina| @{presence_i18n},presence| @{communication_i18n},communication| @{dexterity_i18n},dexterity| @{quickness_i18n},quickness}]]" data-i18n="ask">Ask</option> (currently not functional) -->
<option class="sheet-italic" value="unselected" data-i18n="characteristic" >Characteristic</option>
<option class="sheet-italic" value="ask" data-i18n="ask" >Ask</option>
<option value="Intelligence" data-i18n="intelligence" >Intelligence</option>
<option value="Perception" data-i18n="perception" >Perception</option>
<option value="Strength" data-i18n="strength" >Strength</option>
@@ -3011,6 +3011,7 @@
<input name ="attr_ability_i18n" type="hidden" value="Abiliy" />
<input name ="attr_armor_i18n" type="hidden" value="Armor" />
<input name ="attr_artes_i18n" type="hidden" value="Artes Lib." />
<input name ="attr_ask_i18n" type="hidden" value="Ask" />
<input name ="attr_attack_i18n" type="hidden" value="Attack" />
<input name ="attr_aura_i18n" type="hidden" value="Aura" />
<input name ="attr_bold_i18n" type="hidden" value="Bold" />
@@ -3043,6 +3044,7 @@
<input name ="attr_subtle_i18n" type="hidden" value="Subtle" />
<input name ="attr_technique_i18n" type="hidden" value="Technique" />
<input name ="attr_total_i18n" type="hidden" value="Total" />
<input name ="attr_unselected_i18n" type="hidden" value="Unselected" />
<input name ="attr_words_i18n" type="hidden" value="Words" />
<input name ="attr_words-none_i18n" type="hidden" value="None" />
<input name ="attr_wounds_i18n" type="hidden" value="Wounds" />
@@ -3069,9 +3071,11 @@
<input name ="attr_mentem_i18n" type="hidden" value="Mentem" />
<input name ="attr_terram_i18n" type="hidden" value="Terram" />
<input name ="attr_vim_i18n" type="hidden" value="Vim" />
<!-- System attributes used for defered attribute access -->
<!-- Attributes used for the defered attribute access system -->
<!-- See Readme.md for explanation of how it works -->
<input name="attr_Unselected_Score" type="hidden" value="0" />
<input name="attr_Unselected_Puissant" type="hidden" value="0" />
<input name="attr_ask_Score" type="hidden" value="?{@{characteristic_i18n}|@{intelligence_i18n},@{intelligence_Score} [@{intelligence_i18n}]| @{perception_i18n},@{perception_Score} [@{perception_i18n}]| @{strength_i18n},@{strength_Score} [@{strength_i18n}]| @{stamina_i18n},@{stamina_Score} [@{stamina_i18n}]| @{presence_i18n},@{presence_Score} [@{presence_i18n}]| @{communication_i18n},@{communication_Score} [@{communication_i18n}]| @{dexterity_i18n},@{dexterity_Score} [@{dexterity_i18n}]| @{quickness_i18n},@{quickness_Score} [@{quickness_i18n}]}" />
<input name ="attr_sys_at" type="hidden" value="@{" />
<input name ="attr_sys_pipe" type="hidden" value="|" />
<input name ="attr_sys_lbk" type="hidden" value="}" />
@@ -3295,6 +3299,7 @@ on("sheet:opened", function(eventInfo){
"ability_i18n": getTranslationByKey("ability"),
"armor_i18n": getTranslationByKey("armor"),
"artes_i18n": getTranslationByKey("artes-lib-"),
"ask_i18n": getTranslationByKey("ask"),
"attack_i18n": getTranslationByKey("attack"),
"aura_i18n": getTranslationByKey("aura"),
"bold_i18n": getTranslationByKey("gestures-bold"),
@@ -3327,6 +3332,7 @@ on("sheet:opened", function(eventInfo){
"subtle_i18n": getTranslationByKey("gestures-subtle"),
"technique_i18n": getTranslationByKey("technique"),
"total_i18n": getTranslationByKey("total"),
"unselected_i18n": getTranslationByKey("unselected"),
"words_i18n": getTranslationByKey("words"),
"words-none_i18n": getTranslationByKey("words-none"),
"wounds_i18n": getTranslationByKey("wounds"),
Ars_Magica_5th/arm5_py_integration/__init__.py
+7 -6
View File
@@ -135,17 +135,18 @@ GLOBALS["characteristic_name_options"] = repeat_template(
CHARACTERISTICS,
str_key="char",
)
GLOBALS["characteristic_name_ask"] = (
'<option class="sheet-italic" value="[[?{@{characteristic_i18n}|'
GLOBALS["characteristic_name_ask_attr"] = (
"?{@{characteristic_i18n}|"
+ "| ".join(
"@{%(char)s_i18n},%(char)s" % {"char": char} for char in CHARACTERISTICS
"@{%(char)s_i18n},@{%(char)s_Score} [@{%(char)s_i18n}]" % {"char": char}
for char in CHARACTERISTICS
)
+ '}]]" data-i18n="ask">Ask</option>'
+ "}"
)
# Abilities
ability_roll_template = "&{template:ability} {{name= @{character_name}}} {{label4=^{circumstances-m}}} {{result4=[[(?{@{circumstantial_i18n}|0})]]}} {{label0=@{Ability_name}}} {{banner=@{Ability_Speciality}}} {{label1=^{rank}}} {{result1= [[ @{Ability_Score} + @{Ability_Puissant} ]]}} {{label2=@{Ability_CharacName}}} {{result2=[[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]}} {{label3=^{weakness-m}}} {{result3=[[ ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (@{wound_total}) [@{wounds_i18n}] ]]}} {{result0=%(roll)s}} {{botch-button=[@{botch_i18n}!](~@{character_name}|botch)}} {{crit-button=[@{critical_i18n}!](~@{character_name}|critical)}}"
ability_roll = "[[ %(die)s + (@{Ability_Score} + @{Ability_Puissant}) [@{Ability_name}] + ([[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]) [@{Ability_CharacName}] + (@{wound_total}) [@{wounds_i18n}] + ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (?{@{circumstantial_i18n}|0}) [@{circumstances_i18n}] ]]"
ability_roll_template = "&{template:ability} {{name= @{character_name}}} {{label0=@{Ability_name}}} {{banner=@{Ability_Speciality}}} {{label1=^{rank}}} {{result1= [[ @{Ability_Score} + @{Ability_Puissant} ]]}} {{label2=@{Ability_CharacName}}} {{result2=[[@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}]]}} {{label3=^{weakness-m}}} {{result3=[[ ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (@{wound_total}) [@{wounds_i18n}] ]]}} {{label4=^{circumstances-m}}} {{result4=[[(?{@{circumstantial_i18n}|0})]]}} {{result0=%(roll)s}} {{botch-button=[@{botch_i18n}!](~@{character_name}|botch)}} {{crit-button=[@{critical_i18n}!](~@{character_name}|critical)}}"
ability_roll = "[[ %(die)s + (@{Ability_Score} + @{Ability_Puissant}) [@{Ability_name}] + (@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_lbk}) [@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_i18n@{sys_lbk}] + (@{wound_total}) [@{wounds_i18n}] + ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (?{@{circumstantial_i18n}|0}) [@{circumstances_i18n}] ]]"
GLOBALS["ability_roll_simple"] = ability_roll_template % {
"roll": ability_roll % {"die": "@{simple-die}"}
}
Ars_Magica_5th/arm5_py_integration/translations.py
+2
View File
@@ -6,6 +6,7 @@ TRANSLATION_ATTRS = (
("ability", "Abiliy", "ability"),
("armor", "Armor", "armor"),
("artes", "Artes Lib.", "artes-lib-"),
("ask", "Ask", "ask"),
("attack", "Attack", "attack"),
("aura", "Aura", "aura"),
("bold", "Bold", "gestures-bold"),
@@ -38,6 +39,7 @@ TRANSLATION_ATTRS = (
("subtle", "Subtle", "gestures-subtle"),
("technique", "Technique", "technique"),
("total", "Total", "total"),
("unselected", "Unselected", "unselected"),
("words", "Words", "words"),
("words-none", "None", "words-none"),
("wounds", "Wounds", "wounds"),
Ars_Magica_5th/template.html
+5 -3
View File
@@ -426,8 +426,8 @@ $$alert(
<tr>
<td>
<select class="sheet-select_1" name="attr_Ability_CharacName">
<option class="sheet-italic" value="Unselected" data-i18n="characteristic" >Characteristic</option>
<!-- $$characteristic_name_ask$$ (currently not functional) -->
<option class="sheet-italic" value="unselected" data-i18n="characteristic" >Characteristic</option>
<option class="sheet-italic" value="ask" data-i18n="ask" >Ask</option>
$$characteristic_name_options$$
</select>
</td>
@@ -1662,9 +1662,11 @@ $$alert(
<!-- Translation keys -->
$$translation_attrs$$
<!-- System attributes used for defered attribute access -->
<!-- Attributes used for the defered attribute access system -->
<!-- See Readme.md for explanation of how it works -->
<input name="attr_Unselected_Score" type="hidden" value="0" />
<input name="attr_Unselected_Puissant" type="hidden" value="0" />
<input name="attr_ask_Score" type="hidden" value="$$characteristic_name_ask_attr$$" />
<input name ="attr_sys_at" type="hidden" value="@{" />
<input name ="attr_sys_pipe" type="hidden" value="|" />
<input name ="attr_sys_lbk" type="hidden" value="}" />
Ars_Magica_5th/translation.json
+1
View File
@@ -191,6 +191,7 @@
"trait": "Trait",
"type": "Type",
"unconscious": "Unconscious",
"unselected": "Unselected",
"unspent-xp": "Unspent XP",
"upkeep": "Upkeep",
"vim": "Vim",