Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize obstacles with less vertices, connect shapes and set new bridges' gaps #991

Merged
merged 3 commits into from
Nov 26, 2024
+124 −794
Merged

Reorganize obstacles with less vertices, connect shapes and set new bridges' gaps #991

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f1c8e1
Reorganize obstacles with less vertices, connect shapes and set new b…
Nico-Sanchez Nov 22, 2024
6cf843c
Update obstacles layout due to changes in frontend (#993)
Nico-Sanchez Nov 25, 2024
f06f41f
Upgrade arena version
Nico-Sanchez Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 62 additions & 69 deletions priv/repo/seeds.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4644,10 +4644,8 @@ merliot_map_config = %{
vertices: [
%{x: -4360, y: 2759},
%{x: -3871, y: 2734},
%{x: -3896, y: 2402},
%{x: -3896, y: 1995},
%{x: -4593, y: 2012},
%{x: -4444, y: 2410}
%{x: -3896, y: 1900},
%{x: -4900, y: 1800}
]
},
%{
Expand All @@ -4662,11 +4660,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: -4894, y: 1998},
%{x: -3216, y: 2003},
%{x: -3569, y: 1139},
%{x: -4555, y: 1139},
%{x: -4937, y: 1643}
%{x: -3871, y: 2734},
%{x: -3167, y: 3087},
%{x: -2743, y: 2204},
%{x: -3896, y: 1900}
]
},
%{
Expand All @@ -4681,11 +4678,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: -4541, y: 1134},
%{x: -3569, y: 1141},
%{x: -3526, y: 672},
%{x: -3900, y: 643},
%{x: -4345, y: 597}
%{x: -4900, y: 1800},
%{x: -3216, y: 2150},
%{x: -3569, y: 1139},
%{x: -4555, y: 1139}
]
},
%{
Expand All @@ -4700,10 +4696,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: -4345, y: 597},
%{x: -3900, y: 643},
%{x: -4058, y: 339},
%{x: -4255, y: 314}
%{x: -4555, y: 1139},
%{x: -3569, y: 1139},
%{x: -3500, y: 500},
%{x: -4345, y: 400}
]
},
%{
Expand All @@ -4718,8 +4714,8 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: -3117, y: -2805},
%{x: -2539, y: -2621},
%{x: -3117, y: -2705},
%{x: -2539, y: -2550},
%{x: -1953, y: -3549},
%{x: -2872, y: -3743}
]
Expand All @@ -4736,10 +4732,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: -2854, y: -3751},
%{x: -2872, y: -3743},
%{x: -1953, y: -3549},
%{x: -1674, y: -4649},
%{x: -2944, y: -4636}
%{x: -1788, y: -4935},
%{x: -3029, y: -4477}
]
},
%{
Expand All @@ -4757,7 +4753,7 @@ merliot_map_config = %{
%{x: -1953, y: -3549},
%{x: -837, y: -3421},
%{x: -532, y: -4091},
%{x: -1674, y: -4649}
%{x: -1788, y: -4935}
]
},
%{
Expand All @@ -4774,7 +4770,7 @@ merliot_map_config = %{
vertices: [
%{x: -6430, y: 3520},
%{x: -5150, y: 3016},
%{x: -5365, y: 2132},
%{x: -5600, y: 2132},
%{x: -6439, y: 2505}
]
},
Expand All @@ -4790,10 +4786,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: 2254, y: 5881},
%{x: 2496, y: 6558},
%{x: 3691, y: 6546},
%{x: 3376, y: 5862}
%{x: 3236, y: 5565},
%{x: 2209, y: 6059}
]
},
%{
Expand All @@ -4808,12 +4804,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: -3340, y: -5690},
%{x: -3225, y: -5524},
%{x: -2132, y: -5561},
%{x: -3168, y: -5127},
%{x: -2062, y: -5648},
%{x: -2530, y: -6395},
%{x: -3665, y: -6404},
%{x: -3621, y: -6261}
%{x: -3665, y: -6404}
]
},
%{
Expand All @@ -4828,10 +4822,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: 5717, y: -3593},
%{x: 5889, y: -2323},
%{x: 6046, y: -2263},
%{x: 6579, y: -2499},
%{x: 6534, y: -3543}
%{x: 6534, y: -3543},
%{x: 5571, y: -3342}
]
},
%{
Expand Down Expand Up @@ -4870,24 +4864,6 @@ merliot_map_config = %{
%{x: 808, y: -3648}
]
},
%{
name: "Top Mid Water 1",
radius: 0.0,
shape: "polygon",
type: :lake,
base_status: nil,
statuses_cycle: %{},
position: %{
x: 0.0,
y: 0.0
},
vertices: [
%{x: -3200, y: 2970},
%{x: -1950, y: 3392},
%{x: -1689, y: 2797},
%{x: -2855, y: 2262}
]
},
%{
name: "Top Mid Water 2",
radius: 0.0,
Expand All @@ -4900,10 +4876,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: -1950, y: 3392},
%{x: -181, y: 3983},
%{x: 140, y: 3279},
%{x: -1689, y: 2797}
%{x: -2438, y: 3333},
%{x: -50, y: 4148},
%{x: 250, y: 3280},
%{x: -2076, y: 2509}
]
},
%{
Expand Down Expand Up @@ -4990,10 +4966,27 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: 2965, y: -3062},
%{x: 2653, y: -2438},
%{x: 3633, y: -1502},
%{x: 4596, y: -2699}
%{x: 4470, y: -2860},
%{x: 2792, y: -3186}
]
},
%{
name: "Bottom Right Water 1 prima",
radius: 0.0,
shape: "polygon",
type: :lake,
base_status: nil,
statuses_cycle: %{},
position: %{
x: 0.0,
y: 0.0
},
vertices: [
%{x: 3633, y: -1502},
%{x: 4896, y: -2963},
%{x: 4470, y: -2860}
]
},
%{
Expand Down Expand Up @@ -5028,8 +5021,8 @@ merliot_map_config = %{
vertices: [
%{x: 3630, y: -1498},
%{x: 4629, y: -1281},
%{x: 5611, y: -2263},
%{x: 4596, y: -2699}
%{x: 5371, y: -1881},
%{x: 4896, y: -2963}
]
},
%{
Expand Down Expand Up @@ -5062,10 +5055,10 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: 565, y: 4300},
%{x: 1455, y: 4700},
%{x: 1717, y: 3634},
%{x: 991, y: 3634},
%{x: 902, y: 4408},
%{x: 1455, y: 4845}
%{x: 808, y: 3500}
]
},
%{
Expand All @@ -5080,11 +5073,11 @@ merliot_map_config = %{
y: 0.0
},
vertices: [
%{x: 1717, y: 3634},
%{x: 1455, y: 4845},
%{x: 2092, y: 5603},
%{x: 3003, y: 5182},
%{x: 2762, y: 4031}
%{x: 1455, y: 4700},
%{x: 1802, y: 5366},
%{x: 3000, y: 4737},
%{x: 2762, y: 4031},
%{x: 1717, y: 3634}
]
}
],
Expand Down
Loading