diff --git a/Ars_Magica_5th/Ars_Magica_5th.html b/Ars_Magica_5th/Ars_Magica_5th.html index dbe24075f2..62c9fb9d9f 100644 --- a/Ars_Magica_5th/Ars_Magica_5th.html +++ b/Ars_Magica_5th/Ars_Magica_5th.html @@ -597,8 +597,8 @@ @@ -617,8 +617,8 @@ @@ -1662,9 +1662,11 @@ $$alert( $$translation_attrs$$ - + + + diff --git a/Ars_Magica_5th/translation.json b/Ars_Magica_5th/translation.json index 47e8509d18..c1d5089cc4 100644 --- a/Ars_Magica_5th/translation.json +++ b/Ars_Magica_5th/translation.json @@ -191,6 +191,7 @@ "trait": "Trait", "type": "Type", "unconscious": "Unconscious", + "unselected": "Unselected", "unspent-xp": "Unspent XP", "upkeep": "Upkeep", "vim": "Vim",
- - + +
+ @@ -3043,6 +3044,7 @@ + @@ -3069,9 +3071,11 @@ - + + + @@ -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"), diff --git a/Ars_Magica_5th/arm5_py_integration/__init__.py b/Ars_Magica_5th/arm5_py_integration/__init__.py index f351b5c69e..658a1983be 100644 --- a/Ars_Magica_5th/arm5_py_integration/__init__.py +++ b/Ars_Magica_5th/arm5_py_integration/__init__.py @@ -135,17 +135,18 @@ GLOBALS["characteristic_name_options"] = repeat_template( CHARACTERISTICS, str_key="char", ) -GLOBALS["characteristic_name_ask"] = ( - '' + + "}" ) # 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}"} } diff --git a/Ars_Magica_5th/arm5_py_integration/translations.py b/Ars_Magica_5th/arm5_py_integration/translations.py index 92dfcce33c..ed0c2ae0a9 100644 --- a/Ars_Magica_5th/arm5_py_integration/translations.py +++ b/Ars_Magica_5th/arm5_py_integration/translations.py @@ -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"), diff --git a/Ars_Magica_5th/template.html b/Ars_Magica_5th/template.html index da08ffd1d8..8f8a44c04a 100644 --- a/Ars_Magica_5th/template.html +++ b/Ars_Magica_5th/template.html @@ -426,8 +426,8 @@ $$alert(