games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Formatting cleanup

Browse Source
This commit is contained in:
Ivan Savenko 2023-03-03 16:14:32 +02:00
parent c976176453
commit 919af720a8
5 changed files with 121 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mods/vcmi/config/vcmi/english.json
View File

@ -50,13 +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": "4",
"vcmi.adventureOptions.mapScrollSpeed4.help": "Set map scrolling speed to very fast",
"vcmi.adventureOptions.mapScrollSpeed5.hover": "5",
"vcmi.adventureOptions.mapScrollSpeed5.help": "Set map scrolling speed to extremely fast",
"vcmi.adventureOptions.mapScrollSpeed5.help": "Set map scrolling speed to fast, very fast.",
"vcmi.battleOptions.queueSizeLabel.hover": "Queue size (takes effect on next battle)",
"vcmi.battleOptions.queueSizeNoneButton.hover": "NONE",
"vcmi.battleOptions.queueSizeNoneButton.hover": "OFF",
"vcmi.battleOptions.queueSizeNoneButton.help": "Disables visibility of stack queue in battle",
"vcmi.battleOptions.queueSizeAutoButton.hover": "AUTO",
"vcmi.battleOptions.queueSizeAutoButton.help": "Sets queue size depending on game resolution (small if width < 700 pixels, big otherwise)",

33
config/widgets/settings/adventureOptionsTab.json
View File

@ -35,16 +35,16 @@
"items":
[
{
"position": {"x": 100, "y": 70},
"text": "core.genrltxt.569"
"position": {"x": 150, "y": 70},
"text": "core.genrltxt.569" // Hero Speed
},
{
"position": {"x": 100, "y": 130},
"text": "core.genrltxt.570"
"position": {"x": 150, "y": 130},
"text": "core.genrltxt.570" // Enemy Speed
},
{
"position": {"x": 100, "y": 190},
"text": "core.genrltxt.571"
"position": {"x": 150, "y": 190},
"text": "core.genrltxt.571" // Scrolling Speed
}
]
},
@ -62,7 +62,6 @@
"help": "core.help.349",
"position": {"x": 0, "y": 0}
},
{
"index": 150,
"type": "toggleButton",
@ -70,7 +69,6 @@
"help": "core.help.350",
"position": {"x": 48, "y": 0}
},
{
"index": 100,
"type": "toggleButton",
@ -78,23 +76,20 @@
"help": "core.help.350",
"position": {"x": 96, "y": 0}
},
{
"index": 50,
"type": "toggleButton",
"image": "sysopb3",
"help": "core.help.351",
"position": {"x": 144, "y": 0}
}
},
{
"index": 25,
"type": "toggleButton",
"image": "sysopb3",
"help": "core.help.351",
"position": {"x": 192, "y": 0}
}
},
{
"index": 0,
"type": "toggleButton",
@ -280,17 +275,17 @@
"color": "white",
"items":
[
{
"position": {"x": 45, "y": 302},
"text": "core.genrltxt.572"
},
// {
// "position": {"x": 45, "y": 302},
// "text": "core.genrltxt.572" // TODO: show move path
// },
{
"position": {"x": 45, "y": 332},
"text": "core.genrltxt.573"
"text": "core.genrltxt.573" // show hero reminder
},
{
"position": {"x": 45, "y": 362},
"text": "core.genrltxt.574"
"text": "core.genrltxt.574" // quick combat
},
{
"position": {"x": 45, "y": 392},

221
config/widgets/settings/battleOptionsTab.json
View File

@ -21,133 +21,100 @@
},
{
"name": "animationSpeedLabel",
"type": "label",
"font": "medium",
"alignment": "center",
"color": "yellow",
"text": "core.genrltxt.393",
"position": {"x": 100, "y": 310}
},
{
"name": "autoCombatOptionsLabel",
"type": "label",
"name": "titlesLabels",
"type": "labelGroup",
"font": "medium",
"alignment": "left",
"color": "yellow",
"text": "core.genrltxt.396",
"position": {"x": 380, "y": 60}
"items":
[
{
"text": "core.genrltxt.396", // Auto-combat options
"position": {"x": 380, "y": 60}
},
{
"text": "core.genrltxt.397", // Creature info
"position": {"x": 10, "y": 210}
}
]
},
{
"name": "creatureInfoLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "yellow",
"text": "core.genrltxt.397",
"position": {"x": 10, "y": 210}
},
{
"name": "creaturesAutoCombatLabel",
"type": "label",
"name": "autoCombatLabels",
"type": "labelGroup",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.398",
"position": {"x": 415, "y": 92}
"items":
[
{
"text": "core.genrltxt.398", // Creatures
"position": {"x": 415, "y": 92}
},
{
"text": "core.genrltxt.399", // Spells
"position": {"x": 415, "y": 122}
},
{
"text": "core.genrltxt.400", // Catapult
"position": {"x": 415, "y": 152}
},
{
"text": "core.genrltxt.151", // Ballista
"position": {"x": 415, "y": 182}
},
{
"text": "core.genrltxt.401", // First Aid Tent
"position": {"x": 415, "y": 212}
}
]
},
{
"name": "spellsAutoCombatLabel",
"type": "label",
"name": "creatureInfoLabels",
"type": "labelGroup",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.399",
"position": {"x": 415, "y": 122}
"items":
[
{
"text": "core.genrltxt.402", // All Stats
"position": {"x": 45, "y": 242}
},
{
"text": "core.genrltxt.403", // Spells only
"position": {"x": 45, "y": 272}
}
]
},
{
"name": "catapultAutoCombatLabel",
"type": "label",
"name": "generalOptionsLabels",
"type": "labelGroup",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.400",
"position": {"x": 415, "y": 152}
},
{
"name": "ballistaAutoCombatLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.151",
"position": {"x": 415, "y": 182}
},
{
"name": "aidTentAutoCombatLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.401",
"position": {"x": 415, "y": 212}
},
{
"name": "creatureInfoAllStatsLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.402",
"position": {"x": 45, "y": 242}
},
{
"name": "creatureInfoOnlySpellsLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.403",
"position": {"x": 45, "y": 272}
},
{
"name": "viewGridLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.404",
"position": {"x": 45, "y": 62}
},
{
"name": "showMovementRangeLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.405",
"position": {"x": 45, "y": 92}
},
{
"name": "mouseShadowLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.406",
"position": {"x": 45, "y": 122}
},
{
"name": "battleCasualtiesLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "core.genrltxt.407",
"position": {"x": 45, "y": 152}
"items":
[
{
"text": "core.genrltxt.404",
"position": {"x": 45, "y": 62}
},
{
"text": "core.genrltxt.405",
"position": {"x": 45, "y": 92}
},
{
"text": "core.genrltxt.406",
"position": {"x": 45, "y": 122}
},
{
"text": "core.genrltxt.407",
"position": {"x": 45, "y": 152}
},
{
"text": "vcmi.battleOptions.skipBattleIntroMusic.hover",
"position": {"x": 45, "y": 182}
}
]
},
{
@ -174,7 +141,24 @@
"position": {"x": 10, "y": 120},
"callback": "mouseShadowChanged"
},
{
"name": "skipBattleIntroMusicCheckbox",
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.battleOptions.skipBattleIntroMusic",
"position": {"x": 10, "y": 180},
"callback": "skipBattleIntroMusicChanged"
},
{
"name": "animationSpeedLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "yellow",
"text": "core.genrltxt.393",
"position": {"x": 10, "y": 305}
},
{
"name": "animationSpeedPicker",
"type": "toggleGroup",
@ -371,25 +355,6 @@
}
],
"callback": "queueSizeChanged"
},
{
"name": "skipBattleIntroMusicLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "vcmi.battleOptions.skipBattleIntroMusic.hover",
"position": {"x": 45, "y": 182}
},
{
"name": "skipBattleIntroMusicCheckbox",
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.battleOptions.skipBattleIntroMusic",
"position": {"x": 10, "y": 180},
"callback": "skipBattleIntroMusicChanged"
}
]
}

36
config/widgets/settings/generalOptionsTab.json
View File

@ -2,7 +2,7 @@
"items":
[
{
"name": "topSettingsLabels",
"name": "settingGroupTitles",
"type": "labelGroup",
"font": "medium",
"alignment": "center",
@ -15,11 +15,11 @@
},
{
"position": {"x": 455, "y": 78},
"text": "core.genrltxt.394"
"text": "core.genrltxt.394" // Music Volume
},
{
"position": {"x": 455, "y": 138},
"text": "core.genrltxt.395"
"text": "core.genrltxt.395" // Effects volume
}
]
},
@ -63,7 +63,7 @@
},
{
"name": "frameAudio",
"name": "frameSound",
"type": "picture",
"image": "settingsWindow/frameAudio",
"position": {"x": 375, "y": 120 }
@ -100,6 +100,14 @@
{
"position": {"x": 45, "y": 392},
"text": "vcmi.systemOptions.framerateButton.hover"
},
{
"text": "vcmi.otherOptions.availableCreaturesAsDwellingLabel.hover",
"position": {"x": 45, "y": 422}
},
{
"text": "vcmi.otherOptions.compactTownCreatureInfo.hover",
"position": {"x": 45, "y": 452}
}
]
},
@ -131,16 +139,6 @@
"callback": "framerateChanged"
},
{
"name": "availableCreaturesAsDwellingLabelText",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "vcmi.otherOptions.availableCreaturesAsDwellingLabel.hover",
"position": {"x": 45, "y": 422}
},
{
"name": "availableCreaturesAsDwellingLabelCheckbox",
"type": "toggleButton",
@ -150,16 +148,6 @@
"callback": "availableCreaturesAsDwellingLabelChanged"
},
{
"name": "compactTownCreatureInfoLabel",
"type": "label",
"font": "medium",
"alignment": "left",
"color": "white",
"text": "vcmi.otherOptions.compactTownCreatureInfo.hover",
"position": {"x": 45, "y": 452}
},
{
"name": "compactTownCreatureInfoCheckbox",
"type": "toggleButton",

22
config/widgets/settings/settingsMainContainer.json
View File

@ -35,7 +35,6 @@
"type": "toggleButton",
"position": {"x": 10, "y": 5},
"image": "settingsWindow/button190",
"transparent" : true,
"help": "vcmi.settingsMainWindow.generalTab",
"items":
[
@ -55,7 +54,6 @@
"type": "toggleButton",
"position": {"x": 205, "y": 5},
"image": "settingsWindow/button190",
"transparent" : true,
"help": "vcmi.settingsMainWindow.adventureTab",
"items":
[
@ -75,7 +73,6 @@
"type": "toggleButton",
"position": {"x": 400, "y": 5},
"image": "settingsWindow/button190",
"transparent" : true,
"help": "vcmi.settingsMainWindow.battleTab",
"items":
[
@ -89,25 +86,6 @@
}
]
}
//disabled, due to being redundant for now
// {
// "index": 3,
// "type": "toggleButton",
// "position": {"x": 450, "y": 0},
// "image": "buttons/quadwide",
// "help": "vcmi.settingsMainWindow.otherTab",
// "items":
// [
// {
// "name": "otherTabButtonTitle",
// "type": "label",
// "font": "big",
// "alignment": "center",
// "color": "yellow",
// "text": "vcmi.settingsMainWindow.otherTab.hover"
// }
// ]
// }
],
"callback": "activateSettingsTab"
},