Skip to content

Commit

Permalink
Merge pull request #1838 from gereon77/multiple-improvements
Browse files Browse the repository at this point in the history 
Multiple improvements
  • Loading branch information
@gereon77
gereon77 authored Jun 13, 2024
2 parents 5812195 + 3534308 commit 95679f6
Show file tree
Hide file tree
Showing 18 changed files with 470 additions and 141 deletions.
98 changes: 77 additions & 21 deletions agot-bg-game-server/data/ffc-eyrie-with-port.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"visible":false,
"x":0,
"y":0
},
Expand Down Expand Up @@ -2073,24 +2073,48 @@
"y":0
},
{
"x":30.8788598574822,
"y":-1.05568751649525
"x":18.8788598574822,
"y":2.94431248350475
},
{
"x":48.5616257587756,
"y":6.59804697809432
"x":30.5616257587756,
"y":-0.0686196885724257
},
{
"x":89.2055951438374,
"y":-3.16706254948531
"x":50.5389284771707,
"y":8.16627078384795
},
{
"x":129.585642649776,
"y":-10.8207970440749
"x":87.3006070203221,
"y":-0.413829506466072
},
{
"x":159.144893111639,
"y":-36.1572974399578
"x":102.062285563473,
"y":-0.993929796780094
},
{
"x":112.252309316443,
"y":-10.820797044075
},
{
"x":129.698601214041,
"y":-10.1557139086831
},
{
"x":134.478226444972,
"y":-25.4906307732912
},
{
"x":156.496569015571,
"y":-35.793085246767
},
{
"x":171.848244919504,
"y":-50.0955397202429
},
{
"x":181.199920823437,
"y":-50.3979941937187
},
{
"x":190.551596727369,
Expand Down Expand Up @@ -2233,12 +2257,40 @@
"y":0
},
{
"x":76.5278233300536,
"y":-21.8650923800153
"x":19.1319558325134,
"y":-5.46627309500383
},
{
"x":34.9305783316935,
"y":-18.2658795233409
},
{
"x":129.550672351591,
"y":-65.3219634852958
"x":49.3958674975402,
"y":-19.0654859516781
},
{
"x":58.1788564556685,
"y":-25.0987208920957
},
{
"x":76.9618454137969,
"y":-19.7986224991802
},
{
"x":91.1944899967203,
"y":-32.5317590466818
},
{
"x":106.116868918771,
"y":-52.395976823002
},
{
"x":125.039247840822,
"y":-57.5935279326555
},
{
"x":130.884005684924,
"y":-64.655296818629
}],
"properties":[
{
Expand All @@ -2265,15 +2317,19 @@
"polygon":[
{
"x":0,
"y":0
"y":0.666666666666742
},
{
"x":-9.56597791625668,
"y":-26.5114245107686
"x":-11.1163222914617,
"y":-12.5890455887175
},
{
"x":-7.92609598775556,
"y":-54.6627309500383
"x":-9.56597791625671,
"y":-29.1780911774352
},
{
"x":-13.9260959877556,
"y":-45.329397616705
},
{
"x":-9.8392915710069,
Expand Down Expand Up @@ -14074,7 +14130,7 @@
}],
"opacity":1,
"type":"objectgroup",
"visible":false,
"visible":true,
"x":0,
"y":0
},
Expand Down
94 changes: 73 additions & 21 deletions agot-bg-game-server/data/westeros-7p.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2141,24 +2141,48 @@
"y":0
},
{
"x":30.8788598574822,
"y":-1.05568751649525
"x":18.8788598574822,
"y":2.94431248350475
},
{
"x":48.5616257587756,
"y":6.59804697809432
"x":30.5616257587756,
"y":-0.0686196885724257
},
{
"x":89.2055951438374,
"y":-3.16706254948531
"x":50.5389284771707,
"y":8.16627078384795
},
{
"x":129.585642649776,
"y":-10.8207970440749
"x":87.3006070203221,
"y":-0.413829506466072
},
{
"x":159.144893111639,
"y":-36.1572974399578
"x":104.062285563473,
"y":-0.993929796780094
},
{
"x":112.252309316443,
"y":-10.820797044075
},
{
"x":129.698601214041,
"y":-10.1557139086831
},
{
"x":134.478226444972,
"y":-25.4906307732912
},
{
"x":156.496569015571,
"y":-35.793085246767
},
{
"x":171.848244919504,
"y":-50.0955397202429
},
{
"x":181.199920823437,
"y":-50.3979941937187
},
{
"x":190.551596727369,
Expand Down Expand Up @@ -2301,12 +2325,40 @@
"y":0
},
{
"x":76.5278233300536,
"y":-21.8650923800153
"x":19.1319558325134,
"y":-5.46627309500383
},
{
"x":34.9305783316935,
"y":-18.2658795233409
},
{
"x":49.3958674975402,
"y":-19.0654859516781
},
{
"x":129.550672351591,
"y":-65.3219634852958
"x":58.1788564556685,
"y":-25.0987208920957
},
{
"x":74.9618454137969,
"y":-19.1319558325134
},
{
"x":91.1944899967203,
"y":-32.5317590466818
},
{
"x":106.116868918771,
"y":-52.395976823002
},
{
"x":125.039247840822,
"y":-57.5935279326555
},
{
"x":130.884005684924,
"y":-64.655296818629
}],
"properties":[
{
Expand Down Expand Up @@ -2336,12 +2388,12 @@
"y":0
},
{
"x":-9.56597791625668,
"y":-26.5114245107686
"x":-11.5659779162567,
"y":-13.844757844102
},
{
"x":-7.92609598775556,
"y":-54.6627309500383
"x":-11.9260959877556,
"y":-42.6627309500383
},
{
"x":-9.8392915710069,
Expand Down Expand Up @@ -14036,7 +14088,7 @@
}],
"opacity":1,
"type":"objectgroup",
"visible":false,
"visible":true,
"x":0,
"y":0
},
Expand Down Expand Up @@ -15939,7 +15991,7 @@
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"visible":false,
"x":0,
"y":0
},
Expand Down Expand Up @@ -17672,7 +17724,7 @@
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"visible":false,
"x":0,
"y":0
}],
Expand Down
Loading

0 comments on commit 95679f6

Please sign in to comment.