Merge branch 'main' into addon-tutorial

This commit is contained in:
Leath Cooper 2024-12-18 20:13:11 -05:00
commit 48e0179c25
16 changed files with 742 additions and 623 deletions

View file

@ -34,6 +34,9 @@ Blocker 0x21A4
6082 144 -15
6082 145 -15
6082 146 -15
5920 168 16
5920 169 16
5920 170 16
6058 88 29
6058 89 29
6058 90 29
@ -138,4 +141,4 @@ Static 0x179A
3446 548 -5
3456 538 -5
3472 512 -5
3488 580 -5
3488 580 -5

View file

@ -1450,19 +1450,19 @@
"back": false
},
{
"src": { "map": "Felucca", "loc": [5905, 97, 0] },
"dst": { "map": "Felucca", "loc": [5977, 169, 0] },
"src": { "map": "Felucca", "loc": [5919, 168, 22] },
"dst": { "map": "Felucca", "loc": [6083, 144, -20] },
"back": false
},
{
"src": { "map": "Felucca", "loc": [5906, 96, 0] },
"dst": { "map": "Felucca", "loc": [5977, 169, 0] },
"src": { "map": "Felucca", "loc": [5919, 169, 22] },
"dst": { "map": "Felucca", "loc": [6083, 145, -20] },
"back": false
},
{
"src": { "map": "Felucca", "loc": [5906, 4069, 26] },
"dst": { "map": "Felucca", "loc": [2494, 3576, 5] },
"back": true
"src": { "map": "Felucca", "loc": [5919, 170, 22] },
"dst": { "map": "Felucca", "loc": [6083, 146, -20] },
"back": false
},
{
"src": { "map": "Felucca", "loc": [5918, 1410, -29] },
@ -1715,19 +1715,19 @@
"back": false
},
{
"src": { "map": "Felucca", "loc": [6039, 204, 22] },
"dst": { "map": "Felucca", "loc": [6050, 227, 44] },
"src": { "map": "Felucca", "loc": [6083, 144, -20] },
"dst": { "map": "Felucca", "loc": [5918, 168, 22] },
"back": false
},
{
"src": { "map": "Felucca", "loc": [6040, 192, 12] },
"dst": { "map": "Felucca", "loc": [6059, 88, 24] },
"back": true
"src": { "map": "Felucca", "loc": [6083, 145, -20] },
"dst": { "map": "Felucca", "loc": [5918, 169, 22] },
"back": false
},
{
"src": { "map": "Felucca", "loc": [6040, 193, 12] },
"dst": { "map": "Felucca", "loc": [6059, 89, 24] },
"back": true
"src": { "map": "Felucca", "loc": [6083, 146, -20] },
"dst": { "map": "Felucca", "loc": [5918, 170, 22] },
"back": false
},
{
"src": { "map": "Felucca", "loc": [6040, 194, 12] },
@ -3555,18 +3555,18 @@
"back": false
},
{
"src": { "map": "Trammel", "loc": [5882, 243, 0] },
"dst": { "map": "Trammel", "loc": [1998, 81, 5] },
"src": { "map": "Trammel", "loc": [5919, 168, 22] },
"dst": { "map": "Trammel", "loc": [6083, 144, -20] },
"back": false
},
{
"src": { "map": "Trammel", "loc": [5899, 1411, 43] },
"dst": { "map": "Trammel", "loc": [1630, 3320, 0] },
"src": { "map": "Trammel", "loc": [5919, 169, 22] },
"dst": { "map": "Trammel", "loc": [6083, 145, -20] },
"back": false
},
{
"src": { "map": "Trammel", "loc": [5900, 1411, 42] },
"dst": { "map": "Trammel", "loc": [1630, 3320, 0] },
"src": { "map": "Trammel", "loc": [5919, 170, 22] },
"dst": { "map": "Trammel", "loc": [6083, 146, -20] },
"back": false
},
{
@ -3805,18 +3805,18 @@
"back": false
},
{
"src": { "map": "Trammel", "loc": [6031, 1499, 42] },
"dst": { "map": "Trammel", "loc": [1491, 1640, 24] },
"src": { "map": "Trammel", "loc": [6083, 144, -20] },
"dst": { "map": "Trammel", "loc": [5918, 168, 22] },
"back": false
},
{
"src": { "map": "Trammel", "loc": [6031, 1501, 42] },
"dst": { "map": "Trammel", "loc": [1491, 1642, 24] },
"src": { "map": "Trammel", "loc": [6083, 145, -20] },
"dst": { "map": "Trammel", "loc": [5918, 169, 22] },
"back": false
},
{
"src": { "map": "Trammel", "loc": [6039, 204, 22] },
"dst": { "map": "Trammel", "loc": [6050, 227, 44] },
"src": { "map": "Trammel", "loc": [6083, 146, -20] },
"dst": { "map": "Trammel", "loc": [5918, 170, 22] },
"back": false
},
{