Merge pull request #9 from JadeShrineMaiden/master

Mob and Npc fixes
This commit is contained in:
CakeLancelot 2020-12-11 20:59:22 -06:00 committed by GitHub
commit 1eed647816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 125 additions and 116 deletions

View File

@ -23327,6 +23327,15 @@
"z": -7403,
"mapNum": 47,
"angle": -96
},
{
"name": "Location A170",
"id": 1289,
"x": 351451,
"y": 349458,
"z": -5552,
"mapNum": 0,
"angle": 22
}
]
}

232
mobs.json
View File

@ -13962,288 +13962,288 @@
"iAngle": -164
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 263401,
"iY": 107413,
"iZ": -5956,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 260863,
"iY": 106246,
"iZ": -5962,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 264740,
"iY": 105321,
"iZ": -5964,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 259554,
"iY": 111425,
"iZ": -5054,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 256032,
"iY": 111516,
"iZ": -5054,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 265154,
"iY": 111568,
"iZ": -5052,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 260638,
"iY": 106202,
"iZ": -5962,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 262223,
"iY": 105613,
"iZ": -5962,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 256576,
"iY": 122105,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 259719,
"iY": 125188,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 257901,
"iY": 125307,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 258849,
"iY": 118276,
"iZ": -5029,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 260502,
"iY": 129730,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 266517,
"iY": 129142,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 266634,
"iY": 125155,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 271018,
"iY": 127896,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 270611,
"iY": 126096,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 269924,
"iY": 121270,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 273672,
"iY": 123384,
"iZ": -5006,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 271867,
"iY": 130147,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 274878,
"iY": 130353,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 275439,
"iY": 128112,
"iZ": -5030,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 279241,
"iY": 129620,
"iZ": -5029,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 277599,
"iY": 129115,
"iZ": -5033,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 277741,
"iY": 132964,
"iZ": -4982,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 285015,
"iY": 130049,
"iZ": -5024,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 267707,
"iY": 139429,
"iZ": -3340,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 270290,
"iY": 139688,
"iZ": -3406,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 271599,
"iY": 132629,
"iZ": -5073,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 272635,
"iY": 138660,
"iZ": -2870,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 276909,
"iY": 139774,
"iZ": -2553,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 280973,
"iY": 140949,
"iZ": -2366,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 287183,
"iY": 137595,
"iZ": -1611,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 259183,
"iY": 147692,
"iZ": -4956,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 258539,
"iY": 151652,
"iZ": -5043,
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 256627,
"iY": 106020,
"iZ": -5962,
@ -14354,8 +14354,8 @@
"iAngle": 0
},
{
"iNPCType": 172,
"iHP": 924,
"iNPCType": 366,
"iHP": 1426,
"iX": 269141,
"iY": 108875,
"iZ": -5960,
@ -32040,160 +32040,160 @@
},
{
"iAngle": -97,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 217511,
"iY": 249650,
"iZ": -4812
},
{
"iAngle": -71,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 214016,
"iY": 252799,
"iZ": -4812
},
{
"iAngle": -46,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 209740,
"iY": 255532,
"iZ": -4812
},
{
"iAngle": -126,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 205765,
"iY": 251126,
"iZ": -4808
},
{
"iAngle": -134,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 208537,
"iY": 237756,
"iZ": -4812
},
{
"iAngle": -172,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 208918,
"iY": 233850,
"iZ": -4812
},
{
"iAngle": -244,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 211089,
"iY": 229386,
"iZ": -4830
},
{
"iAngle": -157,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 209887,
"iY": 227831,
"iZ": -4812
},
{
"iAngle": -115,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 208160,
"iY": 228620,
"iZ": -4812
},
{
"iAngle": -176,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 206189,
"iY": 226930,
"iZ": -4812
},
{
"iAngle": -27,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 205973,
"iY": 228853,
"iZ": -4812
},
{
"iAngle": -19,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 206433,
"iY": 230660,
"iZ": -4812
},
{
"iAngle": 150,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 218054,
"iY": 227690,
"iZ": -4812
},
{
"iAngle": 274,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 216009,
"iY": 228389,
"iZ": -4812
},
{
"iAngle": -40,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 215136,
"iY": 234675,
"iZ": -4812
},
{
"iAngle": -22,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 205574,
"iY": 223501,
"iZ": -4812
},
{
"iAngle": -100,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 211758,
"iY": 233546,
"iZ": 144
},
{
"iAngle": -237,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 212689,
"iY": 233743,
"iZ": 144
},
{
"iAngle": -61,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 211582,
"iY": 237394,
"iZ": 144
},
{
"iAngle": 64,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 212797,
"iY": 237661,
"iZ": 144
@ -32208,8 +32208,8 @@
},
{
"iAngle": 243,
"iHP": 1381,
"iNPCType": 1627,
"iHP": 1312,
"iNPCType": 334,
"iX": 218043,
"iY": 221545,
"iZ": -4812