admin/eagle0
1
0
Fork 0
mirror of https://github.com/nolen777/eagle0.git synced 2026-07-28 20:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove all trailing whitespace (#2344)

Browse Source 
* remove all trailing whitespace

* fix one scala file


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