Merge pull request #413 from mclemente/V13-Update

Foundry V13 update

Author: mclemente

.eslintrc.cjs

@@ -178,6 +178,7 @@ module.exports = {
 		GURPS: false,
 		JournalTextPageSheet: false,
 		ProseMirror: false,
+		TomSelect: false,
 		Tour: false,
 	},
 

README.md

@@ -8,15 +8,18 @@
 Talk to others using a language you can speak and scrambles text you can't understand, into several fantasy scripts.
 
 ## How to Use
-### As a GM
+### Set Up
+#### As a GM
 - Check the module settings to configure it according to your preferences.
-- Select tokens to speak as them.
-- Change the default editor of the Journal Sheet to TinyMCE if you intend to use the Journal feature.
+- Check the Tour under the Tour Management window.
 - Check the [wiki](https://github.com/mclemente/fvtt-module-polyglot/wiki) for more in-depth information.
 
-### As a Player
+#### As a Player
 - Assign a character on the User Configuration window.
-- Talk as your character. Select other owned tokens to read and speak as them.
+
+### Using
+- Select tokens to speak and read messages as them.
+- Right-click the chat selector to enable/disable speaking in a language.
 
 ## Attribution
 

gulpfile.mjs

@@ -74,15 +74,20 @@ async function copyFiles() {
 	}
 }
 
-function select2() {
-	return gulp.src(["node_modules/select2/dist/js/select2.min.js", "node_modules/select2/dist/css/select2.min.css"]).pipe(gulp.dest("dist/lib/select2"));
+function tomSelect() {
+	return gulp.src([
+		"node_modules/tom-select/dist/js/tom-select.complete.min.js",
+		"node_modules/tom-select/dist/js/tom-select.complete.min.js.map",
+		"node_modules/tom-select/dist/css/tom-select.min.css",
+		"node_modules/tom-select/dist/css/tom-select.min.css.map",
+	]).pipe(gulp.dest("dist/lib/tom-select"));;
 }
 
 /**
  * Watch for changes for each build step
  */
 export function watch() {
-	select2();
+	tomSelect();
 	gulp.watch(`${sourceDirectory}/**/*.${sourceFileExtension}`, { ignoreInitial: false }, buildCode);
 	gulp.watch(`${stylesDirectory}/**/*.${stylesExtension}`, { ignoreInitial: false }, buildStyles);
 	gulp.watch(
@@ -92,7 +97,7 @@ export function watch() {
 	);
 }
 
-export const build = gulp.series(clean, gulp.parallel(buildCode, buildStyles, select2, copyFiles));
+export const build = gulp.series(clean, gulp.parallel(buildCode, buildStyles, tomSelect, copyFiles));
 
 /********************/
 /*      CLEAN       */

package-lock.json

@@ -22,7 +22,7 @@
 		"husky": "^8.0.3",
 		"lint-staged": "^14.0.1",
 		"rollup": "^2.79.2",
-		"select2": "^4.1.0-rc.0",
+		"tom-select": "^2.4.3",
 		"vinyl-buffer": "^1.0.1",
 		"vinyl-source-stream": "^2.0.0",
 		"yargs": "^17.7.2"

package.json

@@ -12,8 +12,8 @@
 		"Font": "Font",
 		"Fonts": "Fonts",
 		"FontSize": "Font Size (%)",
-		"KnownLanguages": "Known Languages",
-		"UnknownLanguages": "Unknown Languages",
+		"KnownLanguages": "Known",
+		"UnknownLanguages": "Unknown",
 		"AlphabeticOnly": "Only Alphabetic",
 		"Logographical": "Logographical",
 		"AllowOOC": {
@@ -40,10 +40,6 @@
 			"hint": "Enables all the chat features, such as the language selector in the chat and message scrambling.",
 			"title": "Enable Chat Features"
 		},
-		"DisplayCheckbox": {
-			"hint": "Removes the checkbox from the chat section.",
-			"title": "Display Checkbox"
-		},
 		"DisplayTranslated.hint": "For languages that are translated in the chat window, display the original text and a translation below.",
 		"DisplayTranslated.title": "Display Translations",
 		"enableAllFonts": {
@@ -108,6 +104,7 @@
 		},
 		"ScrambleGM.hint": "Don't translate the text for the GM (refer to the globe's color for the token's understanding).",
 		"ScrambleGM.title": "Scramble Messages for GM",
+		"SpeakingIn": "Speaking in {language}",
 		"Truespeech.hint": "Set a language whose speaker understands all spoken languages (can't read Journals) and which is understood by all creatures. An actor will be able to read all chat messages and to write messages in a language that is understood by all.",
 		"Truespeech.title": "Omnispeech Language",
 		"Translation": "Translation",
@@ -129,14 +126,14 @@
 					"Title": "Language Selector",
 					"Content": "The <span class='reference'>Language Selector</span> is where you can select which language you want to speak in, scrambling the messages sent while it is active."
 				},
-				"LanguageSelectorCheckbox": {
-					"Title": "Language Selector's Checkbox",
-					"Content": "The <span class='reference'>Checkbox</span> toggles the scrambling. Any user who unchecks it will speak as if the module was disabled."
-				},
 				"LanguageSelectorSelect": {
 					"Title": "Language Selector's Dropdown",
 					"Content": "The <span class='reference'>Dropdown</span> contains all the languages in your world.<br>Depending on your game system, the languages may have already been set, while in other game systems, you may need to configure them in the <span class='reference'>Game Settings</span>.<br>It will display languages between the ones Known and Unknown by your players' actors."
 				},
+				"LanguageSelectorSelect2": {
+					"Title": "Language Selector's Dropdown",
+					"Content": "Right-clicking the <span class='reference'>Dropdown</span> toggles the scrambling, allowing users to speak as if the module was disabled."
+				},
 				"LanguageSelectorPips": {
 					"Title": "Language Selector's Pips",
 					"Content": "A <span class='reference'>Pip</span>, similar to the ones shown on the Players List, will be displayed right next to known languages for each player who has at least one actor that understands it. Hovering over a Pip will display the user's name and the list of actors providing access to the language."

src/lang/en.json

@@ -10,12 +10,12 @@
 		}
 	],
 	"compatibility": {
-		"minimum": "12",
-		"verified": "12"
+		"minimum": "13",
+		"verified": "13"
 	},
 	"esmodules": ["module/polyglot.js"],
-	"scripts": ["lib/select2/select2.min.js"],
-	"styles": ["lib/select2/select2.min.css", "styles/fonts.css", "styles/polyglot.css"],
+	"scripts": ["lib/tom-select/tom-select.complete.min.js"],
+	"styles": ["lib/tom-select/tom-select.min.css", "styles/fonts.css", "styles/polyglot.css"],
 	"languages": [
 		{
 			"lang": "en",

src/module.json

@@ -115,7 +115,6 @@ export class PolyglotGeneralSettings extends FormApplication {
 			if (game.settings.get("polyglot", "enableChatFeatures")) {
 				data.settings.chat = {
 					...data.settings.chat,
-					displayCheckbox: this._prepSetting("displayCheckbox"),
 					"display-translated": this._prepSetting("display-translated"),
 					hideTranslation: this._prepSetting("hideTranslation"),
 					allowOOC: this._prepSetting("allowOOC"),
@@ -171,7 +170,6 @@ export class PolyglotGeneralSettings extends FormApplication {
 						"comprehendLanguages",
 						"truespeech",
 						"enableChatFeatures",
-						"displayCheckbox",
 						"display-translated",
 						"hideTranslation",
 						"allowOOC",
@@ -208,8 +206,8 @@ export class PolyglotGeneralSettings extends FormApplication {
 			let s = game.settings.settings.get(`polyglot.${k}`);
 			let current = game.user.isGM ? game.settings.get(s.namespace, s.key) : game.user.getFlag("polyglot", k);
 			if (v === current) continue;
-			requiresClientReload ||= s.scope === "client" && s.requiresReload;
-			requiresWorldReload ||= s.scope === "world" && s.requiresReload;
+			requiresClientReload ||= (s.scope !== CONST.SETTING_SCOPES.WORLD) && s.requiresReload;
+			requiresWorldReload ||= (s.scope === CONST.SETTING_SCOPES.WORLD) && s.requiresReload;
 			if (game.user.isGM) {
 				await game.settings.set(s.namespace, s.key, v);
 			} else {