Merge branch '073-use-core-rollmode-labels' into 'master'

Use foundry vtt provided rollmode labels

Closes #73

See merge request dungeonslayers/ds4!94
This commit is contained in:
Johannes Loher 2021-03-17 18:27:22 +00:00
commit b6e9ae2599
5 changed files with 6 additions and 24 deletions

View file

@ -229,10 +229,6 @@
"DS4.RollDialogCoupLabel": "Immersieg bis", "DS4.RollDialogCoupLabel": "Immersieg bis",
"DS4.RollDialogFumbleLabel": "Patzer ab", "DS4.RollDialogFumbleLabel": "Patzer ab",
"DS4.RollDialogVisibilityLabel": "Sichtbarkeit", "DS4.RollDialogVisibilityLabel": "Sichtbarkeit",
"DS4.ChatVisibilityRoll": "Alle",
"DS4.ChatVisibilityGmRoll": "Selbst & SL",
"DS4.ChatVisibilityBlindRoll": "Nur SL",
"DS4.ChatVisibilitySelfRoll": "Nur selbst",
"DS4.TooltipBaseValue": "Basiswert", "DS4.TooltipBaseValue": "Basiswert",
"DS4.TooltipModifier": "Modifikator", "DS4.TooltipModifier": "Modifikator",
"DS4.TooltipEffects": "Effekte" "DS4.TooltipEffects": "Effekte"

View file

@ -229,10 +229,6 @@
"DS4.RollDialogCoupLabel": "Coup to", "DS4.RollDialogCoupLabel": "Coup to",
"DS4.RollDialogFumbleLabel": "Fumble from", "DS4.RollDialogFumbleLabel": "Fumble from",
"DS4.RollDialogVisibilityLabel": "Visibility", "DS4.RollDialogVisibilityLabel": "Visibility",
"DS4.ChatVisibilityRoll": "All",
"DS4.ChatVisibilityGmRoll": "Self & GM",
"DS4.ChatVisibilityBlindRoll": "GM only",
"DS4.ChatVisibilitySelfRoll": "Self only",
"DS4.TooltipBaseValue": "Base Value", "DS4.TooltipBaseValue": "Base Value",
"DS4.TooltipModifier": "Modifier", "DS4.TooltipModifier": "Modifier",
"DS4.TooltipEffects": "Effects" "DS4.TooltipEffects": "Effects"

View file

@ -281,16 +281,6 @@ export const DS4 = {
days: "DS4.UnitDaysAbbr", days: "DS4.UnitDaysAbbr",
custom: "DS4.UnitCustomAbbr", custom: "DS4.UnitCustomAbbr",
}, },
/**
* Define localization strings for Chat Visibility
*/
chatVisibilities: {
roll: "DS4.ChatVisibilityRoll",
gmroll: "DS4.ChatVisibilityGmRoll",
blindroll: "DS4.ChatVisibilityBlindRoll",
selfroll: "DS4.ChatVisibilitySelfRoll",
},
}, },
/** /**

View file

@ -116,7 +116,7 @@ async function askGmModifier(
maxCritSuccess: options.maxCritSuccess ?? defaultCheckOptions.maxCritSuccess, maxCritSuccess: options.maxCritSuccess ?? defaultCheckOptions.maxCritSuccess,
minCritFailure: options.minCritFailure ?? defaultCheckOptions.minCritFailure, minCritFailure: options.minCritFailure ?? defaultCheckOptions.minCritFailure,
rollMode: options.rollMode, rollMode: options.rollMode,
config: DS4, rollModes: CONFIG.Dice.rollModes,
}; };
const renderedHtml = await renderTemplate(usedTemplate, templateData); const renderedHtml = await renderTemplate(usedTemplate, templateData);
@ -195,7 +195,7 @@ interface GmModifierData {
* - checkTargetValue * - checkTargetValue
* *
* They will and should be removed once effects and data retrieval is in place. * They will and should be removed once effects and data retrieval is in place.
* If a "raw" roll dialog is necessary, create another pre-porcessing Dialog * If a "raw" roll dialog is necessary, create another pre-processing Dialog
* class asking for the required information. * class asking for the required information.
* This interface should then be replaced with the `GmModifierData`. * This interface should then be replaced with the `GmModifierData`.
*/ */
@ -210,7 +210,7 @@ interface IntermediateGmModifierData extends GmModifierData {
} }
/** /**
* The minimum behavioural options that need to be passed to the factory. * The minimum behavioral options that need to be passed to the factory.
*/ */
export interface DS4CheckFactoryOptions { export interface DS4CheckFactoryOptions {
maxCritSuccess: number; maxCritSuccess: number;

View file

@ -10,9 +10,9 @@
<label for="visibility">{{localize "DS4.RollDialogVisibilityLabel"}}</label> <label for="visibility">{{localize "DS4.RollDialogVisibilityLabel"}}</label>
<select id="visibility" data-type="String"> <select id="visibility" data-type="String">
{{#select rollMode}} {{#select rollMode}}
{{#each config.i18n.chatVisibilities as |rollModeValue rollModeKey|}} {{#each rollModes as |rollModeValue rollModeKey|}}
<option value="{{rollModeKey}}">{{rollModeValue}}</option> <option value="{{rollModeKey}}">{{localize rollModeValue}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
</form> </form>