Added base reserve ammo

Author: ValeraShimchuck

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/domain/GameScenario.kt

@@ -47,6 +47,7 @@ sealed interface GameScenario<T : GameScenario<T>> {
                             add("player", JsonPrimitive(index + 1))
                             add("team", JsonPrimitive(player.team.id))
                             add("ammoReserve", JsonPrimitive(player.ammo))
+                            add("baseAmmoReserve", JsonPrimitive(player.baseAmmo))
                         })
                     }
                 })
@@ -157,7 +158,9 @@ sealed interface GameScenario<T : GameScenario<T>> {
                         val teamId = playerObj.getAsJsonPrimitive("team").asInt
                         Player(
                             team = PlayerTeam.fromId(teamId),
-                            playerObj.getAsJsonPrimitive("ammoReserve").asInt
+                            playerObj.getAsJsonPrimitive("ammoReserve")?.asInt ?: 500,
+                            playerObj.getAsJsonPrimitive("baseAmmoReserve")?.asInt
+                                ?: playerObj.getAsJsonPrimitive("ammoReserve")?.asInt ?: 500
                         )
                     }.toList()
 

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/domain/player/Player.kt

@@ -2,5 +2,6 @@ package ua.valeriishymchuk.lobmapeditor.domain.player
 
 data class Player(
     val team: PlayerTeam,
-    val ammo: Int
+    val ammo: Int,
+    val baseAmmo: Int
 )

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/services/ProjectsService.kt

@@ -77,8 +77,8 @@ class ProjectsService(override val di: DI) : DIAware {
                 ),
                 units = emptyList(),
                 players = listOf(
-                    Player(PlayerTeam.RED, 500),
-                    Player(PlayerTeam.BLUE, 500),
+                    Player(PlayerTeam.RED, 500, 500),
+                    Player(PlayerTeam.BLUE, 500, 500),
                 ),
             ),
             File(dir, "map.json")

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/ui/component/project/tool/ToolConfig.kt

@@ -281,12 +281,30 @@ private fun PlayerToolConfig() {
         )
     }
 
+
+
     LaunchedEffect(currentPlayerReference) {
 //        println("Changed currentPlayerReference to ${currentPlayerReference.key}")
 //        val textValue = ammoTextFieldValue.text.toIntOrNull() ?: return@LaunchedEffect
         ammoTextFieldValue = ammoTextFieldValue.copy(text = currentPlayer.ammo.toString())
     }
 
+    var baseAmmoTextFieldValue by remember {
+        mutableStateOf(
+            TextFieldValue(
+                text = currentPlayer.baseAmmo.toString(),
+                selection = TextRange(currentPlayer.baseAmmo.toString().length)
+            )
+        )
+    }
+
+
+    LaunchedEffect(currentPlayerReference) {
+//        println("Changed currentPlayerReference to ${currentPlayerReference.key}")
+//        val textValue = ammoTextFieldValue.text.toIntOrNull() ?: return@LaunchedEffect
+        baseAmmoTextFieldValue = baseAmmoTextFieldValue.copy(text = currentPlayer.baseAmmo.toString())
+    }
+
     val playerPopupManager = remember { PopupManager() }
     val teamPopupManager = remember { PopupManager() }
     val newOwnerPopupManager = remember { PopupManager() }
@@ -398,6 +416,51 @@ private fun PlayerToolConfig() {
         }
     )
 
+    Spacer(Modifier.height(10.dp))
+
+    Text("Base ammo:")
+
+    TextField(
+        value = baseAmmoTextFieldValue,
+        onValueChange = { newValue ->
+            baseAmmoTextFieldValue = newValue
+            baseAmmoTextFieldValue = baseAmmoTextFieldValue.copy(
+                text = newValue.text
+                    .replace(Regex("[^0-9]"), "").let { str ->
+                        val value = str.toFloatOrNull() ?: return@let str
+                        val coercedValue = max(value, 0f)
+                        if (coercedValue == value) return@let str
+                        coercedValue.toString()
+                    }
+            )
+
+
+            val finalText: Int = baseAmmoTextFieldValue.text.ifEmpty { "0" }.toIntOrNull() ?: 0
+
+            val oldList = scenario!!.players
+            val newList = scenario!!.players.mapIndexed { id, player ->
+                if (currentPlayerReference.key != id) return@mapIndexed player
+                player.copy(baseAmmo = finalText)
+            }
+            val command = UpdatePlayerListCommand(
+                oldList,
+                newList
+            )
+            editorService.executeCompound(command)
+        },
+        modifier = Modifier.onFocusChanged { focus ->
+            if (!focus.isFocused) {
+                editorService.flushCompound()
+            }
+        },
+        leadingIcon = {
+            Row {
+                Text("Base ammo", color = JewelTheme.globalColors.text.info)
+                Spacer(Modifier.width(4.dp))
+            }
+        }
+    )
+
 
     data class PlayerMapping(
         val player: Player,
@@ -476,7 +539,7 @@ private fun PlayerToolConfig() {
             onClick = {
                 val oldList = scenario!!.players
                 val newList = scenario!!.players.toMutableList()
-                newList.add(Player(PlayerTeam.RED, 500))
+                newList.add(Player(PlayerTeam.RED, 500, 500))
                 val command = UpdatePlayerListCommand(
                     oldList,
                     newList