Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/waterline-quests' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master committed Aug 11, 2024
2 parents 80d3026 + 9d493df commit 21ddaca
Show file tree
Hide file tree
Showing 72 changed files with 931 additions and 179 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"questIDHigh:4": 7842301023653611291,
"sizeX:3": 48,
"x:3": 420,
"y:3": -24,
"questIDLow:4": -6269476597080921136,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 2266700169884617512,
"sizeX:3": 24,
"x:3": 204,
"y:3": -252,
"x:3": 144,
"y:3": -168,
"questIDLow:4": -8063346062660766612,
"sizeY:3": 24
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": -139068609484536132,
"sizeX:3": 48,
"x:3": 192,
"y:3": -216,
"x:3": 84,
"y:3": -180,
"questIDLow:4": -5753871526049634361,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": -5503315474457539634,
"sizeX:3": 48,
"x:3": 84,
"y:3": -180,
"x:3": 192,
"y:3": -252,
"questIDLow:4": -9196591828784291176,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 24,
"y:3": 228,
"x:3": -36,
"y:3": 348,
"questIDLow:4": 2024,
"sizeY:3": 24
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"questIDHigh:4": -7439799557305581253,
"sizeX:3": 48,
"x:3": 192,
"y:3": 504,
"questIDLow:4": -5895649105231252556,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"questIDHigh:4": -330443813993036947,
"sizeX:3": 48,
"x:3": 192,
"y:3": 420,
"questIDLow:4": -6215508413557630456,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 96,
"y:3": 180,
"x:3": 192,
"y:3": 228,
"questIDLow:4": 2677,
"sizeY:3": 24
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"questIDHigh:4": 1429520268554815440,
"sizeX:3": 48,
"x:3": 192,
"y:3": 588,
"questIDLow:4": -9020589751289166951,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 324,
"y:3": 300,
"y:3": 360,
"questIDLow:4": 2634,
"sizeY:3": 24
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 276,
"y:3": 300,
"x:3": 324,
"y:3": 408,
"questIDLow:4": 2637,
"sizeY:3": 24
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 372,
"y:3": 144,
"y:3": 132,
"questIDLow:4": 2630,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"questIDHigh:4": -5647692220358047564,
"sizeX:3": 48,
"x:3": 264,
"y:3": 132,
"questIDLow:4": -7136280042712085534,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 48,
"y:3": 336,
"x:3": 60,
"y:3": 348,
"questIDLow:4": 1197,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 156,
"y:3": 432,
"x:3": -12,
"y:3": 348,
"questIDLow:4": 1199,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 48,
"y:3": 432,
"x:3": 60,
"y:3": 420,
"questIDLow:4": 2658,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 372,
"y:3": 240,
"y:3": 216,
"questIDLow:4": 2632,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 372,
"y:3": 336,
"y:3": 444,
"questIDLow:4": 2631,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 156,
"y:3": 240,
"x:3": 168,
"y:3": 288,
"questIDLow:4": 2669,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 216,
"y:3": 108,
"y:3": 24,
"questIDLow:4": 2646,
"sizeY:3": 24
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 156,
"x:3": 168,
"y:3": 48,
"questIDLow:4": 2611,
"sizeY:3": 48
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 48,
"x:3": 60,
"y:3": 48,
"questIDLow:4": 2612,
"sizeY:3": 48
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 156,
"y:3": 144,
"x:3": 168,
"y:3": 132,
"questIDLow:4": 2625,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 264,
"y:3": 240,
"y:3": 348,
"questIDLow:4": 2627,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 48,
"x:3": 60,
"y:3": 240,
"questIDLow:4": 2622,
"sizeY:3": 48
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 264,
"y:3": 144,
"x:3": 168,
"y:3": 216,
"questIDLow:4": 2619,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"questIDHigh:4": 8829866191450688815,
"sizeX:3": 48,
"x:3": 264,
"y:3": 216,
"questIDLow:4": -8868495820464237601,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 480,
"x:3": 492,
"y:3": 36,
"questIDLow:4": 2614,
"sizeY:3": 48
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 288,
"x:3": 264,
"y:3": 252,
"questIDLow:4": 2615,
"sizeY:3": 48
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": -3851320157299783347,
"sizeX:3": 24,
"x:3": 300,
"x:3": 276,
"y:3": 108,
"questIDLow:4": -8574346973951287410,
"sizeY:3": 24
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 576,
"x:3": 588,
"y:3": 132,
"questIDLow:4": 2647,
"sizeY:3": 24
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 480,
"y:3": 252,
"x:3": 492,
"y:3": 240,
"questIDLow:4": 2041,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 336,
"x:3": 312,
"y:3": 108,
"questIDLow:4": 2638,
"sizeY:3": 24
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 48,
"x:3": 288,
"x:3": 264,
"y:3": 36,
"questIDLow:4": 2635,
"sizeY:3": 48
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"questIDHigh:4": 6530486220488721281,
"sizeX:3": 48,
"x:3": 408,
"y:3": 312,
"questIDLow:4": -7118851089254229135,
"sizeY:3": 48
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 372,
"x:3": 348,
"y:3": 432,
"questIDLow:4": 1202,
"sizeY:3": 24
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 576,
"x:3": 588,
"y:3": 180,
"questIDLow:4": 3282,
"sizeY:3": 24
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"questIDHigh:4": 0,
"sizeX:3": 24,
"x:3": 252,
"x:3": 156,
"y:3": 216,
"questIDLow:4": 1840,
"sizeY:3": 24
Expand Down
Loading

0 comments on commit 21ddaca

Please sign in to comment.