Layout improvements for turn options tab

2025-08-15 20:03:15 +02:00 · 2023-11-09 20:37:41 +02:00
parent 32633d5f52
commit 1f045ab128
2 changed files with 98 additions and 26 deletions
--- a/Mods/vcmi/config/vcmi/english.json
+++ b/Mods/vcmi/config/vcmi/english.json
@@ -227,16 +227,17 @@
 	"vcmi.optionsTab.chessFieldTurn.hover" : "Turn timer",
 	"vcmi.optionsTab.chessFieldBattle.hover" : "Battle timer",
 	"vcmi.optionsTab.chessFieldCreature.hover" : "Unit timer",
-	"vcmi.optionsTab.chessFieldBase.help" : "Starts counting down when the {Turn Timer} reaches zero. It is set only once at the beginning of the game. When this timer reaches zero, the player's turn ends.",
-	"vcmi.optionsTab.chessFieldTurn.help" : "Starts counting down when the player starts their turn on the adventure map. It is reset to its initial value at the start of each turn. Any unused turn time will be added to the {Extra Timer} if it is in use.",
-	"vcmi.optionsTab.chessFieldBattle.help" : "Counts down during battles when the {Unit Timer} reaches zero. It is reset to its initial value at the start of each battle. If the timer reaches zero, the currently active stack will defend.",
-	"vcmi.optionsTab.chessFieldCreature.help" : "Starts counting down when the player is selecting an action for the current stack during battle. It resets to its initial value after the stack's action is completed.",
+	"vcmi.optionsTab.chessFieldBase.help" : "Used when {Turn Timer} reaches 0. Set once at game start. On reaching zero, ends current turn. Any ongoing combat with end with a loss.",
+	"vcmi.optionsTab.chessFieldTurn.help" : "Used out of combat or when {Battle Timer} runs out. Reset each turn. Leftover added to Base Timer at turn's end.",
+	"vcmi.optionsTab.chessFieldBattle.help" : "Used in battles with AI or in pvp combat when {Unit Timer} runs out. Reset at start of each combat.",
+	"vcmi.optionsTab.chessFieldCreature.help" : "Used when selecting unit action in pvp combat. Reset at start of each unit's turn.",

-	"vcmi.optionsTab.simturnsMin.hover" : "Simultaneous turns (minimum)",
-	"vcmi.optionsTab.simturnsMax.hover" : "Simultaneous turns (maximum)",
+	"vcmi.optionsTab.simturns" : "Simultaneous turns",
+	"vcmi.optionsTab.simturnsMin.hover" : "At least for",
+	"vcmi.optionsTab.simturnsMax.hover" : "At most for",
 	"vcmi.optionsTab.simturnsAI.hover" : "(Experimental) Simultaneous AI Turns",
-	"vcmi.optionsTab.simturnsMin.help" : "Players will act simultaneously for specified number of days. Contacts between players are blocked",
-	"vcmi.optionsTab.simturnsMax.help" : "Players will act simultaneously until they meet each other or if specified date has been reached",
+	"vcmi.optionsTab.simturnsMin.help" : "Play simultaneously at least for specified number of days. Contacts between players during this period are blocked",
+	"vcmi.optionsTab.simturnsMax.help" : "Play simultaneously at most for specified number of days or until they meet each other.",
 	"vcmi.optionsTab.simturnsAI.help" : "",

 	// Custom victory conditions for H3 campaigns and HotA maps
--- a/config/widgets/turnOptionsTab.json
+++ b/config/widgets/turnOptionsTab.json
@@ -14,7 +14,7 @@
 		},
 		"labelDescription" : {
 			"type": "multiLineLabel",
-			"font": "small",
+			"font": "tiny",
 			"alignment": "center",
 			"color": "white",
 			"rect": {"x": 0, "y": 0, "w": 300, "h": 35},
@@ -22,11 +22,16 @@
 		},
 		"timeInput" : {
 			"type": "textInput",
-			"background": "timerField",
 			"alignment": "center",
 			"text": "00:00",
-			"rect": {"x": 0, "y": 0, "w": 84, "h": 25},
+			"rect": {"x": 0, "y": 0, "w": 86, "h": 23},
 			"offset": {"x": 0, "y": 0}
+		},
+		"timeInputBackground" : {
+			"type": "transparentFilledRectangle",
+			"rect": {"x": 0, "y": 0, "w": 86, "h": 23},
+			"color": [0, 0, 0, 128],
+			"colorLine": [64, 80, 128, 128]
 		}
 	},
 	
@@ -59,6 +64,24 @@
 			"rect": {"x": 60, "y": 48, "w": 320, "h": 0},
 			"adoptHeight": true
 		},
+		{
+			"type": "texture",
+			"image": "DiBoxBck",
+			"color" : "blue", 
+			"rect": {"x" : 64, "y" : 416, "w": 316, "h": 102}
+		},
+		{
+			"type": "transparentFilledRectangle",
+			"rect": {"x" : 64, "y" : 416, "w": 316, "h": 102},
+			"color": [0, 0, 0, 0],
+			"colorLine": [64, 80, 128, 128]
+		},
+		{
+			"type": "transparentFilledRectangle",
+			"rect": {"x" : 64, "y" : 480, "w": 316, "h": 1},
+			"color": [0, 0, 0, 0],
+			"colorLine": [32, 40, 128, 128]
+		},
 		{
 			"type" : "verticalLayout66",
 			"customType" : "labelTitle",
@@ -78,10 +101,7 @@
 					"text": "vcmi.optionsTab.chessFieldCreature.hover"
 				},
 				{
-					"text": "vcmi.optionsTab.simturnsMin.hover"
-				},
-				{
-					"text": "vcmi.optionsTab.simturnsMax.hover"
+					"text": "vcmi.optionsTab.simturns"
 				}
 			]
 		},
@@ -89,7 +109,7 @@
 		{
 			"type" : "verticalLayout66",
 			"customType" : "labelDescription",
-			"position": {"x": 70, "y": 153},
+			"position": {"x": 70, "y": 155},
 			"items":
 			[
 				{
@@ -105,14 +125,27 @@
 					"text": "vcmi.optionsTab.chessFieldCreature.help"
 				},
 				{
-					"text": "vcmi.optionsTab.simturnsMin.help"
+					"text": ""
 				},
 				{
-					"text": "vcmi.optionsTab.simturnsMax.help"
+					"text": "vcmi.optionsTab.simturnsMin.help"
 				}
 			]
 		},
 		
+		{
+			"type" : "verticalLayout66",
+			"customType" : "timeInputBackground",
+			"position": {"x": 294, "y": 129},
+			"items":
+			[
+				{},
+				{},
+				{},
+				{}
+			]
+		},
+
 		{
 			"type" : "verticalLayout66",
 			"customType" : "timeInput",
@@ -138,17 +171,33 @@
 					"name": "chessFieldCreature",
 					"callback": "parseAndSetTimer_creature",
 					"help": "vcmi.optionsTab.chessFieldCreature.help"
-				},
+				}
 			]
 		},

-		// simturns
 		{
-			"name": "simturnsDuration",
+			"type": "label",
+			"font": "small",
+			"alignment": "left",
+			"color": "white",
+			"text": "vcmi.optionsTab.simturnsMin.hover",
+			"position": {"x": 70, "y": 430}
+		},
+		{
+			"type": "label",
+			"font": "small",
+			"alignment": "left",
+			"color": "white",
+			"text": "vcmi.optionsTab.simturnsMax.hover",
+			"position": {"x": 70, "y": 460}
+		},
+
+		{
+			"name": "simturnsDurationMin",
 			"type": "slider",
 			"orientation": "horizontal",
-			"position": {"x": 258, "y": 398},
-			"size": 120,
+			"position": {"x": 178, "y": 430},
+			"size": 200,
 			"callback": "setSimturnDuration",
 			"itemsVisible": 1,
 			"itemsTotal": 28,
@@ -157,15 +206,37 @@
 			"scrollBounds": {"x": 0, "y": 0, "w": 194, "h": 32},
 			"panningStep": 20
 		},
-		
 		{
-			"name": "labelSimturnsDurationValue",
+			"name": "simturnsDurationMax",
+			"type": "slider",
+			"orientation": "horizontal",
+			"position": {"x": 178, "y": 460},
+			"size": 200,
+			"callback": "setSimturnDuration",
+			"itemsVisible": 1,
+			"itemsTotal": 28,
+			"selected": 0,
+			"style": "blue",
+			"scrollBounds": {"x": 0, "y": 0, "w": 194, "h": 32},
+			"panningStep": 20
+		},
+		{
+			"name": "labelSimturnsDurationValueMin",
 			"type": "label",
 			"font": "small",
 			"alignment": "center",
 			"color": "white",
 			"text": "",
-			"position": {"x": 320, "y": 406}
+			"position": {"x": 320, "y": 438}
+		},
+		{
+			"name": "labelSimturnsDurationValueMax",
+			"type": "label",
+			"font": "small",
+			"alignment": "center",
+			"color": "white",
+			"text": "",
+			"position": {"x": 320, "y": 468}
 		},
 		
 		{