diff --git a/Mods/vcmi/Data/settingsWindow/frameMovement.png b/Mods/vcmi/Data/settingsWindow/frameMovement.png index 1f121ae2f..15876c23d 100644 Binary files a/Mods/vcmi/Data/settingsWindow/frameMovement.png and b/Mods/vcmi/Data/settingsWindow/frameMovement.png differ diff --git a/Mods/vcmi/Data/settingsWindow/frameStackQueue.png b/Mods/vcmi/Data/settingsWindow/frameStackQueue.png new file mode 100644 index 000000000..a07748458 Binary files /dev/null and b/Mods/vcmi/Data/settingsWindow/frameStackQueue.png differ diff --git a/Mods/vcmi/config/vcmi/english.json b/Mods/vcmi/config/vcmi/english.json index 8501658ca..a448b460b 100644 --- a/Mods/vcmi/config/vcmi/english.json +++ b/Mods/vcmi/config/vcmi/english.json @@ -50,9 +50,12 @@ "vcmi.adventureOptions.forceMovementInfo.help" : "{Always show move info in status bar}\n\n Replaces default status bar info with movement points data without need to hold ALT button.", "vcmi.adventureOptions.showGrid.hover" : "Show grid", "vcmi.adventureOptions.showGrid.help" : "{Show grid}\n\n Shows grid overlay, showing borders between adventure map tiles.", + "vcmi.adventureOptions.mapScrollSpeed4.hover": "", + "vcmi.adventureOptions.mapScrollSpeed5.hover": "", + "vcmi.adventureOptions.mapScrollSpeed6.hover": "", "vcmi.adventureOptions.mapScrollSpeed4.help": "Set map scrolling speed to very fast", "vcmi.adventureOptions.mapScrollSpeed5.help": "Set map scrolling speed to extremely fast", - "vcmi.adventureOptions.mapScrollSpeed5.help": "Set map scrolling speed to fast, very fast.", + "vcmi.adventureOptions.mapScrollSpeed6.help": "Set map scrolling speed to fast, very fast.", "vcmi.battleOptions.queueSizeLabel.hover": "Queue size (takes effect on next battle)", "vcmi.battleOptions.queueSizeNoneButton.hover": "OFF", diff --git a/config/widgets/settings/adventureOptionsTab.json b/config/widgets/settings/adventureOptionsTab.json index af335782f..1a569cfce 100644 --- a/config/widgets/settings/adventureOptionsTab.json +++ b/config/widgets/settings/adventureOptionsTab.json @@ -5,25 +5,31 @@ "name": "lineMovementEnd", "type": "texture", "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 240, "w": 365, "h": 3} + "rect": { "x" : 5, "y" : 22, "w": 365, "h": 3} + }, + { + "name": "lineLabelsEnd", + "type": "texture", + "image": "settingsWindow/lineHorizontal", + "rect": { "x" : 5, "y" : 289, "w": 365, "h": 3} }, { "name": "frameHeroMovement", "type": "picture", "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 57 } + "position": {"x": 6, "y": 50 } }, { "name": "frameEnemyMovement", "type": "picture", "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 117 } + "position": {"x": 6, "y": 110 } }, { "name": "frameMapMovement", "type": "picture", "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 177 } + "position": {"x": 6, "y": 170 } }, { @@ -35,15 +41,15 @@ "items": [ { - "position": {"x": 150, "y": 70}, + "position": {"x": 150, "y": 62}, "text": "core.genrltxt.569" // Hero Speed }, { - "position": {"x": 150, "y": 130}, + "position": {"x": 150, "y": 122}, "text": "core.genrltxt.570" // Enemy Speed }, { - "position": {"x": 150, "y": 190}, + "position": {"x": 150, "y": 182}, "text": "core.genrltxt.571" // Scrolling Speed } ] @@ -52,7 +58,7 @@ { "name": "heroMovementSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 80}, + "position": {"x": 10, "y": 73}, "items": [ { @@ -104,7 +110,7 @@ { "name": "enemyMovementSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 140}, + "position": {"x": 10, "y": 133}, "items": [ { @@ -161,7 +167,7 @@ { "name": "mapScrollSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 200}, + "position": {"x": 10, "y": 193}, "items": [ { @@ -276,27 +282,27 @@ "items": [ { - "position": {"x": 45, "y": 302}, + "position": {"x": 45, "y": 295}, "text": "core.genrltxt.572" // TODO: show move path }, { - "position": {"x": 45, "y": 332}, + "position": {"x": 45, "y": 325}, "text": "core.genrltxt.573" // show hero reminder }, { - "position": {"x": 45, "y": 362}, + "position": {"x": 45, "y": 355}, "text": "core.genrltxt.574" // quick combat }, { - "position": {"x": 45, "y": 392}, + "position": {"x": 45, "y": 385}, "text": "vcmi.adventureOptions.numericQuantities.hover" }, { - "position": {"x": 45, "y": 422}, + "position": {"x": 45, "y": 415}, "text": "vcmi.adventureOptions.forceMovementInfo.hover" }, { - "position": {"x": 45, "y": 452}, + "position": {"x": 45, "y": 445}, "text": "vcmi.adventureOptions.showGrid.hover" } ] @@ -306,14 +312,14 @@ "name": "showMovePathPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 300}, + "position": {"x": 10, "y": 293}, }, { "name": "heroReminderCheckbox", "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.361", - "position": {"x": 10, "y": 330}, + "position": {"x": 10, "y": 323}, "callback": "heroReminderChanged" }, { @@ -321,7 +327,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.362", - "position": {"x": 10, "y": 360}, + "position": {"x": 10, "y": 353}, "callback": "quickCombatChanged" }, { @@ -329,7 +335,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.adventureOptions.numericQuantities", - "position": {"x": 10, "y": 390}, + "position": {"x": 10, "y": 383}, "callback": "numericQuantitiesChanged" }, { @@ -337,7 +343,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.adventureOptions.forceMovementInfo", - "position": {"x": 10, "y": 420}, + "position": {"x": 10, "y": 413}, "callback": "forceMovementInfoChanged" }, { @@ -345,7 +351,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.adventureOptions.showGrid", - "position": {"x": 10, "y": 450}, + "position": {"x": 10, "y": 443}, "callback": "showGridChanged" } ] diff --git a/config/widgets/settings/battleOptionsTab.json b/config/widgets/settings/battleOptionsTab.json index 5d3f1c0a7..3e0c674f5 100644 --- a/config/widgets/settings/battleOptionsTab.json +++ b/config/widgets/settings/battleOptionsTab.json @@ -5,19 +5,13 @@ "name": "lineCreatureInfo", "type": "texture", "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 205, "w": 365, "h": 3} + "rect": { "x" : 5, "y" : 199, "w": 365, "h": 3} }, { "name": "lineAnimationSpeed", "type": "texture", "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 295, "w": 365, "h": 3} - }, - { - "name": "lineQueueSize", - "type": "texture", - "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 365, "w": 365, "h": 3} + "rect": { "x" : 5, "y" : 289, "w": 365, "h": 3} }, { @@ -30,11 +24,11 @@ [ { "text": "core.genrltxt.396", // Auto-combat options - "position": {"x": 380, "y": 60} + "position": {"x": 380, "y": 55} }, { "text": "core.genrltxt.397", // Creature info - "position": {"x": 10, "y": 210} + "position": {"x": 10, "y": 205} } ] }, @@ -48,23 +42,23 @@ [ { "text": "core.genrltxt.398", // Creatures - "position": {"x": 415, "y": 92} + "position": {"x": 415, "y": 85} }, { "text": "core.genrltxt.399", // Spells - "position": {"x": 415, "y": 122} + "position": {"x": 415, "y": 115} }, { "text": "core.genrltxt.400", // Catapult - "position": {"x": 415, "y": 152} + "position": {"x": 415, "y": 145} }, { "text": "core.genrltxt.151", // Ballista - "position": {"x": 415, "y": 182} + "position": {"x": 415, "y": 175} }, { "text": "core.genrltxt.401", // First Aid Tent - "position": {"x": 415, "y": 212} + "position": {"x": 415, "y": 205} } ] }, @@ -72,31 +66,31 @@ "name": "autoCombatCreaturesPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 90}, + "position": {"x": 380, "y": 83}, }, { "name": "autoCombatSpellsPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 120}, + "position": {"x": 380, "y": 113}, }, { "name": "autoCombatCatapultPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 150}, + "position": {"x": 380, "y": 143}, }, { "name": "autoCombatBallistaPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 180}, + "position": {"x": 380, "y": 173}, }, { "name": "autoCombatFirstAidTentPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 210}, + "position": {"x": 380, "y": 203}, }, { @@ -109,11 +103,11 @@ [ { "text": "core.genrltxt.402", // All Stats - "position": {"x": 45, "y": 242} + "position": {"x": 45, "y": 235} }, { "text": "core.genrltxt.403", // Spells only - "position": {"x": 45, "y": 272} + "position": {"x": 45, "y": 265} } ] }, @@ -121,13 +115,13 @@ "name": "creatureInfoAllPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 240}, + "position": {"x": 10, "y": 233}, }, { "name": "creatureInfoSpellsPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 270}, + "position": {"x": 10, "y": 263}, }, { @@ -140,23 +134,23 @@ [ { "text": "core.genrltxt.404", - "position": {"x": 45, "y": 62} + "position": {"x": 45, "y": 55} }, { "text": "core.genrltxt.405", - "position": {"x": 45, "y": 92} + "position": {"x": 45, "y": 85} }, { "text": "core.genrltxt.406", - "position": {"x": 45, "y": 122} + "position": {"x": 45, "y": 115} }, { "text": "core.genrltxt.407", - "position": {"x": 45, "y": 152} + "position": {"x": 45, "y": 145} }, { "text": "vcmi.battleOptions.skipBattleIntroMusic.hover", - "position": {"x": 45, "y": 182} + "position": {"x": 45, "y": 175} } ] }, @@ -166,7 +160,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.427", - "position": {"x": 10, "y": 60}, + "position": {"x": 10, "y": 53}, "callback": "viewGridChanged" }, { @@ -174,7 +168,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.428", - "position": {"x": 10, "y": 90}, + "position": {"x": 10, "y": 83}, "callback": "movementShadowChanged" }, { @@ -182,24 +176,30 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.429", - "position": {"x": 10, "y": 120}, + "position": {"x": 10, "y": 113}, "callback": "mouseShadowChanged" }, { "name": "battleFieldCasualtiesPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 150}, + "position": {"x": 10, "y": 143}, }, { "name": "skipBattleIntroMusicCheckbox", "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.battleOptions.skipBattleIntroMusic", - "position": {"x": 10, "y": 180}, + "position": {"x": 10, "y": 173}, "callback": "skipBattleIntroMusicChanged" }, + { + "name": "frameAnimationSpeed", + "type": "picture", + "image": "settingsWindow/frameMovement", + "position": {"x": 6, "y": 350 } + }, { "name": "animationSpeedLabel", "type": "label", @@ -207,18 +207,12 @@ "alignment": "center", "color": "yellow", "text": "core.genrltxt.393", - "position": {"x": 150, "y": 320} - }, - { - "name": "frameAnimationSpeed", - "type": "picture", - "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 307 } + "position": {"x": 150, "y": 362} }, { "name": "animationSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 330}, + "position": {"x": 10, "y": 373}, "items": [ { @@ -321,20 +315,27 @@ "callback": "animationSpeedChanged" }, + { + "name": "frameQueueSize", + "type": "picture", + "image": "settingsWindow/frameStackQueue", + "position": {"x": 6, "y": 410 } + }, + { "name": "queueSizeLabel", "type": "label", "font": "medium", - "alignment": "left", + "alignment": "center", "color": "yellow", "text": "vcmi.battleOptions.queueSizeLabel.hover", - "position": {"x": 10, "y": 400} + "position": {"x": 170, "y": 422} }, { "name": "queueSizePicker", "type": "toggleGroup", - "position": {"x": 10, "y": 430}, + "position": {"x": 10, "y": 434}, "items": [ { diff --git a/config/widgets/settings/generalOptionsTab.json b/config/widgets/settings/generalOptionsTab.json index c9479b19f..5316d84d4 100644 --- a/config/widgets/settings/generalOptionsTab.json +++ b/config/widgets/settings/generalOptionsTab.json @@ -1,6 +1,12 @@ { "items": [ + { + "name": "lineLabelsEnd", + "type": "texture", + "image": "settingsWindow/lineHorizontal", + "rect": { "x" : 5, "y" : 289, "w": 365, "h": 3} + }, { "name": "settingGroupTitles", "type": "labelGroup", @@ -14,11 +20,11 @@ "text": "vcmi.systemOptions.resolutionButton.hover" }, { - "position": {"x": 455, "y": 78}, + "position": {"x": 460, "y": 98}, "text": "core.genrltxt.394" // Music Volume }, { - "position": {"x": 455, "y": 138}, + "position": {"x": 460, "y": 158}, "text": "core.genrltxt.395" // Effects volume } ] @@ -47,13 +53,13 @@ "name": "frameMusic", "type": "picture", "image": "settingsWindow/frameAudio", - "position": {"x": 375, "y": 60 } + "position": {"x": 380, "y": 80 } }, { "name": "musicSlider", "type": "slider", - "position": {"x": 380, "y": 95}, + "position": {"x": 385, "y": 115}, "size": 200, "style": "brown", "orientation": "horizontal", @@ -66,13 +72,13 @@ "name": "frameSound", "type": "picture", "image": "settingsWindow/frameAudio", - "position": {"x": 375, "y": 120 } + "position": {"x": 380, "y": 140 } }, { "name": "soundVolumeSlider", "type": "slider", - "position": {"x": 380, "y": 155}, + "position": {"x": 385, "y": 175}, "size": 200, "style": "brown", "orientation": "horizontal", @@ -90,24 +96,24 @@ "items": [ { - "position": {"x": 45, "y": 332}, + "position": {"x": 45, "y": 325}, "text": "core.genrltxt.577" }, { - "position": {"x": 45, "y": 362}, + "position": {"x": 45, "y": 355}, "text": "vcmi.systemOptions.fullscreenButton.hover" }, { - "position": {"x": 45, "y": 392}, + "position": {"x": 45, "y": 385}, "text": "vcmi.systemOptions.framerateButton.hover" }, { "text": "vcmi.otherOptions.availableCreaturesAsDwellingLabel.hover", - "position": {"x": 45, "y": 422} + "position": {"x": 45, "y": 415} }, { "text": "vcmi.otherOptions.compactTownCreatureInfo.hover", - "position": {"x": 45, "y": 452} + "position": {"x": 45, "y": 445} } ] }, @@ -117,7 +123,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.364", - "position": {"x": 10, "y": 330}, + "position": {"x": 10, "y": 323}, "callback": "spellbookAnimationChanged" }, @@ -126,7 +132,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.systemOptions.fullscreenButton", - "position": {"x": 10, "y": 360}, + "position": {"x": 10, "y": 353}, "callback": "fullscreenChanged" }, @@ -135,7 +141,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.systemOptions.framerateButton", - "position": {"x": 10, "y": 390}, + "position": {"x": 10, "y": 383}, "callback": "framerateChanged" }, @@ -144,7 +150,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.otherOptions.availableCreaturesAsDwellingLabel", - "position": {"x": 10, "y": 420}, + "position": {"x": 10, "y": 413}, "callback": "availableCreaturesAsDwellingLabelChanged" }, @@ -153,7 +159,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.otherOptions.compactTownCreatureInfo", - "position": {"x": 10, "y": 450}, + "position": {"x": 10, "y": 443}, "callback": "compactTownCreatureInfoChanged" } ] diff --git a/config/widgets/settings/settingsMainContainer.json b/config/widgets/settings/settingsMainContainer.json index 8cbe34c6e..98bb88126 100644 --- a/config/widgets/settings/settingsMainContainer.json +++ b/config/widgets/settings/settingsMainContainer.json @@ -7,6 +7,12 @@ "image": "DiBoxBck", "rect": {"w": 600, "h": 480} }, +// { +// "name": "debugGrid", +// "type": "texture", +// "image": "settingsWindow/debugGrid", +// "rect": {"w": 600, "h": 480} +// }, { "name": "lineTabs", "type": "texture", @@ -90,65 +96,66 @@ "callback": "activateSettingsTab" }, + { + "name": "lineButtons", + "type": "texture", + "image": "settingsWindow/lineHorizontal", + "rect": { "x" : 375, "y" : 289, "w": 220, "h": 3} + }, { "name": "loadButton", "type": "button", - "position": {"x": 380, "y": 300}, + "position": {"x": 380, "y": 306}, "image": "SOLOAD.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.321", "callback": "loadGame", "hotkey": "l" }, - { "name": "saveButton", "type": "button", - "position": {"x": 490, "y": 300}, + "position": {"x": 490, "y": 306}, "image": "SOSAVE.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.322", "callback": "saveGame", "hotkey": "s" }, - { "name": "restartButton", "type": "button", - "position": {"x": 380, "y": 360}, + "position": {"x": 380, "y": 364}, "image": "SORSTRT.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.323", "callback": "restartGame", "hotkey": "r" }, - { "name": "mainMenuButton", "type": "button", - "position": {"x": 490, "y": 360}, + "position": {"x": 490, "y": 364}, "image": "SOMAIN.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.320", "callback": "returnToMainMenu", "hotkey": "m" }, - { "name": "quitButton", "type": "button", - "position": {"x": 380, "y": 420}, + "position": {"x": 380, "y": 422}, "image": "soquit.def", "imageOrder": [1, 0, 2, 3], "help": "core.help.324", "callback": "quitGame", "hotkey": "q" }, - { "name": "closeSettingsButton", "type": "button", - "position": {"x": 490, "y": 420}, + "position": {"x": 490, "y": 422}, "image": "soretrn.def", "imageOrder": [1, 0, 2, 3], "help": "core.help.325",