diff --git a/.circleci/config.yml b/.circleci/config.yml
index 142f796ff5..70848bc0f0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@
 version: 2.1
 
 orbs:
-   aws-s3: circleci/aws-s3@3.0.0 
+   aws-s3: circleci/aws-s3@3.0.0
    aws-ecr: circleci/aws-ecr@8.0.0
 
 commands:
@@ -39,7 +39,7 @@ jobs:
   test-eagle:
     docker:
       - image: nolen777/circleci-bazelisk:0.0.8
-      
+
     resource_class: xlarge
 
     steps:
@@ -59,7 +59,7 @@ jobs:
   test-shardok:
     docker:
       - image: nolen777/circleci-bazelisk:0.0.8
-      
+
     resource_class: xlarge
 
     steps:
@@ -75,18 +75,18 @@ jobs:
           command: mkdir -p /tmp/testlogs-shardok && cp -R ./bazel-testlogs/* /tmp/testlogs-shardok/
       - store_test_results:
           path: /tmp/testlogs-shardok
-  
+
   build-eagle:
     docker:
       - image: nolen777/circleci-bazelisk:0.0.8
-      
+
     resource_class: xlarge
-    
+
     steps:
       - checkout
       - setup-tools
       - setup-bazelrc
-          
+
       - run:
           name: Build servers
           command: ./ci/build_servers_eagle_cci.sh
@@ -127,7 +127,7 @@ jobs:
   deploy-shardok:
     docker:
       - image: nolen777/circleci-bazelisk:0.0.8
-    
+
     steps:
       - attach_workspace:
           at: deploy
diff --git a/.clang-format b/.clang-format
index 2d9cc5db21..5cfdd84709 100644
--- a/.clang-format
+++ b/.clang-format
@@ -23,7 +23,7 @@ AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
-BraceWrapping:   
+BraceWrapping:
   AfterCaseLabel:  false
   AfterClass:      false
  # AfterControlStatement: false
@@ -60,12 +60,12 @@ DerivePointerAlignment: true
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:   
+ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
 IncludeBlocks:   Regroup
-IncludeCategories: 
+IncludeCategories:
   - Regex:           '^<ext/.*\.h>'
     Priority:        2
   - Regex:           '^<.*\.h>'
@@ -99,9 +99,9 @@ PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
-RawStringFormats: 
+RawStringFormats:
   - Language:        Cpp
-    Delimiters:      
+    Delimiters:
       - cc
       - CC
       - cpp
@@ -112,12 +112,12 @@ RawStringFormats:
     CanonicalDelimiter: ''
     BasedOnStyle:    google
   - Language:        TextProto
-    Delimiters:      
+    Delimiters:
       - pb
       - PB
       - proto
       - PROTO
-    EnclosingFunctions: 
+    EnclosingFunctions:
       - EqualsProto
       - EquivToProto
       - PARSE_PARTIAL_TEXT_PROTO
@@ -147,7 +147,7 @@ SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard:        Auto
-StatementMacros: 
+StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth:        8
diff --git a/ci/lambda/unity3d_windows_build_handler.py b/ci/lambda/unity3d_windows_build_handler.py
index 87a4720c40..7f59345ff4 100644
--- a/ci/lambda/unity3d_windows_build_handler.py
+++ b/ci/lambda/unity3d_windows_build_handler.py
@@ -98,7 +98,7 @@ def syncToS3(local_dir, local_shas, remote_shas):
                 #     # if attrs['ObjectSize'] != os.stat(file_path).st_size:
                 #     #     print('\tsizes don\'t match, uploading')
                 #     #     object_matches = False
-                    
+
                 # except ClientError as e:
                 #     print('\tUnable to fetch remote file attributes: ' + str(e))
                 #     object_matches = False
diff --git a/ci/local_push_windows.py b/ci/local_push_windows.py
index b3126d5a4c..4b33e448c4 100755
--- a/ci/local_push_windows.py
+++ b/ci/local_push_windows.py
@@ -98,7 +98,7 @@ def syncToS3(local_dir, local_shas, remote_shas):
                 #     # if attrs['ObjectSize'] != os.stat(file_path).st_size:
                 #     #     print('\tsizes don\'t match, uploading')
                 #     #     object_matches = False
-                    
+
                 # except ClientError as e:
                 #     print('\tUnable to fetch remote file attributes: ' + str(e))
                 #     object_matches = False
diff --git a/ci/webhook/hooks.json b/ci/webhook/hooks.json
index ce82613056..236f46c9ca 100644
--- a/ci/webhook/hooks.json
+++ b/ci/webhook/hooks.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "unity-webhook",
-    "execute-command": 
+    "execute-command":
 "ci/webhook/build_and_deploy_unity.sh",
     "command-working-directory": ".",
     "pass-arguments-to-command":
diff --git a/ci/webhook/unity3d_windows_build_handler.py b/ci/webhook/unity3d_windows_build_handler.py
index e39294f4cb..bf6a1de631 100755
--- a/ci/webhook/unity3d_windows_build_handler.py
+++ b/ci/webhook/unity3d_windows_build_handler.py
@@ -121,7 +121,7 @@ def syncToS3(local_dir, s3_root, local_shas, remote_shas):
                 #     # if attrs['ObjectSize'] != os.stat(file_path).st_size:
                 #     #     print('\tsizes don\'t match, uploading')
                 #     #     object_matches = False
-                    
+
                 # except ClientError as e:
                 #     print('\tUnable to fetch remote file attributes: ' + str(e))
                 #     object_matches = False
diff --git a/installdata/scripts/prune_main.py b/installdata/scripts/prune_main.py
index ffd2ddd6c1..440c5d9e4c 100755
--- a/installdata/scripts/prune_main.py
+++ b/installdata/scripts/prune_main.py
@@ -19,4 +19,3 @@ for file in os.listdir(base):
         if int(file) < current_build_number - 1:
             print('Removing old build ' + file)
             shutil.rmtree(file)
-        
\ No newline at end of file
diff --git a/map_preprocessor/map_preprocessor/map_preprocessor/MapBitmap.swift b/map_preprocessor/map_preprocessor/map_preprocessor/MapBitmap.swift
index 3cba7ebb73..3d4629daf3 100644
--- a/map_preprocessor/map_preprocessor/map_preprocessor/MapBitmap.swift
+++ b/map_preprocessor/map_preprocessor/map_preprocessor/MapBitmap.swift
@@ -11,14 +11,14 @@ import Cocoa
 
 func MapBitmap(bitmap: NSBitmapImageRep, provincesByColor: Dictionary<Int, Province>) -> [UInt8] {
     var idMap = [UInt8](repeating: 0, count: width * height)
-    
+
     let width = Int(bitmap.size.width)
     let height = Int(bitmap.size.height)
     let totalSize = width * height
-    
+
     let batchSize = 256
     let group = DispatchGroup()
-    
+
     for baseY in stride(from: 0, to: height, by: batchSize) {
         DispatchQueue.global().async(group: group) {
             for y in baseY..<min((baseY + batchSize), height) {
@@ -36,24 +36,24 @@ func MapBitmap(bitmap: NSBitmapImageRep, provincesByColor: Dictionary<Int, Provi
         }
     }
     group.wait()
-    
+
     return idMap;
 }
 
 func MapBitmap2(bitmap: NSBitmapImageRep, provincesByColor: Dictionary<Int, Province>) -> [UInt8] {
     var idMap = [UInt8](repeating: 0, count: width * height)
-    
+
     let width = Int(bitmap.size.width)
     let height = Int(bitmap.size.height)
     let totalSize = width * height
-    
+
     func processSet(_ idxs: [Int]) -> [Int] {
         var indices = idxs.shuffled()
         while !indices.isEmpty {
             let remainingCount = indices.count
             print("Remaining: \(remainingCount)")
             var newRemainingSet = [Int]()
-            
+
             for index in indices {
                 // rotate or randomize order
                 if index % width != width-1 && idMap[index+1] != 0xFE && idMap[index+1] != 0xFF && idMap[index+1] != 0 {
@@ -73,17 +73,17 @@ func MapBitmap2(bitmap: NSBitmapImageRep, provincesByColor: Dictionary<Int, Prov
                 return newRemainingSet
             }
         }
-        
+
         return indices
     }
-    
+
     var remainingSet = [Int]()
     var borderSet = [Int]()
     let group = DispatchGroup()
     let batchSize = 256
-    
+
     let syncQ = DispatchQueue(label: "sync")
-    
+
     for baseY in stride(from: 0, to: height, by: batchSize) {
         DispatchQueue.global().async(group: group) {
             var localRemaining = [Int]()
@@ -105,7 +105,7 @@ func MapBitmap2(bitmap: NSBitmapImageRep, provincesByColor: Dictionary<Int, Prov
                     }
                 }
             }
-            
+
             syncQ.sync {
                 remainingSet.append(contentsOf: localRemaining)
                 borderSet.append(contentsOf: localBorder)
@@ -113,15 +113,15 @@ func MapBitmap2(bitmap: NSBitmapImageRep, provincesByColor: Dictionary<Int, Prov
         }
     }
     group.wait()
-    
+
     let newRemaining = processSet(remainingSet)
     print("Finished remainingSet")
-    
+
     borderSet.append(contentsOf: newRemaining)
-    
+
     let unfinished = processSet(borderSet)
     print("Finished borders with \(unfinished.count) remaining")
-    
+
     return idMap
 }
 
@@ -133,6 +133,6 @@ func FlipArray<T>(array: [T], stride: Int) -> [T] {
             newArray.append(array[(rows - y - 1) * stride + x])
         }
     }
-    
+
     return newArray
 }
diff --git a/map_preprocessor/map_preprocessor/map_preprocessor/MaskMaker.swift b/map_preprocessor/map_preprocessor/map_preprocessor/MaskMaker.swift
index 47badc206e..1742a7c048 100644
--- a/map_preprocessor/map_preprocessor/map_preprocessor/MaskMaker.swift
+++ b/map_preprocessor/map_preprocessor/map_preprocessor/MaskMaker.swift
@@ -11,10 +11,10 @@ import Cocoa
 
 func MasksForProvinces(idMap: [UInt8], provinceIds: [UInt8]) -> Dictionary<UInt8, CGImage> {
     var maskArrays = Dictionary<UInt8, [UInt8]>()
-    
+
     let group = DispatchGroup()
     let syncQ = DispatchQueue(label: "sync")
-    
+
     for id in provinceIds {
         DispatchQueue.global().async(group: group) {
             print("starting for province \(id)")
@@ -24,17 +24,17 @@ func MasksForProvinces(idMap: [UInt8], provinceIds: [UInt8]) -> Dictionary<UInt8
                     arr[index] = 0xFF
                 }
             }
-            
+
             syncQ.sync {
                 maskArrays[id] = arr
             }
         }
     }
-    
+
     group.wait()
-    
+
     var images = Dictionary<UInt8, CGImage>()
-    
+
     for (id, arr) in maskArrays {
         images[id] = CGImage(
             width: width,
diff --git a/map_preprocessor/map_preprocessor/map_preprocessor/main.swift b/map_preprocessor/map_preprocessor/map_preprocessor/main.swift
index 34e005db16..7c85e729ca 100644
--- a/map_preprocessor/map_preprocessor/map_preprocessor/main.swift
+++ b/map_preprocessor/map_preprocessor/map_preprocessor/main.swift
@@ -17,24 +17,24 @@ extension NSColor {
     var rgbColor: NSColor {
         return self.usingColorSpace(NSColorSpace.genericRGB) ?? self
     }
-    
+
     var hexString: String {
         let rgbc = rgbColor
-        
+
         let red = Int(round(rgbc.redComponent * 0xFF))
         let green = Int(round(rgbc.greenComponent * 0xFF))
         let blue = Int(round(rgbc.blueComponent * 0xFF))
         let hexString = NSString(format: "#%02X%02X%02X", red, green, blue)
         return hexString as String
     }
-    
+
     var asInt: Int {
         let rgbc = rgbColor
-        
+
         let red = Int(round(rgbc.redComponent * 0xFF))
         let green = Int(round(rgbc.greenComponent * 0xFF))
         let blue = Int(round(rgbc.blueComponent * 0xFF))
-        
+
         return red << 16 | green << 8 | blue
     }
 }
@@ -106,7 +106,7 @@ for y in 0..<height {
                         provincesById[rightValue]!.neighbors.insert(currentValue)
                     }
                 }
-                
+
                 if y + pixelsOut < height {
                     let downPosition = (y+pixelsOut) * width + x
                     let downValue = idMap[downPosition]
@@ -143,12 +143,12 @@ let images = MasksForProvinces(idMap: idMap, provinceIds: Array(provincesById.ke
 
 for (id, cgImage) in images {
     let bitmap = NSBitmapImageRep(cgImage: cgImage)
-    
+
     guard let pngData = bitmap.representation(using: .png, properties: [:]) else {
         print("unable to make png")
         break
     }
-    
+
     try! pngData.write(to: URL(fileURLWithPath: "/Users/dancrosby/Downloads/grayPngs/\(id).png"))
 }
 
diff --git a/scripts/refresh_name_layers/refresh_name_layers.rb b/scripts/refresh_name_layers/refresh_name_layers.rb
index 9586a676a4..aacc8a85df 100755
--- a/scripts/refresh_name_layers/refresh_name_layers.rb
+++ b/scripts/refresh_name_layers/refresh_name_layers.rb
@@ -26,7 +26,7 @@ end
 
 def lambda_handler(event:, context:)
     response = fetch("https://docs.google.com/spreadsheets/d/1DHEsiv4cY4gE6AX3sVH82K__mpBD1aznIYCQwQxA_F0/export?gid=0&format=tsv")
-    
+
     stringio = Zip::OutputStream.write_buffer do |zio|
         zip_entry = Zip::Entry.new(zio, 'names.tsv', nil, nil, nil, nil, nil, nil, Zip::DOSTime.at(0))
         zio.put_next_entry(zip_entry)
@@ -34,7 +34,7 @@ def lambda_handler(event:, context:)
     end
     stringio.rewind
     new_contents = stringio.string.bytes
-    
+
     s3 = Aws::S3::Client.new
     original_resp = s3.get_object(bucket:'eagle0', key:'names.tsv.zip')
     original_contents = original_resp.body.string.bytes
diff --git a/src/main/cpp/net/eagle0/shardok/ai/ShardokAIClient.cpp b/src/main/cpp/net/eagle0/shardok/ai/ShardokAIClient.cpp
index 8aef012f07..4381d03b5e 100644
--- a/src/main/cpp/net/eagle0/shardok/ai/ShardokAIClient.cpp
+++ b/src/main/cpp/net/eagle0/shardok/ai/ShardokAIClient.cpp
@@ -79,7 +79,7 @@ auto ShardokAIClient::StandardChooseCommandIndex(
                 realAvailableCommands);
         if (riverCrossingIndex >= 0) return riverCrossingIndex;
     }
-    
+
     assert(commandCount == realAvailableCommands.size());
     for (int i = 0; i < commandCount; i++) {
         CheckCommand(realAvailableCommands[i], guessedCommands[i]);
diff --git a/src/main/protobuf/net/eagle0/eagle/internal/action_result.proto b/src/main/protobuf/net/eagle0/eagle/internal/action_result.proto
index 3aa3178589..23f3043548 100644
--- a/src/main/protobuf/net/eagle0/eagle/internal/action_result.proto
+++ b/src/main/protobuf/net/eagle0/eagle/internal/action_result.proto
@@ -32,7 +32,7 @@ message ActionResult {
     .google.protobuf.Int32Value player = 2;
     .google.protobuf.Int32Value province = 3;
     repeated int32 affected_players = 31;
-    
+
     .google.protobuf.Int32Value new_round_id = 4;
     .net.eagle0.eagle.common.NewRoundPhase new_round_phase = 5;
     .net.eagle0.eagle.common.Date new_date = 6;
@@ -54,7 +54,7 @@ message ActionResult {
     .google.protobuf.Int32Value province_acted = 17;
 
     .net.eagle0.eagle.api.SelectedCommand last_command_type_for_acting_province = 28;
-    
+
     .google.protobuf.Int32Value leader = 18;
 
     repeated ChangedFaction changed_factions = 19;
diff --git a/src/main/protobuf/net/eagle0/eagle/internal/battalion.proto b/src/main/protobuf/net/eagle0/eagle/internal/battalion.proto
index 3bbc3fa121..bab8c9d956 100644
--- a/src/main/protobuf/net/eagle0/eagle/internal/battalion.proto
+++ b/src/main/protobuf/net/eagle0/eagle/internal/battalion.proto
@@ -17,7 +17,7 @@ message Battalion {
     int32 id = 1;
     .net.eagle0.eagle.common.BattalionTypeId type = 2;
     int32 size = 3;
-    
+
     double morale = 4;
     double training = 5;
     double armament = 6;
diff --git a/src/main/protobuf/net/eagle0/eagle/internal/hero.proto b/src/main/protobuf/net/eagle0/eagle/internal/hero.proto
index 5dd5ed6eb7..09ea296462 100644
--- a/src/main/protobuf/net/eagle0/eagle/internal/hero.proto
+++ b/src/main/protobuf/net/eagle0/eagle/internal/hero.proto
@@ -18,11 +18,11 @@ message Hero {
     int32 id = 1;
     .google.protobuf.Int32Value faction_id = 2;
     .google.protobuf.Int32Value round_id_joined = 17;
-    
+
     string name = 3;
-    
+
     .net.eagle0.eagle.common.Profession profession = 4;
-    
+
     int32 strength = 5;
     int32 strength_xp = 18;
 
@@ -42,7 +42,7 @@ message Hero {
     int32 ambition = 12;
     int32 gregariousness = 13;
     int32 bravery = 14;
-    
+
     double vigor = 15;
 
     double loyalty = 16;
diff --git a/src/main/protobuf/net/eagle0/eagle/internal/province.proto b/src/main/protobuf/net/eagle0/eagle/internal/province.proto
index 68e1141e29..23fa66b0a0 100644
--- a/src/main/protobuf/net/eagle0/eagle/internal/province.proto
+++ b/src/main/protobuf/net/eagle0/eagle/internal/province.proto
@@ -26,7 +26,7 @@ import "src/main/protobuf/net/eagle0/eagle/internal/supplies.proto";
 message IncomingEndTurnAction {
     int32 from_faction_id = 1;
     int32 from_province_id = 2;
-    
+
     message IncomingRecon {
         int32 hero_id = 1;
     }
diff --git a/src/main/protobuf/net/eagle0/shardok/api/command_descriptor.proto b/src/main/protobuf/net/eagle0/shardok/api/command_descriptor.proto
index db378b0636..c894d5d768 100644
--- a/src/main/protobuf/net/eagle0/shardok/api/command_descriptor.proto
+++ b/src/main/protobuf/net/eagle0/shardok/api/command_descriptor.proto
@@ -19,22 +19,22 @@ package net.eagle0.shardok.api;
 message CommandDescriptor {
     int32 player = 1;
     .net.eagle0.shardok.common.CommandType type = 2;
-    
+
     .google.protobuf.Int32Value actor = 3;
     .google.protobuf.Int32Value action_points = 4;
-    
+
     .net.eagle0.shardok.common.Coords target = 5;
     repeated .net.eagle0.shardok.common.CommandType follow_up_command_types = 6;
     bool will_unhide = 7;
     .net.eagle0.shardok.api.OddsView odds = 8;
-    
+
     message NextRoundTargetInfo {
         .net.eagle0.shardok.common.CommandType type = 1;
         repeated .net.eagle0.shardok.common.Coords targets = 2;
     }
-    
+
     NextRoundTargetInfo next_round_target_info = 9;
-    
+
     .google.protobuf.Int32Value target_unit = 10;
 }
 
diff --git a/src/main/protobuf/net/eagle0/shardok/api/unit_view.proto b/src/main/protobuf/net/eagle0/shardok/api/unit_view.proto
index bd376a9a39..0c71310477 100644
--- a/src/main/protobuf/net/eagle0/shardok/api/unit_view.proto
+++ b/src/main/protobuf/net/eagle0/shardok/api/unit_view.proto
@@ -47,7 +47,7 @@ message HeroView {
         bool controlled_this_round = 2;
     }
     ControlInfo control_info = 3;
-    
+
     message Stats {
         int32 strength = 1;
         int32 agility = 2;
@@ -59,7 +59,7 @@ message HeroView {
         int32 ambition = 8;
         int32 gregariousness = 9;
         int32 bravery = 10;
-        
+
         double vigor = 11;
         double starting_vigor = 12;
     }
@@ -90,7 +90,7 @@ message BattalionView {
 
     BattalionTypeId type = 1;
     int32 size = 2;
-    
+
     .google.protobuf.DoubleValue morale = 3;
     .google.protobuf.DoubleValue training = 4;
     .google.protobuf.DoubleValue armament = 5;
@@ -103,23 +103,23 @@ message UnitView {
     int32 player_id = 2;
     bool hidden = 3;
     bool fortified = 20;
-    
+
     HeroView attached_hero = 4;
     .google.protobuf.Int32Value commanding_unit_id = 5;
-    
+
     .net.eagle0.shardok.common.Coords location = 6;
-    
+
     BattalionView battalion = 7;
-    
+
     .google.protobuf.UInt32Value remaining_action_points = 8;
-    
+
     .google.protobuf.Int32Value stun_rounds_remaining = 9;
-    
+
     .google.protobuf.Int32Value volleys_remaining = 10;
 
     bool can_archery = 11;
     bool can_start_fire = 21;
-    
+
     .google.protobuf.BoolValue morale_low = 12;
     .google.protobuf.BoolValue vigor_low = 13;
 
diff --git a/src/main/protobuf/net/eagle0/shardok/common/weather.proto b/src/main/protobuf/net/eagle0/shardok/common/weather.proto
index 6f2ce6aa59..5ea0c2dd9f 100644
--- a/src/main/protobuf/net/eagle0/shardok/common/weather.proto
+++ b/src/main/protobuf/net/eagle0/shardok/common/weather.proto
@@ -24,7 +24,7 @@ message Weather {
         BLIZZARD = 6;
     }
     Conditions conditions = 1;
-    
+
     message Wind {
         .net.eagle0.shardok.common.HexMapDirection direction = 1;
         int32 speed_in_mph = 2;
diff --git a/src/main/protobuf/net/eagle0/shardok/storage/action_result.proto b/src/main/protobuf/net/eagle0/shardok/storage/action_result.proto
index f6e20cd161..dac85507c8 100644
--- a/src/main/protobuf/net/eagle0/shardok/storage/action_result.proto
+++ b/src/main/protobuf/net/eagle0/shardok/storage/action_result.proto
@@ -42,7 +42,7 @@ message ActionResult {
     .google.protobuf.Int32Value actor = 4;        // optional; UnitId who carried out action
     .google.protobuf.Int32Value target_unit = 5;  // optional; UnitId of target (ie of melee attack)
     .net.eagle0.shardok.common.Coords target_coords = 6;    // optional
-    
+
     .google.protobuf.Int32Value next_player = 7;       // optional; next player that may act
     .google.protobuf.Int32Value next_round = 8;          // optional; new RoundId, if it changed
     .net.eagle0.shardok.common.Weather next_weather = 9;    // optional; new Weather, if it changed
diff --git a/src/main/protobuf/net/eagle0/shardok/storage/odds.proto b/src/main/protobuf/net/eagle0/shardok/storage/odds.proto
index 2769988dd1..fc41018269 100644
--- a/src/main/protobuf/net/eagle0/shardok/storage/odds.proto
+++ b/src/main/protobuf/net/eagle0/shardok/storage/odds.proto
@@ -17,7 +17,7 @@ message Odds {
     int32 weather_factor = 3;
     int32 wind_factor = 4;
     int32 stat_factor = 5;
-    
+
     message OtherFactor {
         int32 value = 1;
         string identifier = 2;
diff --git a/src/main/protobuf/scalapb/scalapb.proto b/src/main/protobuf/scalapb/scalapb.proto
index c280db190f..6cdac9b363 100644
--- a/src/main/protobuf/scalapb/scalapb.proto
+++ b/src/main/protobuf/scalapb/scalapb.proto
@@ -270,7 +270,7 @@ message FieldOptions {
   // it falls back to the file option named `map_type` which defaults to
   // `scala.collection.immutable.Map`
   optional string map_type = 7;
-  
+
   // If true, no default value will be generated for this field in the message
   // constructor. If this field is set, it has the highest precedence and overrides the
   // values at the message-level and file-level.
diff --git a/src/main/resources/net/eagle0/shardok/maps/AlRaala.e0mj b/src/main/resources/net/eagle0/shardok/maps/AlRaala.e0mj
index c9392db320..830dd17e1f 100644
--- a/src/main/resources/net/eagle0/shardok/maps/AlRaala.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/AlRaala.e0mj
@@ -571,7 +571,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -615,10 +615,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -665,7 +665,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Alah.e0mj b/src/main/resources/net/eagle0/shardok/maps/Alah.e0mj
index d66c30cdde..b0bc95cb0a 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Alah.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Alah.e0mj
@@ -575,7 +575,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
@@ -610,10 +610,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -659,7 +659,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -745,7 +745,7 @@
       ]
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Atfordia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Atfordia.e0mj
index a6c2ee32c6..4f563b9cca 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Atfordia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Atfordia.e0mj
@@ -299,7 +299,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -347,13 +347,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -395,19 +395,19 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "STILL_WATER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "PLAINS",
       "modifier": {
-        
+
       }
     },
     {
@@ -457,13 +457,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -508,7 +508,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -597,7 +597,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
@@ -672,7 +672,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -719,13 +719,13 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Berkorszag.e0mj b/src/main/resources/net/eagle0/shardok/maps/Berkorszag.e0mj
index 0d933888c2..9bf591e801 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Berkorszag.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Berkorszag.e0mj
@@ -566,7 +566,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
@@ -600,7 +600,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Bolve.e0mj b/src/main/resources/net/eagle0/shardok/maps/Bolve.e0mj
index 64aae79099..7c5b318e94 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Bolve.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Bolve.e0mj
@@ -570,7 +570,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
@@ -645,19 +645,19 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Chapellia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Chapellia.e0mj
index 678ac08a33..cbae723304 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Chapellia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Chapellia.e0mj
@@ -41,7 +41,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -91,7 +91,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -146,7 +146,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -190,13 +190,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -241,7 +241,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -283,7 +283,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -331,7 +331,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -373,13 +373,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -424,13 +424,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -475,7 +475,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -523,7 +523,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -568,7 +568,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     }
   ],
@@ -614,7 +614,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -656,13 +656,13 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -709,7 +709,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Chia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Chia.e0mj
index 2e3cb0e541..3984c7432d 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Chia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Chia.e0mj
@@ -568,19 +568,19 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -627,10 +627,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Chipingia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Chipingia.e0mj
index 4b6b8e02fe..f25212a9f5 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Chipingia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Chipingia.e0mj
@@ -23,7 +23,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -78,7 +78,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -131,7 +131,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -170,55 +170,55 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -239,7 +239,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -281,7 +281,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -326,7 +326,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -368,7 +368,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -611,13 +611,13 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -664,18 +664,18 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
         {
-          
+
         },
         {
           "column": 1
diff --git a/src/main/resources/net/eagle0/shardok/maps/Eivikia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Eivikia.e0mj
index d9871faf9e..f408e71f62 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Eivikia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Eivikia.e0mj
@@ -11,7 +11,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -56,7 +56,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -104,7 +104,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -149,7 +149,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -197,7 +197,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -239,13 +239,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -334,7 +334,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -592,7 +592,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -634,7 +634,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -681,13 +681,13 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Elekes.e0mj b/src/main/resources/net/eagle0/shardok/maps/Elekes.e0mj
index 04060d8d24..de5a59fe4e 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Elekes.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Elekes.e0mj
@@ -187,7 +187,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -232,13 +232,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -335,7 +335,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -388,7 +388,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -433,7 +433,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -481,7 +481,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -523,7 +523,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -592,7 +592,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -633,7 +633,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -680,7 +680,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -727,10 +727,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Faluria.e0mj b/src/main/resources/net/eagle0/shardok/maps/Faluria.e0mj
index fdc9d17410..5d6ba8dd44 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Faluria.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Faluria.e0mj
@@ -185,31 +185,31 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -239,7 +239,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -262,7 +262,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -292,7 +292,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -323,7 +323,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -350,7 +350,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -373,7 +373,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -406,25 +406,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -620,7 +620,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
diff --git a/src/main/resources/net/eagle0/shardok/maps/Fluria.e0mj b/src/main/resources/net/eagle0/shardok/maps/Fluria.e0mj
index fa7759a8b3..e75c3ea75b 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Fluria.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Fluria.e0mj
@@ -580,7 +580,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
diff --git a/src/main/resources/net/eagle0/shardok/maps/Garholtia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Garholtia.e0mj
index 1567859df4..138d759993 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Garholtia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Garholtia.e0mj
@@ -575,7 +575,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
diff --git a/src/main/resources/net/eagle0/shardok/maps/Grytrand.e0mj b/src/main/resources/net/eagle0/shardok/maps/Grytrand.e0mj
index 680e3db96a..87c6490a8b 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Grytrand.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Grytrand.e0mj
@@ -575,7 +575,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
diff --git a/src/main/resources/net/eagle0/shardok/maps/Hella.e0mj b/src/main/resources/net/eagle0/shardok/maps/Hella.e0mj
index d112fc2556..5fad16e39a 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Hella.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Hella.e0mj
@@ -20,7 +20,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -65,7 +65,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -110,7 +110,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -152,7 +152,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -197,7 +197,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -238,19 +238,19 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -291,13 +291,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -365,7 +365,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -379,7 +379,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -412,13 +412,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -432,7 +432,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -441,25 +441,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -477,7 +477,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -522,7 +522,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -564,7 +564,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -646,7 +646,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "column": 1
diff --git a/src/main/resources/net/eagle0/shardok/maps/Hofolen.e0mj b/src/main/resources/net/eagle0/shardok/maps/Hofolen.e0mj
index 6a6f65b42f..d4fcd74716 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Hofolen.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Hofolen.e0mj
@@ -568,7 +568,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -612,7 +612,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -659,10 +659,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Ingia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Ingia.e0mj
index 9ab5938bce..7ddadbd431 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Ingia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Ingia.e0mj
@@ -570,7 +570,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
diff --git a/src/main/resources/net/eagle0/shardok/maps/Kezonoria.e0mj b/src/main/resources/net/eagle0/shardok/maps/Kezonoria.e0mj
index 384ab1c576..82ca35cd3f 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Kezonoria.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Kezonoria.e0mj
@@ -29,7 +29,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -74,7 +74,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -119,7 +119,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -214,7 +214,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -259,7 +259,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -307,7 +307,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -352,7 +352,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -446,13 +446,13 @@
     {
       "type": "FOREST",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -505,7 +505,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -555,7 +555,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -609,7 +609,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -735,7 +735,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -782,7 +782,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Kojaria.e0mj b/src/main/resources/net/eagle0/shardok/maps/Kojaria.e0mj
index 08059c8e93..850206d1cb 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Kojaria.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Kojaria.e0mj
@@ -613,7 +613,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -656,19 +656,19 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Laufarvia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Laufarvia.e0mj
index 44f9aa2cc9..5c15f8b67f 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Laufarvia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Laufarvia.e0mj
@@ -178,19 +178,19 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -240,7 +240,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -293,7 +293,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -338,7 +338,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -386,7 +386,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -431,13 +431,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -485,7 +485,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -530,7 +530,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -612,7 +612,7 @@
           "row": 1
         },
         {
-          
+
         },
         {
           "column": 1
diff --git a/src/main/resources/net/eagle0/shardok/maps/Lower_Lake.e0mj b/src/main/resources/net/eagle0/shardok/maps/Lower_Lake.e0mj
index 0016aba4da..3e5b82d746 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Lower_Lake.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Lower_Lake.e0mj
@@ -570,7 +570,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
diff --git a/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheField.e0mj b/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheField.e0mj
index 493c56f644..2d75ab6345 100644
--- a/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheField.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheField.e0mj
@@ -510,7 +510,7 @@
   "defenderStartingPositions": {
     "positions": [
       {
-        
+
       },
       {
         "column": 1
@@ -590,25 +590,25 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheForrest.e0mj b/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheForrest.e0mj
index 560d2362ec..534a8cf36e 100644
--- a/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheForrest.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/MeetThemInTheForrest.e0mj
@@ -590,25 +590,25 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Motcia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Motcia.e0mj
index d93bf61c75..79a855c9ec 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Motcia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Motcia.e0mj
@@ -188,13 +188,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -239,13 +239,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -293,7 +293,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -338,7 +338,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -386,13 +386,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -487,7 +487,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -529,7 +529,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -599,7 +599,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -682,7 +682,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -773,7 +773,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Musland.e0mj b/src/main/resources/net/eagle0/shardok/maps/Musland.e0mj
index df142b0b2d..7c7e6ff9ab 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Musland.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Musland.e0mj
@@ -302,25 +302,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -537,7 +537,7 @@
   "defenderStartingPositions": {
     "positions": [
       {
-        
+
       },
       {
         "column": 1
@@ -576,7 +576,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -618,7 +618,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -709,7 +709,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Nikemi.e0mj b/src/main/resources/net/eagle0/shardok/maps/Nikemi.e0mj
index c301c2a4ba..e6b13cd065 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Nikemi.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Nikemi.e0mj
@@ -329,7 +329,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -377,7 +377,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -419,7 +419,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -471,13 +471,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -529,7 +529,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -593,7 +593,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
@@ -796,7 +796,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Onmaa.e0mj b/src/main/resources/net/eagle0/shardok/maps/Onmaa.e0mj
index c3f4812baf..56998fb3f3 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Onmaa.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Onmaa.e0mj
@@ -568,22 +568,22 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Oscasland.e0mj b/src/main/resources/net/eagle0/shardok/maps/Oscasland.e0mj
index 5d6f9e418c..4a9d24617e 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Oscasland.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Oscasland.e0mj
@@ -173,25 +173,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -236,7 +236,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -348,7 +348,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -393,7 +393,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -601,7 +601,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
@@ -803,10 +803,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Parnia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Parnia.e0mj
index f93f505adb..7e3f5663c5 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Parnia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Parnia.e0mj
@@ -568,10 +568,10 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -706,13 +706,13 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Pemeria.e0mj b/src/main/resources/net/eagle0/shardok/maps/Pemeria.e0mj
index 5017bab17f..33ab18e287 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Pemeria.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Pemeria.e0mj
@@ -173,13 +173,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -224,19 +224,19 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -250,13 +250,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -301,25 +301,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -364,31 +364,31 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -628,7 +628,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
@@ -785,7 +785,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -871,7 +871,7 @@
       ]
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Pieksa.e0mj b/src/main/resources/net/eagle0/shardok/maps/Pieksa.e0mj
index b6fa0d40ba..a9132a1379 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Pieksa.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Pieksa.e0mj
@@ -34,13 +34,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -87,7 +87,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -140,7 +140,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -185,7 +185,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -230,7 +230,7 @@
     {
       "type": "MOUNTAIN",
       "modifier": {
-        
+
       }
     },
     {
@@ -280,7 +280,7 @@
     {
       "type": "MOUNTAIN",
       "modifier": {
-        
+
       }
     },
     {
@@ -336,7 +336,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -381,7 +381,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -429,7 +429,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -471,13 +471,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "MOUNTAIN",
       "modifier": {
-        
+
       }
     },
     {
@@ -522,13 +522,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "MOUNTAIN",
       "modifier": {
-        
+
       }
     },
     {
@@ -570,20 +570,20 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "MOUNTAIN",
       "modifier": {
-        
+
       }
     }
   ],
   "defenderStartingPositions": {
     "positions": [
       {
-        
+
       },
       {
         "row": 1
@@ -620,10 +620,10 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -667,10 +667,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -717,7 +717,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Pozia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Pozia.e0mj
index e67a4df790..a071e8d12e 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Pozia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Pozia.e0mj
@@ -14,7 +14,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -59,7 +59,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -107,7 +107,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -149,13 +149,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -200,7 +200,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -242,7 +242,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -287,7 +287,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -332,7 +332,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -377,7 +377,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -600,7 +600,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
@@ -713,19 +713,19 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Reigia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Reigia.e0mj
index df615112c3..db1cede468 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Reigia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Reigia.e0mj
@@ -573,7 +573,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -657,7 +657,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -748,7 +748,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/River_Wall.e0mj b/src/main/resources/net/eagle0/shardok/maps/River_Wall.e0mj
index df28c39fe0..d4c07d5b58 100644
--- a/src/main/resources/net/eagle0/shardok/maps/River_Wall.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/River_Wall.e0mj
@@ -65,49 +65,49 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -131,43 +131,43 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -196,7 +196,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -241,7 +241,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -283,7 +283,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -328,13 +328,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -367,25 +367,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -418,25 +418,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -477,7 +477,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -662,7 +662,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "column": 1
diff --git a/src/main/resources/net/eagle0/shardok/maps/Shumal.e0mj b/src/main/resources/net/eagle0/shardok/maps/Shumal.e0mj
index c5ea52c75f..2bc2bdb4b5 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Shumal.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Shumal.e0mj
@@ -568,19 +568,19 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -627,7 +627,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Sigkarl.e0mj b/src/main/resources/net/eagle0/shardok/maps/Sigkarl.e0mj
index bac23c4fc0..73e65210db 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Sigkarl.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Sigkarl.e0mj
@@ -368,31 +368,31 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -427,7 +427,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -472,13 +472,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -525,7 +525,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -595,7 +595,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -637,7 +637,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -684,13 +684,13 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Soria.e0mj b/src/main/resources/net/eagle0/shardok/maps/Soria.e0mj
index b78260452f..c5f5ac64bc 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Soria.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Soria.e0mj
@@ -565,7 +565,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
diff --git a/src/main/resources/net/eagle0/shardok/maps/Tatoros.e0mj b/src/main/resources/net/eagle0/shardok/maps/Tatoros.e0mj
index ddb0000c07..3b7162c0df 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Tatoros.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Tatoros.e0mj
@@ -230,25 +230,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -296,19 +296,19 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -353,25 +353,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -419,13 +419,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -470,13 +470,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -521,13 +521,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -619,13 +619,13 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -672,7 +672,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
@@ -719,10 +719,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     }
   ],
   "monthlyWeather": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Tegrot.e0mj b/src/main/resources/net/eagle0/shardok/maps/Tegrot.e0mj
index 1d75b1d0e5..587fb07146 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Tegrot.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Tegrot.e0mj
@@ -573,7 +573,7 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
       "positions": [
@@ -615,10 +615,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -709,7 +709,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Tumala.e0mj b/src/main/resources/net/eagle0/shardok/maps/Tumala.e0mj
index f1b06d7428..f752274332 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Tumala.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Tumala.e0mj
@@ -568,25 +568,25 @@
   },
   "attackerStartingPositions": [
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Turton.e0mj b/src/main/resources/net/eagle0/shardok/maps/Turton.e0mj
index 120271189e..6ae41f7406 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Turton.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Turton.e0mj
@@ -20,7 +20,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -72,7 +72,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -122,7 +122,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -161,13 +161,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -203,25 +203,25 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -592,7 +592,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
@@ -628,10 +628,10 @@
       ]
     },
     {
-      
+
     },
     {
-      
+
     },
     {
       "positions": [
@@ -766,7 +766,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Usvol.e0mj b/src/main/resources/net/eagle0/shardok/maps/Usvol.e0mj
index 9488916a43..7a9aa0b63d 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Usvol.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Usvol.e0mj
@@ -565,7 +565,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
diff --git a/src/main/resources/net/eagle0/shardok/maps/Wichel.e0mj b/src/main/resources/net/eagle0/shardok/maps/Wichel.e0mj
index 8b45e2074c..683bf5c47c 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Wichel.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Wichel.e0mj
@@ -365,7 +365,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -410,13 +410,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -455,13 +455,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -503,13 +503,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -548,13 +548,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -612,7 +612,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 1
@@ -769,7 +769,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/Yuetia.e0mj b/src/main/resources/net/eagle0/shardok/maps/Yuetia.e0mj
index 304cf95d9c..73fea3d768 100644
--- a/src/main/resources/net/eagle0/shardok/maps/Yuetia.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/Yuetia.e0mj
@@ -575,7 +575,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "row": 2
@@ -648,7 +648,7 @@
       ]
     },
     {
-      
+
     },
     {
       "positions": [
diff --git a/src/main/resources/net/eagle0/shardok/maps/bigfightWithRiver.e0mj b/src/main/resources/net/eagle0/shardok/maps/bigfightWithRiver.e0mj
index 249aefd419..155893a2fc 100644
--- a/src/main/resources/net/eagle0/shardok/maps/bigfightWithRiver.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/bigfightWithRiver.e0mj
@@ -96,7 +96,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -146,7 +146,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -188,13 +188,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -236,7 +236,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -278,7 +278,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -320,13 +320,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -359,19 +359,19 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -404,19 +404,19 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -449,13 +449,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
diff --git a/src/main/resources/net/eagle0/shardok/maps/narrowWithRiver.e0mj b/src/main/resources/net/eagle0/shardok/maps/narrowWithRiver.e0mj
index ab6174ab95..c3eafb02d2 100644
--- a/src/main/resources/net/eagle0/shardok/maps/narrowWithRiver.e0mj
+++ b/src/main/resources/net/eagle0/shardok/maps/narrowWithRiver.e0mj
@@ -266,13 +266,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -314,7 +314,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -353,13 +353,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -371,31 +371,31 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -404,31 +404,31 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -437,13 +437,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -469,7 +469,7 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -508,13 +508,13 @@
     {
       "type": "PLAINS",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -553,13 +553,13 @@
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
       "type": "RIVER",
       "modifier": {
-        
+
       }
     },
     {
@@ -639,7 +639,7 @@
     {
       "positions": [
         {
-          
+
         },
         {
           "column": 1
diff --git a/src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleCapturedHeroesCommand.scala b/src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleCapturedHeroesCommand.scala
index 98799cde57..9cbfdc7526 100644
--- a/src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleCapturedHeroesCommand.scala
+++ b/src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleCapturedHeroesCommand.scala
@@ -221,8 +221,7 @@ object HandleCapturedHeroesCommand
       )
     commandRequire(
       chosenHwo.isDefined,
-      s"""Selected heroId ${selectedCommand.heroId} is not in 
-          |${availableCommand.availableHeroes
+      s"""Selected heroId ${selectedCommand.heroId} is not in ${availableCommand.availableHeroes
            .map(_.getHero.id)}""".stripMargin
     )