4.11 -> 4.2

Update diff
This commit is contained in:
Josh Freeman
2018-01-30 08:59:07 +00:00
parent 01b5e5a7f3
commit e4ef0f4400
579 changed files with 90883 additions and 64028 deletions
+11 -11
View File
@@ -359,15 +359,15 @@ int32,str,uint32
355,"ACTION_TIMELINE_SPEAK_SHOUT_SHORT",632
356,"ACTION_TIMELINE_SPEAK_SHOUT_MIDDLE",633
357,"ACTION_TIMELINE_SPEAK_SHOUT_LONG",634
358,"EVENT_STATE_LIGHT",23
359,"EVENT_STATE_NORMAL",24
360,"EVENT_STATE_PRIORITY",25
361,"EVENT_STATE_STORAGE",42
362,"EVENT_STATE_MOUNT_LIGHT",56
363,"EVENT_STATE_MOUNT_NORMAL",50
364,"EVENT_STATE_CARRY",57
365,"EVENT_STATE_SHAPESHIFT",63
366,"EVENT_STATE_BATTLE",70
358,"EVENT_STATE_LIGHT",31
359,"EVENT_STATE_NORMAL",32
360,"EVENT_STATE_PRIORITY",33
361,"EVENT_STATE_STORAGE",50
362,"EVENT_STATE_MOUNT_LIGHT",64
363,"EVENT_STATE_MOUNT_NORMAL",58
364,"EVENT_STATE_CARRY",65
365,"EVENT_STATE_SHAPESHIFT",71
366,"EVENT_STATE_BATTLE",78
367,"TOWN_INVALID",0
368,"TOWN_LIMSA_LOMINSA",1
369,"TOWN_GRIDANIA",2
@@ -426,8 +426,8 @@ int32,str,uint32
422,"MODEL_TYPE_MONSTER",3
423,"MODEL_TYPE_SHAREDGROUP",4
424,"MODEL_TYPE_PARTS",5
425,"CONDITION_JUMP",40
426,"CONDITION_GIMMICK_JUMP",53
425,"CONDITION_JUMP",48
426,"CONDITION_GIMMICK_JUMP",61
427,"OBJ_KIND_PC",1
428,"OBJ_KIND_BNPC",2
429,"OBJ_KIND_ENPC",3
1 key 0 1
359 355 ACTION_TIMELINE_SPEAK_SHOUT_SHORT 632
360 356 ACTION_TIMELINE_SPEAK_SHOUT_MIDDLE 633
361 357 ACTION_TIMELINE_SPEAK_SHOUT_LONG 634
362 358 EVENT_STATE_LIGHT 23 31
363 359 EVENT_STATE_NORMAL 24 32
364 360 EVENT_STATE_PRIORITY 25 33
365 361 EVENT_STATE_STORAGE 42 50
366 362 EVENT_STATE_MOUNT_LIGHT 56 64
367 363 EVENT_STATE_MOUNT_NORMAL 50 58
368 364 EVENT_STATE_CARRY 57 65
369 365 EVENT_STATE_SHAPESHIFT 63 71
370 366 EVENT_STATE_BATTLE 70 78
371 367 TOWN_INVALID 0
372 368 TOWN_LIMSA_LOMINSA 1
373 369 TOWN_GRIDANIA 2
426 422 MODEL_TYPE_MONSTER 3
427 423 MODEL_TYPE_SHAREDGROUP 4
428 424 MODEL_TYPE_PARTS 5
429 425 CONDITION_JUMP 40 48
430 426 CONDITION_GIMMICK_JUMP 53 61
431 427 OBJ_KIND_PC 1
432 428 OBJ_KIND_BNPC 2
433 429 OBJ_KIND_ENPC 3