diff --git a/CREDITS b/CREDITS index 796342d..0197188 100644 --- a/CREDITS +++ b/CREDITS @@ -1,5 +1,8 @@ Palm tree: Warlock's Gauntlet artists - rAum, jackFlower, DrZoliparia, Neil2D () Mosin-Nagant sound : Tabasco () +Mauser sound : Tito Lahaye (https://freesound.org/people/Tito%20Lahaye/sounds/77246/) +Mauser sound : Lubini (https://freesound.org/people/Lubini/sounds/338240/) +Mauser sound : ryanconway (https://freesound.org/people/ryanconway/sounds/260738/) Explosion1 : Bleed () MaleScreaming : MaleDie : diff --git a/assets/demo1_deployment.json b/assets/demo1_deployment.json index 48e04ac..1ee7b2d 100644 --- a/assets/demo1_deployment.json +++ b/assets/demo1_deployment.json @@ -1081,37 +1081,37 @@ }, "squad_uuid": 5, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1124,37 +1124,37 @@ }, "squad_uuid": 5, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1167,37 +1167,37 @@ }, "squad_uuid": 5, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1210,37 +1210,37 @@ }, "squad_uuid": 5, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1253,37 +1253,37 @@ }, "squad_uuid": 5, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1296,37 +1296,37 @@ }, "squad_uuid": 6, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1339,37 +1339,37 @@ }, "squad_uuid": 6, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1382,37 +1382,37 @@ }, "squad_uuid": 6, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1425,37 +1425,37 @@ }, "squad_uuid": 6, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1468,37 +1468,37 @@ }, "squad_uuid": 6, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1511,37 +1511,37 @@ }, "squad_uuid": 7, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1554,37 +1554,37 @@ }, "squad_uuid": 7, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1597,37 +1597,37 @@ }, "squad_uuid": 7, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1640,37 +1640,37 @@ }, "squad_uuid": 7, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1683,37 +1683,37 @@ }, "squad_uuid": 7, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1726,37 +1726,37 @@ }, "squad_uuid": 8, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1769,37 +1769,37 @@ }, "squad_uuid": 8, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1812,37 +1812,37 @@ }, "squad_uuid": 8, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1855,37 +1855,37 @@ }, "squad_uuid": 8, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -1898,37 +1898,37 @@ }, "squad_uuid": 8, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] } diff --git a/assets/demo1_deployment2.json b/assets/demo1_deployment2.json index f5a3217..f53b64a 100644 --- a/assets/demo1_deployment2.json +++ b/assets/demo1_deployment2.json @@ -1 +1,1938 @@ -{"soldiers":[{"uuid":0,"side":"A","world_point":{"x":863.1341,"y":533.3604},"squad_uuid":0,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":1,"side":"A","world_point":{"x":857.0,"y":547.0},"squad_uuid":0,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":2,"side":"A","world_point":{"x":847.0,"y":532.0},"squad_uuid":0,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":3,"side":"A","world_point":{"x":882.0,"y":557.0},"squad_uuid":0,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":4,"side":"A","world_point":{"x":842.0,"y":527.0},"squad_uuid":0,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":5,"side":"A","world_point":{"x":527.6413,"y":162.98627},"squad_uuid":1,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":6,"side":"A","world_point":{"x":522.0,"y":177.0},"squad_uuid":1,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":7,"side":"A","world_point":{"x":527.0,"y":142.0},"squad_uuid":1,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":8,"side":"A","world_point":{"x":547.0,"y":162.0},"squad_uuid":1,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":9,"side":"A","world_point":{"x":497.0,"y":147.0},"squad_uuid":1,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":10,"side":"A","world_point":{"x":920.69434,"y":293.37836},"squad_uuid":2,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":11,"side":"A","world_point":{"x":932.0,"y":312.0},"squad_uuid":2,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":12,"side":"A","world_point":{"x":917.0,"y":277.0},"squad_uuid":2,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":13,"side":"A","world_point":{"x":937.0,"y":322.0},"squad_uuid":2,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":14,"side":"A","world_point":{"x":917.0,"y":272.0},"squad_uuid":2,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":15,"side":"A","world_point":{"x":811.5926,"y":97.0933},"squad_uuid":3,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":16,"side":"A","world_point":{"x":827.0,"y":112.0},"squad_uuid":3,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":17,"side":"A","world_point":{"x":812.0,"y":92.0},"squad_uuid":3,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":18,"side":"A","world_point":{"x":832.0,"y":122.0},"squad_uuid":3,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":19,"side":"A","world_point":{"x":792.0,"y":67.0},"squad_uuid":3,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":20,"side":"A","world_point":{"x":888.83417,"y":651.44104},"squad_uuid":4,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":21,"side":"A","world_point":{"x":892.0,"y":652.0},"squad_uuid":4,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":22,"side":"A","world_point":{"x":897.0,"y":647.0},"squad_uuid":4,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":23,"side":"A","world_point":{"x":897.0,"y":667.0},"squad_uuid":4,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":24,"side":"A","world_point":{"x":892.0,"y":642.0},"squad_uuid":4,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":25,"side":"B","world_point":{"x":398.58594,"y":460.12982},"squad_uuid":5,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":26,"side":"B","world_point":{"x":397.0,"y":452.0},"squad_uuid":5,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":27,"side":"B","world_point":{"x":417.0,"y":472.0},"squad_uuid":5,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":28,"side":"B","world_point":{"x":387.0,"y":462.0},"squad_uuid":5,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":29,"side":"B","world_point":{"x":417.0,"y":477.0},"squad_uuid":5,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":30,"side":"B","world_point":{"x":49.52823,"y":508.51666},"squad_uuid":6,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":31,"side":"B","world_point":{"x":52.0,"y":512.0},"squad_uuid":6,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":32,"side":"B","world_point":{"x":67.0,"y":517.0},"squad_uuid":6,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":33,"side":"B","world_point":{"x":42.0,"y":512.0},"squad_uuid":6,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":34,"side":"B","world_point":{"x":77.0,"y":522.0},"squad_uuid":6,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":35,"side":"B","world_point":{"x":485.63397,"y":593.49194},"squad_uuid":7,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":36,"side":"B","world_point":{"x":487.0,"y":602.0},"squad_uuid":7,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":37,"side":"B","world_point":{"x":507.0,"y":602.0},"squad_uuid":7,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":38,"side":"B","world_point":{"x":477.0,"y":602.0},"squad_uuid":7,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":39,"side":"B","world_point":{"x":517.0,"y":602.0},"squad_uuid":7,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":40,"side":"B","world_point":{"x":787.1018,"y":816.8062},"squad_uuid":8,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":41,"side":"B","world_point":{"x":787.0,"y":812.0},"squad_uuid":8,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":42,"side":"B","world_point":{"x":807.0,"y":812.0},"squad_uuid":8,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":43,"side":"B","world_point":{"x":777.0,"y":812.0},"squad_uuid":8,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]},{"uuid":44,"side":"B","world_point":{"x":812.0,"y":807.0},"squad_uuid":8,"main_weapon":{"MosinNagantM1924":[false,{"MosinNagant":5}]},"magazines":[{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5},{"MosinNagant":5}]}],"vehicles":[],"boards":{}} \ No newline at end of file +{ + "soldiers": [ + { + "uuid": 0, + "side": "A", + "world_point": { + "x": 863.1341, + "y": 533.3604 + }, + "squad_uuid": 0, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 1, + "side": "A", + "world_point": { + "x": 857.0, + "y": 547.0 + }, + "squad_uuid": 0, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 2, + "side": "A", + "world_point": { + "x": 847.0, + "y": 532.0 + }, + "squad_uuid": 0, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 3, + "side": "A", + "world_point": { + "x": 882.0, + "y": 557.0 + }, + "squad_uuid": 0, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 4, + "side": "A", + "world_point": { + "x": 842.0, + "y": 527.0 + }, + "squad_uuid": 0, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 5, + "side": "A", + "world_point": { + "x": 527.6413, + "y": 162.98627 + }, + "squad_uuid": 1, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 6, + "side": "A", + "world_point": { + "x": 522.0, + "y": 177.0 + }, + "squad_uuid": 1, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 7, + "side": "A", + "world_point": { + "x": 527.0, + "y": 142.0 + }, + "squad_uuid": 1, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 8, + "side": "A", + "world_point": { + "x": 547.0, + "y": 162.0 + }, + "squad_uuid": 1, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 9, + "side": "A", + "world_point": { + "x": 497.0, + "y": 147.0 + }, + "squad_uuid": 1, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 10, + "side": "A", + "world_point": { + "x": 920.69434, + "y": 293.37836 + }, + "squad_uuid": 2, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 11, + "side": "A", + "world_point": { + "x": 932.0, + "y": 312.0 + }, + "squad_uuid": 2, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 12, + "side": "A", + "world_point": { + "x": 917.0, + "y": 277.0 + }, + "squad_uuid": 2, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 13, + "side": "A", + "world_point": { + "x": 937.0, + "y": 322.0 + }, + "squad_uuid": 2, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 14, + "side": "A", + "world_point": { + "x": 917.0, + "y": 272.0 + }, + "squad_uuid": 2, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 15, + "side": "A", + "world_point": { + "x": 811.5926, + "y": 97.0933 + }, + "squad_uuid": 3, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 16, + "side": "A", + "world_point": { + "x": 827.0, + "y": 112.0 + }, + "squad_uuid": 3, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 17, + "side": "A", + "world_point": { + "x": 812.0, + "y": 92.0 + }, + "squad_uuid": 3, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 18, + "side": "A", + "world_point": { + "x": 832.0, + "y": 122.0 + }, + "squad_uuid": 3, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 19, + "side": "A", + "world_point": { + "x": 792.0, + "y": 67.0 + }, + "squad_uuid": 3, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 20, + "side": "A", + "world_point": { + "x": 888.83417, + "y": 651.44104 + }, + "squad_uuid": 4, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 21, + "side": "A", + "world_point": { + "x": 892.0, + "y": 652.0 + }, + "squad_uuid": 4, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 22, + "side": "A", + "world_point": { + "x": 897.0, + "y": 647.0 + }, + "squad_uuid": 4, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 23, + "side": "A", + "world_point": { + "x": 897.0, + "y": 667.0 + }, + "squad_uuid": 4, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 24, + "side": "A", + "world_point": { + "x": 892.0, + "y": 642.0 + }, + "squad_uuid": 4, + "main_weapon": { + "MosinNagantM1924": [ + false, + { + "MosinNagant": 5 + } + ] + }, + "magazines": [ + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + }, + { + "MosinNagant": 5 + } + ] + }, + { + "uuid": 25, + "side": "B", + "world_point": { + "x": 398.58594, + "y": 460.12982 + }, + "squad_uuid": 5, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 26, + "side": "B", + "world_point": { + "x": 397.0, + "y": 452.0 + }, + "squad_uuid": 5, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 27, + "side": "B", + "world_point": { + "x": 417.0, + "y": 472.0 + }, + "squad_uuid": 5, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 28, + "side": "B", + "world_point": { + "x": 387.0, + "y": 462.0 + }, + "squad_uuid": 5, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 29, + "side": "B", + "world_point": { + "x": 417.0, + "y": 477.0 + }, + "squad_uuid": 5, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 30, + "side": "B", + "world_point": { + "x": 49.52823, + "y": 508.51666 + }, + "squad_uuid": 6, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 31, + "side": "B", + "world_point": { + "x": 52.0, + "y": 512.0 + }, + "squad_uuid": 6, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 32, + "side": "B", + "world_point": { + "x": 67.0, + "y": 517.0 + }, + "squad_uuid": 6, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 33, + "side": "B", + "world_point": { + "x": 42.0, + "y": 512.0 + }, + "squad_uuid": 6, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 34, + "side": "B", + "world_point": { + "x": 77.0, + "y": 522.0 + }, + "squad_uuid": 6, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 35, + "side": "B", + "world_point": { + "x": 485.63397, + "y": 593.49194 + }, + "squad_uuid": 7, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 36, + "side": "B", + "world_point": { + "x": 487.0, + "y": 602.0 + }, + "squad_uuid": 7, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 37, + "side": "B", + "world_point": { + "x": 507.0, + "y": 602.0 + }, + "squad_uuid": 7, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 38, + "side": "B", + "world_point": { + "x": 477.0, + "y": 602.0 + }, + "squad_uuid": 7, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 39, + "side": "B", + "world_point": { + "x": 517.0, + "y": 602.0 + }, + "squad_uuid": 7, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 40, + "side": "B", + "world_point": { + "x": 787.1018, + "y": 816.8062 + }, + "squad_uuid": 8, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 41, + "side": "B", + "world_point": { + "x": 787.0, + "y": 812.0 + }, + "squad_uuid": 8, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 42, + "side": "B", + "world_point": { + "x": 807.0, + "y": 812.0 + }, + "squad_uuid": 8, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 43, + "side": "B", + "world_point": { + "x": 777.0, + "y": 812.0 + }, + "squad_uuid": 8, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + }, + { + "uuid": 44, + "side": "B", + "world_point": { + "x": 812.0, + "y": 807.0 + }, + "squad_uuid": 8, + "main_weapon": { + "MauserG41": [ + false, + { + "Mauser": 5 + } + ] + }, + "magazines": [ + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + }, + { + "Mauser": 5 + } + ] + } + ], + "vehicles": [], + "boards": {} +} \ No newline at end of file diff --git a/assets/map1_deployment.json b/assets/map1_deployment.json index 459c892..496ae82 100644 --- a/assets/map1_deployment.json +++ b/assets/map1_deployment.json @@ -134,19 +134,19 @@ }, "squad_uuid": 1, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -159,19 +159,19 @@ }, "squad_uuid": 1, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -184,19 +184,19 @@ }, "squad_uuid": 1, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -209,19 +209,19 @@ }, "squad_uuid": 1, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] }, @@ -234,19 +234,19 @@ }, "squad_uuid": 1, "main_weapon": { - "MosinNagantM1924": [ + "MauserG41": [ false, { - "MosinNagant": 5 + "Mauser": 5 } ] }, "magazines": [ { - "MosinNagant": 5 + "Mauser": 5 }, { - "MosinNagant": 5 + "Mauser": 5 } ] } diff --git a/battle_core/src/audio/mod.rs b/battle_core/src/audio/mod.rs index 19db419..253bad7 100644 --- a/battle_core/src/audio/mod.rs +++ b/battle_core/src/audio/mod.rs @@ -5,6 +5,11 @@ use strum_macros::EnumIter; #[derive(Debug, Hash, Copy, Serialize, Deserialize, Clone, EnumIter, Eq, PartialEq, Display)] pub enum Sound { + MauserRiffleFire1, + MauserRiffleFire2, + MauserRiffleFire3, + MauserRiffleReload1, + MauserRiffleReload2, MosinNagantFire1, MosinNagantFire2, MosinNagantFire3, diff --git a/battle_core/src/game/weapon.rs b/battle_core/src/game/weapon.rs index 93fde2e..4846026 100644 --- a/battle_core/src/game/weapon.rs +++ b/battle_core/src/game/weapon.rs @@ -7,35 +7,41 @@ use crate::audio::Sound; #[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Copy)] pub enum Ammunition { x762x54R, + x792x57, } #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)] pub enum Magazine { MosinNagant(usize), + Mauser(usize), } impl Magazine { pub fn name(&self) -> &str { match self { Magazine::MosinNagant(_) => "Mosin Nagant", + Magazine::Mauser(_) => "Mauser", } } pub fn full(magazine: Self) -> Self { match magazine { Magazine::MosinNagant(_) => Magazine::MosinNagant(5), + Magazine::Mauser(_) => Magazine::Mauser(5), } } pub fn ammunition(&self) -> Ammunition { match self { Magazine::MosinNagant(_) => Ammunition::x762x54R, + Magazine::Mauser(_) => Ammunition::x792x57, } } pub fn filled(&self) -> bool { match self { Magazine::MosinNagant(fill) => *fill > 0, + Magazine::Mauser(fill) => *fill > 0, } } @@ -46,6 +52,11 @@ impl Magazine { *fill -= 1; } } + Magazine::Mauser(fill) => { + if *fill > 0 { + *fill -= 1; + } + } } } } @@ -53,6 +64,7 @@ impl Magazine { #[derive(Debug, Clone, Serialize, Deserialize)] pub enum GunFireSoundType { MosinNagant, + MauserRiffle, } impl GunFireSoundType { @@ -65,6 +77,11 @@ impl GunFireSoundType { Sound::MosinNagantFire4, Sound::MosinNagantFire5, ], + GunFireSoundType::MauserRiffle => vec![ + Sound::MauserRiffleFire1, + Sound::MauserRiffleFire2, + Sound::MauserRiffleFire3, + ], }; let sound = *pick_from .choose(&mut rand::thread_rng()) @@ -78,18 +95,21 @@ impl GunFireSoundType { pub enum Weapon { // ready bullet, filled magazine MosinNagantM1924(bool, Option), + MauserG41(bool, Option), } impl Weapon { pub fn name(&self) -> &str { match self { Weapon::MosinNagantM1924(_, _) => "Mosin Nagant M1924", + Weapon::MauserG41(_, _) => "Mauser G41", } } pub fn gun_fire_sound_type(&self) -> GunFireSoundType { match self { Weapon::MosinNagantM1924(_, _) => GunFireSoundType::MosinNagant, + Weapon::MauserG41(_, _) => GunFireSoundType::MauserRiffle, } } @@ -101,6 +121,7 @@ impl Weapon { Sound::MosinNagantReload3, Sound::MosinNagantReload4, ], + Weapon::MauserG41(_, _) => vec![Sound::MauserRiffleReload1, Sound::MauserRiffleReload2], }; let sound = *pick_from .choose(&mut rand::thread_rng()) @@ -112,12 +133,14 @@ impl Weapon { pub fn magazine(&self) -> &Option { match self { Weapon::MosinNagantM1924(_, magazine) => magazine, + Weapon::MauserG41(_, magazine) => magazine, } } pub fn accepted_magazine(&self, magazine: &Magazine) -> bool { - match magazine { - Magazine::MosinNagant(_) => true, + match self { + Weapon::MosinNagantM1924(_, _) => matches!(magazine, Magazine::MosinNagant(_)), + Weapon::MauserG41(_, _) => matches!(magazine, Magazine::Mauser(_)), } } @@ -129,12 +152,14 @@ impl Weapon { // Default value match self { Weapon::MosinNagantM1924(_, _) => Ammunition::x762x54R, + Weapon::MauserG41(_, _) => Ammunition::x792x57, } } pub fn can_fire(&self) -> bool { match self { Weapon::MosinNagantM1924(ammunition, _) => *ammunition, + Weapon::MauserG41(ammunition, _) => *ammunition, } } @@ -145,6 +170,11 @@ impl Weapon { return magazine.filled(); } } + Weapon::MauserG41(_, magazine) => { + if let Some(magazine) = magazine { + return magazine.filled(); + } + } } false @@ -152,7 +182,8 @@ impl Weapon { pub fn reload(&mut self) { match self { - Weapon::MosinNagantM1924(ready_bullet, magazine) => { + Weapon::MosinNagantM1924(ready_bullet, magazine) + | Weapon::MauserG41(ready_bullet, magazine) => { if !*ready_bullet { if let Some(magazine_) = magazine { if magazine_.filled() { @@ -172,18 +203,21 @@ impl Weapon { pub fn shot(&mut self) { match self { Weapon::MosinNagantM1924(ready_bullet, _) => *ready_bullet = false, + Weapon::MauserG41(ready_bullet, _) => *ready_bullet = false, } } pub fn set_magazine(&mut self, new_magazine: Magazine) { match self { Weapon::MosinNagantM1924(_, magazine) => *magazine = Some(new_magazine), + Weapon::MauserG41(_, magazine) => *magazine = Some(new_magazine), } } pub fn ok_count_magazines(&self) -> usize { match self { - Weapon::MosinNagantM1924(_, _) => 4, + Weapon::MosinNagantM1924(_, _) => 5, + Weapon::MauserG41(_, _) => 5, } } } diff --git a/resources/audio/MauserRiffleFire1.ogg b/resources/audio/MauserRiffleFire1.ogg new file mode 100644 index 0000000..261e56f Binary files /dev/null and b/resources/audio/MauserRiffleFire1.ogg differ diff --git a/resources/audio/MauserRiffleFire2.ogg b/resources/audio/MauserRiffleFire2.ogg new file mode 100644 index 0000000..ef9e114 Binary files /dev/null and b/resources/audio/MauserRiffleFire2.ogg differ diff --git a/resources/audio/MauserRiffleFire3.ogg b/resources/audio/MauserRiffleFire3.ogg new file mode 100644 index 0000000..c2bd30b Binary files /dev/null and b/resources/audio/MauserRiffleFire3.ogg differ diff --git a/resources/audio/MauserRiffleReload1.ogg b/resources/audio/MauserRiffleReload1.ogg new file mode 100644 index 0000000..17a0b12 Binary files /dev/null and b/resources/audio/MauserRiffleReload1.ogg differ diff --git a/resources/audio/MauserRiffleReload2.ogg b/resources/audio/MauserRiffleReload2.ogg new file mode 100644 index 0000000..2a636c7 Binary files /dev/null and b/resources/audio/MauserRiffleReload2.ogg differ