diff --git a/csv/AchievementCategory.csv b/csv/AchievementCategory.csv index 305da14cd..58f16407c 100644 --- a/csv/AchievementCategory.csv +++ b/csv/AchievementCategory.csv @@ -1,5 +1,5 @@ key,0,1,2,3,4 -#,Name,AchievementKind,ShowComplete,HideCategory, +#,Name,AchievementKind,ShowComplete,HideCategory,Order int32,str,AchievementKind,bit&01,bit&02,byte 0,"",0,True,False,0 1,"Battle",1,True,False,1 diff --git a/csv/AchievementKind.csv b/csv/AchievementKind.csv index 411cc51f1..fefefaece 100644 --- a/csv/AchievementKind.csv +++ b/csv/AchievementKind.csv @@ -1,5 +1,5 @@ key,0,1 -#,Name, +#,Name,Order int32,str,byte 0,"",0 1,"Battle",1 diff --git a/csv/Fate.csv b/csv/Fate.csv index fb8b93b0a..0b4f99c72 100644 --- a/csv/Fate.csv +++ b/csv/Fate.csv @@ -1,6 +1,6 @@ key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46 -#,EurekaFate,Rule,,Location,ClassJobLevel,ClassJobLevel{Max},EventItem,TypeToDoValue[0],TypeToDoValue[1],TypeToDoValue[2],Icon{Objective},Icon{Map},IconInactive{Map},Music,LGBGuardNPCLocation,ScreenImage{Accept},ScreenImage{Complete},ScreenImage{Failed},HasWorldMapIcon,IsQuest,,,,,,,,,,Name,Description,Objective,StatusText[0],StatusText[1],StatusText[2],ArrayIndex,,,,,,,,,,, -int32,byte,byte,uint16,uint32,byte,byte,EventItem,byte,byte,byte,Image,Image,Image,BGM,uint32,ScreenImage,ScreenImage,ScreenImage,bit&01,bit&02,bit&04,uint16,uint16,bit&08,bit&10,bit&20,uint32,byte,uint16,str,str,str,str,str,str,ArrayEventHandler,uint32,uint32,uint32,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16 +#,EurekaFate,Rule,FateRuleEx,Location,ClassJobLevel,ClassJobLevel{Max},EventItem,TypeToDoValue[0],TypeToDoValue[1],TypeToDoValue[2],Icon{Objective},Icon{Map},IconInactive{Map},Music,LGBGuardNPCLocation,ScreenImage{Accept},ScreenImage{Complete},ScreenImage{Failed},HasWorldMapIcon,IsQuest,SpecialFate,GivenStatus,,AdventEvent,MoonFaireEvent,,FATEChain,,,Name,Description,Objective,StatusText[0],StatusText[1],StatusText[2],ArrayIndex,,ReqEventItem,TurnInEventItem,ObjectiveIcon[0],ObjectiveIcon[1],ObjectiveIcon[2],ObjectiveIcon[3],ObjectiveIcon[4],ObjectiveIcon[5],ObjectiveIcon[6],ObjectiveIcon[7] +int32,byte,byte,FateRuleEx,uint32,byte,byte,EventItem,byte,byte,byte,Image,Image,Image,BGM,uint32,ScreenImage,ScreenImage,ScreenImage,bit&01,bit&02,bit&04,Status,uint16,bit&08,bit&10,bit&20,uint32,byte,uint16,str,str,str,str,str,str,ArrayEventHandler,uint32,EventItem,EventItem,Image,Image,Image,Image,Image,Image,Image,Image 0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,33,34,35,True,False,False,0,0,False,False,False,0,34,0,"","","","","","",0,0,0,0,0,0,0,0,0,0,0,0 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,False,0,0,False,False,False,0,0,0,"","","","","","",0,0,0,0,0,0,0,0,0,0,0,0 2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,False,0,0,False,False,False,0,0,0,"","","","","","",0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/csv/FateTokenType.csv b/csv/FateTokenType.csv index 8499a8c7e..1c0bd4581 100644 --- a/csv/FateTokenType.csv +++ b/csv/FateTokenType.csv @@ -1,6 +1,6 @@ key,0 #,Currency -int32,Currency +int32,Item 0,0 1,26807 2,28063 diff --git a/csv/GatheringPointTransient.csv b/csv/GatheringPointTransient.csv index fe308be46..fed4f3042 100644 --- a/csv/GatheringPointTransient.csv +++ b/csv/GatheringPointTransient.csv @@ -1,6 +1,6 @@ key,0,1,2 -#,,, -int32,uint16,uint16,int32 +#,EphemeralStartTime,EphemeralEndTime,GatheringRarePopTimeTable +int32,uint16,uint16,GatheringRarePopTimeTable 30000,65535,65535,0 30001,65535,65535,0 30002,65535,65535,0 diff --git a/csv/GatheringRarePopTimeTable.csv b/csv/GatheringRarePopTimeTable.csv index a032e4276..56f3257bd 100644 --- a/csv/GatheringRarePopTimeTable.csv +++ b/csv/GatheringRarePopTimeTable.csv @@ -1,5 +1,5 @@ key,0,1,2,3,4,5 -#,,,,,, +#,StartTime[0],Duration(m)[0],StartTime[1],Duration(m)[1],StartTime[2],Duration(m)[2] int32,uint16,uint16,uint16,uint16,uint16,uint16 0,65535,0,65535,0,65535,0 1,900,300,65535,0,65535,0 diff --git a/csv/InstanceContent.csv b/csv/InstanceContent.csv index 29373b16a..74eee435e 100644 --- a/csv/InstanceContent.csv +++ b/csv/InstanceContent.csv @@ -1,6 +1,6 @@ key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59 -#,InstanceContentType,WeekRestriction,TimeLimit{min},,BGM,WinBGM,Cutscene,,Order,Colosseum,,InstanceContentTextData{Boss}{Start},InstanceContentTextData{Boss}{End},BNpcBase{Boss},InstanceContentTextData{Objective}{Start},InstanceContentTextData{Objective}{End},SortKey,InstanceClearExp,,NewPlayerBonusA,FinalBossCurrencyC,,FinalBossCurrencyA,FinalBossCurrencyB,NewPlayerBonusB,BossExp[0],BossExp[1],BossExp[2],BossExp[3],BossExp[4],,BossCurrencyA[0],BossCurrencyA[1],BossCurrencyA[2],BossCurrencyA[3],BossCurrencyA[4],BossCurrencyB[0],BossCurrencyB[1],BossCurrencyB[2],BossCurrencyB[3],BossCurrencyB[4],BossCurrencyC[0],BossCurrencyC[1],BossCurrencyC[2],BossCurrencyC[3],BossCurrencyC[4],,InstanceClearGil,InstanceContentRewardItem,,FinalBossExp,InstanceContentBuff,ReqInstance,,PartyCondition,,,,, -int32,InstanceContentType,byte,uint16,bit&01,BGM,BGM,Cutscene,uint32,uint16,Colosseum,bit&02,InstanceContentTextData,InstanceContentTextData,BNpcBase,InstanceContentTextData,InstanceContentTextData,uint16,uint32,uint32,uint16,uint16,uint32,uint16,uint16,uint16,uint32,uint32,uint32,uint32,uint32,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint32,uint32,uint32,InstanceContentRewardItem,uint32,int32,InstanceContentBuff,InstanceContent,byte,byte,byte,byte,bit&04,uint16,uint16 +#,InstanceContentType,WeekRestriction,TimeLimit{min},,BGM,WinBGM,Cutscene,,Order,Colosseum,,InstanceContentTextData{Boss}{Start},InstanceContentTextData{Boss}{End},BNpcBase{Boss},InstanceContentTextData{Objective}{Start},InstanceContentTextData{Objective}{End},SortKey,InstanceClearExp,,NewPlayerBonusA,FinalBossCurrencyC,,FinalBossCurrencyA,FinalBossCurrencyB,NewPlayerBonusB,BossExp[0],BossExp[1],BossExp[2],BossExp[3],BossExp[4],BossCurrencyA[0],BossCurrencyA[1],BossCurrencyA[2],BossCurrencyA[3],BossCurrencyA[4],BossCurrencyB[0],BossCurrencyB[1],BossCurrencyB[2],BossCurrencyB[3],BossCurrencyB[4],BossCurrencyC[0],BossCurrencyC[1],BossCurrencyC[2],BossCurrencyC[3],BossCurrencyC[4],,InstanceClearGil,InstanceContentRewardItem,,FinalBossExp,InstanceContentBuff,ReqInstance,,PartyCondition,,,,,, +int32,InstanceContentType,byte,uint16,bit&01,BGM,BGM,Cutscene,uint32,uint16,Colosseum,bit&02,InstanceContentTextData,InstanceContentTextData,BNpcBase,InstanceContentTextData,InstanceContentTextData,uint16,uint32,uint32,uint16,uint16,uint32,uint16,uint16,uint16,uint32,uint32,uint32,uint32,uint32,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint32,uint32,InstanceContentRewardItem,byte,uint32,InstanceContentBuff,InstanceContent,int16,byte,byte,byte,byte,bit&04,uint16,uint16 0,0,0,60,False,0,18,0,0,0,0,False,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,-1,0,0,0,0,False,0,0 1,2,0,90,False,0,18,22,2281258,1,0,False,0,0,444,1200,1203,5,3400,4600,0,0,16338,0,0,0,3872,3872,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94542,550,0,100,0,0,0,-1,0,0,0,0,False,0,0 2,2,0,90,False,0,18,17,1958540,2,0,False,1003,1004,73,1000,1004,2,2600,3500,0,0,9859,0,0,0,1556,1556,1556,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57050,400,78,100,0,0,0,-1,0,0,0,0,False,0,0 diff --git a/csv/OrchestrionCategory.csv b/csv/OrchestrionCategory.csv index ef3b602c1..cbe8ef3c0 100644 --- a/csv/OrchestrionCategory.csv +++ b/csv/OrchestrionCategory.csv @@ -1,5 +1,5 @@ key,0,1,2,3 -#,Name,,, +#,Name,HideCategory,,Order int32,str,byte,uint32,byte 0,"",0,0,0 1,"All",0,0,0 diff --git a/csv/TerritoryTypeTransient.csv b/csv/TerritoryTypeTransient.csv index 17fb9619a..0667ba123 100644 --- a/csv/TerritoryTypeTransient.csv +++ b/csv/TerritoryTypeTransient.csv @@ -1,5 +1,5 @@ key,0 -#, +#,Offset{Z} int32,int16 1,0 2,0