From 5ddbddc43050b94af65ff0de38d04247ca880458 Mon Sep 17 00:00:00 2001 From: Hezkezl Date: Thu, 20 Oct 2022 14:32:32 -0600 Subject: [PATCH] Update from 2022.09.07.0000.0000 --- csv/ActionTransient.csv | 24 +++++++++---------- csv/Addon.csv | 1 + csv/Attract.csv | 2 +- csv/BannerTimeline.csv | 4 ++-- csv/DescriptionString.csv | 4 ++-- csv/ENpcBase.csv | 2 +- csv/ENpcResident.csv | 6 ++--- csv/InclusionShopSeries.csv | 2 +- csv/InstanceContent.csv | 8 +++---- csv/Item.csv | 4 ++-- csv/LogMessage.csv | 2 +- csv/MJIAnimals.csv | 4 ++-- csv/MJIBuilding.csv | 4 ++-- csv/MJICraftworksObject.csv | 4 ++-- csv/MJICraftworksObjectTheme.csv | 2 +- csv/MJICraftworksPopularity.csv | 4 ++-- csv/MJICraftworksPopularityType.csv | 2 +- csv/MJICraftworksRankRatio.csv | 2 +- csv/MJICraftworksSupplyDefine.csv | 2 +- csv/MJIGathering.csv | 4 ++-- csv/MJIGatheringItem.csv | 4 ++-- csv/MJIHudMode.csv | 4 ++-- csv/MJIItemCategory.csv | 2 +- csv/MJIItemPouch.csv | 4 ++-- csv/MJILandmark.csv | 4 ++-- csv/MJIProgress.csv | 2 +- csv/MJIRank.csv | 2 +- csv/MJIRecipe.csv | 4 ++-- csv/MJIRecipeMaterial.csv | 4 ++-- csv/MJIText.csv | 2 +- csv/Orchestrion.csv | 4 ++-- csv/TerritoryType.csv | 2 +- csv/TerritoryTypeTelepo.csv | 2 +- csv/TraitTransient.csv | 4 ++-- .../007/CtsMjiWorkShopManagement_00780.csv | 2 +- csv/cut_scene/062/VoiceMan_06200.csv | 6 ++--- csv/quest/046/FesHlw801_04655.csv | 4 ++-- 37 files changed, 72 insertions(+), 71 deletions(-) diff --git a/csv/ActionTransient.csv b/csv/ActionTransient.csv index a91a46843..052b794af 100644 --- a/csv/ActionTransient.csv +++ b/csv/ActionTransient.csv @@ -102,9 +102,9 @@ Increases damage dealt when under an effect that raises critical hit rate or dir F201F8F201F9Additional Effect: 0101Increases HP recovery via healing actions on self by 20% F201F8F201F9Duration:0101 10s" 41,"Delivers an attack with a potency of 110 to all nearby enemies." -42,"Delivers an attack with a potency of 130100100. +42,"Delivers an attack with a potency of 150100100. F201F8F201F9Combo Action:0101 F201F4F201F5Maim0101 -F201F8F201F9Combo Potency:0101 410380380 +F201F8F201F9Combo Potency:0101 430380380 F201F8F201F9Combo Bonus:0101 Restores own HP F201F8F201F9Cure Potency: 0101250 F201F8F201F9Combo Bonus:0101 Increases F201F4F201F5Beast Gauge0101 by 20" @@ -113,9 +113,9 @@ Increases damage dealt when under an effect that raises critical hit rate or dir When a target is selected, halts their movement with chains." 44,"Reduces damage taken by 30% and delivers an attack with a potency of 55 every time you suffer physical damage. F201F8F201F9Duration:0101 15s" -45,"Delivers an attack with a potency of 130100100. +45,"Delivers an attack with a potency of 150100100. F201F8F201F9Combo Action: 0101F201F4F201F5Maim0101 -F201F8F201F9Combo Potency: 0101410380380 +F201F8F201F9Combo Potency: 0101430380380 F201F8F201F9Combo Bonus: 0101Grants F201FAF201FBSurging Tempest0101, increasing damage dealt by 10% F201F8F201F9Duration:0101 30s Extends F201FAF201FBSurging Tempest0101 duration by 30s to a maximum of 60s. @@ -4507,7 +4507,7 @@ Effect ends upon reuse. Using certain actions while under the effect of F201FAF201FBDeliverance0101 will add to your F201F4F201F5Beast Gauge0101, increasing critical hit rate by a maximum of 10%. The F201F4F201F5Beast Gauge0101 returns to 0 when F201FAF201FBDeliverance0101 ends. Cannot be used with F201F4F201F5Defiance0101. Shares a recast timer with F201F4F201F5Defiance0101." -3549,"Delivers an attack with a potency of 460. +3549,"Delivers an attack with a potency of 470. F201F8F201F9Beast Gauge Cost:0101 50 ※Action changes to F201F4F201F5Inner Chaos0101 while under the effect of F201FAF201FBNascent Chaos0101." @@ -8737,8 +8737,8 @@ Can only be used once per synthesis." Effect of F201FAF201FBBlade of Faith Ready0101 ends upon execution of any melee weaponskill. ※F201F4F201F5Confiteor0101 changes to F201F4F201F5Blade of Faith0101 while under the effect of F201FAF201FBBlade of Faith Ready0101." -7384,"Deals unaspected damage with a potency of 280270270. -F201F8F201F9Requiescat Potency: 0101560540540 +7384,"Deals unaspected damage with a potency of 300270270. +F201F8F201F9Requiescat Potency: 0101600540540 F201F8F201F9Additional Effect: 0101Restores own HP F201F8F201F9Cure Potency: 0101400" 7385,"Increases block rate to 100% and creates a designated area in a cone behind you in which party members will only suffer 85% of all damage inflicted. @@ -8748,7 +8748,7 @@ Cancels auto-attack upon execution." 7386,"Rushes target and delivers an attack with a potency of 150. F201F8F201F9Maximum Charges: 0101322 Cannot be executed while bound." -7387,"Delivers an attack with a potency of 350. +7387,"Delivers an attack with a potency of 360. Shares a recast timer with F201F4F201F5Orogeny0101." 7388,"Creates a barrier around self and all nearby party members that absorbs damage totaling 15% of maximum HP. Dispels F201FAF201FBThrill of Battle0101, F201FAF201FBVengeance0101, and F201FAF201FBBloodwhetting0101F201FAF201FBRaw Intuition0101F201FAF201FBRaw Intuition0101, increasing damage absorbed by 2% for each effect removed. @@ -19437,7 +19437,7 @@ Damage bonus of F201FAF201FBTechni F201F8F201F9Requiescat Potency: 0101300 F201F8F201F9Additional Effect: 0101Restores own HP F201F8F201F9Cure Potency: 0101400" -16459,"Deals unaspected damage with a potency of 900 to target and all enemies nearby it. +16459,"Deals unaspected damage with a potency of 1000 to target and all enemies nearby it. F201F8F201F9Additional Effect: 0101Restores own HP F201F8F201F9Cure Potency: 0101400 Can only be executed while under the effect of F201FAF201FBRequiescat0101. Effect fades upon execution." @@ -30745,16 +30745,16 @@ Effect can be stacked with F201F4F201F5F201F8F201F9Cure Potency: 0101250 F201F8F201F9Duration: 010112s F201F8F201F9Oath Gauge Cost: 010150" -25747,"Delivers an attack to target and all enemies nearby it with a potency of 340 for the first enemy, and 50% less for all remaining enemies. +25747,"Delivers an attack to target and all enemies nearby it with a potency of 420 for the first enemy, and 50% less for all remaining enemies. F201F8F201F9Additional Effect: 0101Restores MP" -25748,"Deals unaspected damage to target and all enemies nearby it with a potency of 460 for the first enemy, and 50% less for all remaining enemies. +25748,"Deals unaspected damage to target and all enemies nearby it with a potency of 480 for the first enemy, and 50% less for all remaining enemies. F201F8F201F9Additional Effect: 0101Restores own HP F201F8F201F9Cure Potency: 0101400 F201F8F201F9Additional Effect: 0101Restores MP Can only be executed while under the effect of F201FAF201FBBlade of Faith Ready0101, granted when the effect of F201FAF201FBRequiescat0101 ends. ※This action cannot be assigned to a hotbar." -25749,"Deals unaspected damage to target and all enemies nearby it with a potency of 540 for the first enemy, and 50% less for all remaining enemies. +25749,"Deals unaspected damage to target and all enemies nearby it with a potency of 560 for the first enemy, and 50% less for all remaining enemies. F201F8F201F9Combo Action: 0101F201F4F201F5Blade of Faith0101 F201F8F201F9Combo Bonus: 0101Restores MP F201F8F201F9Additional Effect: 0101Restores own HP diff --git a/csv/Addon.csv b/csv/Addon.csv index ac1ed8a2a..78727f333 100644 --- a/csv/Addon.csv +++ b/csv/Addon.csv @@ -13610,6 +13610,7 @@ Portrait will not be automatically applied when gear set is equipped, and Instan 14940,"Cancel" 14941,"GIntegerParameter(1):" 14942,"StringParameter(1) []" +14943,"The requested repairs will be carried out using dark matter of a higher grade than is required. Proceed?" 14950,"Check the current status of the housing lottery." 14990,"Hotbar Sorting" 14991,"" diff --git a/csv/Attract.csv b/csv/Attract.csv index 9e3e9016f..cee695da5 100644 --- a/csv/Attract.csv +++ b/csv/Attract.csv @@ -1,5 +1,5 @@ key,0,1,2,3,4 -#,,,,, +#,MaxDistance,Speed,MinRemainingDistance,UseDistanceBetweenHitboxes,Direction int32,uint16,uint16,int16,bit&01,byte 0,0,0,0,True,0 1,25,25,0,True,0 diff --git a/csv/BannerTimeline.csv b/csv/BannerTimeline.csv index 2e7ef3ba4..7d84bb041 100644 --- a/csv/BannerTimeline.csv +++ b/csv/BannerTimeline.csv @@ -1,6 +1,6 @@ key,0,1,2,3,4,5,6,7 -#,Type,AdditionalData,AcceptClassJobCategory,,Category,UnlockCondition,SortKey,Icon -int32,byte,Row,ClassJobCategory,byte,uint16,BannerCondition,int32,Image +#,Type,AdditionalData,AcceptClassJobCategory,Category,UnlockCondition,SortKey,Icon,Name +int32,byte,Row,ClassJobCategory,byte,BannerCondition,uint16,Image,str 0,0,0,1,0,0,0,0,"未設定" 1,20,3,1,3,1,1,82083,"Standing 1" 2,11,91,1,3,1,2,82083,"Standing 2" diff --git a/csv/DescriptionString.csv b/csv/DescriptionString.csv index 9f61aaad9..37ed3069a 100644 --- a/csv/DescriptionString.csv +++ b/csv/DescriptionString.csv @@ -2527,9 +2527,9 @@ Popularity may change at the beginning of a new season, but it will remain const The less abundant an item is, the higher it will sell for. -Furthermore, the popularity of handicrafts may change each cycle according to both commercial trends in Limsa Lominsa and the type/amount of items you sell from your island. +Furthermore, the supply of handicrafts may change each cycle according to both commercial trends in Limsa Lominsa and the type/amount of items you sell from your island. -You can check predicted shifts in market behavior by referencing the “Demand Shift” column of the Supply & Demand interface. +You can check shifts in demand from the previous cycle to the current one by referencing the “Demand Shift” column of the Supply & Demand interface. If you produce too much of the same product, the market will be inundated with it, causing supply to become “Overflowing.” Pay special attention to changes in the market when looking to create a large amount of a single kind of handicraft." 782,"A variety of resources are necessary for the production of handicrafts. You may confirm what materials are required for your workshop's current schedule by selecting “Review Materials” and accessing the Material Allocation interface." diff --git a/csv/ENpcBase.csv b/csv/ENpcBase.csv index a70eae9b6..4e3bef63d 100644 --- a/csv/ENpcBase.csv +++ b/csv/ENpcBase.csv @@ -39680,7 +39680,7 @@ int32,uint16,bit&01,Row,Row,Row,Row,Row,Row,Row,Row,Row,Row,Row,Row,Row,Row,Row, 1039676,783,False,69975,69976,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,1,0,2,0,4,50,3,201,201,1,0,146,0,0,0,0,0,146,2,0,0,0,0,50,1,50,0,0,0,0,30025,"2701, 6, 2, 0",0,"0, 0, 0, 0",0,0,0,False,131768,0,131768,0,131768,0,131768,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 1039677,783,False,69975,69976,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,1,0,4,0,1,0,7,205,202,1,88,241,92,0,1,0,0,241,0,0,0,0,40,100,3,0,0,0,0,0,30025,"1001, 91, 1, 0",0,"0, 0, 0, 0",0,0,0,False,74738,0,74738,0,74738,0,74738,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 1039678,784,False,69975,69976,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,1,0,2,0,1,50,3,2,212,1,74,5,1,154,0,0,2,5,5,3,0,131,162,100,3,50,1,7,0,0,30025,"8037, 1, 1, 0",0,"0, 0, 0, 0",0,0,0,False,65857,0,65857,0,65857,0,65857,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 -1039679,783,False,69975,69976,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,1,0,2,0,3,0,3,91,135,129,65,161,5,3,0,0,0,161,1,2,2,0,0,0,4,50,0,0,0,0,0,"0, 0, 0, 0",0,"0, 0, 0, 0",0,0,0,False,66237,6,66237,0,66237,0,66237,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 +1039679,783,False,69975,69976,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,1,0,2,0,1,50,3,1,135,1,59,146,40,0,0,0,0,146,1,2,2,0,0,75,1,50,0,0,0,0,0,"0, 0, 0, 0",0,"0, 0, 0, 0",0,0,0,False,262481,0,65962,0,65961,0,65961,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 1039680,783,False,69975,69976,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,1,0,1,0,1,0,1,213,122,129,20,146,140,153,0,0,2,146,2,5,1,3,170,50,0,50,1,7,0,0,30025,"8002, 11, 1, 0",0,"0, 0, 0, 0",0,0,0,False,262878,0,262878,0,393948,0,393948,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 1039681,783,False,69975,69976,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,1,0,2,1,1,50,3,201,201,129,9,171,9,25,0,1,0,171,0,0,0,0,0,50,1,50,0,1,0,0,30025,"201, 56, 1, 0",0,"0, 0, 0, 0",0,11075595,0,False,65708,0,65708,0,65708,0,65708,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 1039682,849,False,69981,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,1,1,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,434,0,"0, 0, 0, 0",0,"0, 0, 0, 0",0,0,0,False,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,False,0,0 diff --git a/csv/ENpcResident.csv b/csv/ENpcResident.csv index def8e1081..7769a5165 100644 --- a/csv/ENpcResident.csv +++ b/csv/ENpcResident.csv @@ -43725,7 +43725,7 @@ int32,str,sbyte,str,sbyte,sbyte,sbyte,sbyte,sbyte,str,byte,bit&01 1043721,"Adventurers' Guild investigator",0,"Adventurers' Guild investigators",0,1,1,0,0,"",4,False 1043722,"Papa Gruff",0,"Papa Gruff",0,0,1,0,1,"",4,False 1043723,"Mama Gruff",0,"Mama Gruff",0,0,1,1,1,"",4,False -1043724,"wake doctor",0,"wake doctors",0,0,1,1,0,"",4,False +1043724,"Wake doctor",0,"Wake doctors",0,0,1,1,0,"",4,False 1043725,"Papa Gruff",0,"Papa Gruff",0,0,1,0,1,"",4,False 1043726,"",0,"",0,0,1,0,0,"",4,False 1043727,"Eynzahr",0,"Eynzahr",0,1,1,0,1,"",4,False @@ -43971,10 +43971,10 @@ int32,str,sbyte,str,sbyte,sbyte,sbyte,sbyte,sbyte,str,byte,bit&01 1043967,"",0,"",0,0,1,0,0,"",5,False 1043968,"",0,"",0,0,1,0,0,"",5,False 1043969,"",0,"",0,0,1,0,0,"",5,False -1043970,"wake doctor",0,"wake doctors",0,0,1,1,0,"",3,False +1043970,"Wake doctor",0,"Wake doctors",0,0,1,1,0,"",3,False 1043971,"Papa Gruff-esque investigator",0,"Papa Gruff-esque investigators",0,0,1,0,0,"",3,False 1043972,"Adventurers' Guild investigator",0,"Adventurers' Guild investigators",0,1,1,0,0,"",3,False -1043973,"wake doctor",0,"wake doctors",0,0,1,1,0,"",3,False +1043973,"Wake doctor",0,"Wake doctors",0,0,1,1,0,"",3,False 1043974,"unusual usher",0,"unusual ushers",0,1,1,0,0,"",3,False 1043975,"genial guiser",0,"genial guisers",0,0,1,0,0,"",3,False 1043976,"pumpkin-headed apparition",0,"pumpkin-headed apparitions",0,0,1,1,0,"",3,False diff --git a/csv/InclusionShopSeries.csv b/csv/InclusionShopSeries.csv index b7bf6c26d..3e2782f33 100644 --- a/csv/InclusionShopSeries.csv +++ b/csv/InclusionShopSeries.csv @@ -106,7 +106,7 @@ int32,SpecialShop 22.1,1770187 22.2,1770188 22.3,1770629 -22.5,1770189 +22.4,1770189 23.0,1770190 23.1,1770191 23.2,1770192 diff --git a/csv/InstanceContent.csv b/csv/InstanceContent.csv index 71b8daf1e..c1692e98c 100644 --- a/csv/InstanceContent.csv +++ b/csv/InstanceContent.csv @@ -402,13 +402,13 @@ int32,InstanceContentType,byte,uint16,bit&01,BGM,BGM,Cutscene,uint32,uint16,Colo 30105,1,0,120,False,1,1,2513,8661282,779,0,False,0,0,0,26700,26780,0,0,0,50,0,470250,0,40,0,0,85500,128250,171000,0,0,10,20,30,0,0,0,0,0,0,0,0,0,0,0,0,855000,0,227,120,0,0,True,0,-1,0,0,0,38,False,0,47,27,0,0,0,False,0 30106,1,0,120,False,920,18,2866,0,788,0,False,0,0,0,32600,32628,0,0,0,0,100,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,100,0,0,False,0,-1,0,0,53,0,True,0,76,43,0,0,0,False,0 30107,1,0,90,False,886,18,2778,0,800,0,False,0,0,0,32500,32509,0,0,0,0,40,0,0,0,10,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,100,0,0,False,0,-1,0,0,0,0,False,0,64,41,0,0,0,False,0 -30108,1,0,120,False,886,18,2786,0,801,0,False,0,0,0,32500,32517,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,100,0,0,False,30112,-1,0,0,0,0,False,0,64,41,0,0,0,True,0 +30108,1,0,120,False,886,18,2786,0,801,0,False,0,0,0,32500,32517,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,100,0,4,False,30112,-1,0,0,0,0,False,0,64,41,0,0,0,True,0 30109,1,0,90,False,885,18,2776,0,806,0,False,0,0,0,32200,32201,0,0,0,0,40,0,0,0,10,5,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,False,0,-1,0,0,56,0,False,0,68,40,0,0,0,False,0 -30110,1,0,90,False,885,18,2784,0,807,0,False,0,0,0,32200,32201,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,100,0,0,False,30112,-1,0,0,0,0,False,0,68,40,0,0,0,False,0 +30110,1,0,90,False,885,18,2784,0,807,0,False,0,0,0,32200,32201,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,100,0,4,False,30112,-1,0,0,0,0,False,0,68,40,0,0,0,False,0 30111,1,0,90,False,885,18,2772,0,808,0,False,0,0,0,32100,32118,0,0,0,0,40,0,0,0,10,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,100,0,0,False,0,-1,0,0,0,0,False,0,66,38,0,0,0,False,0 -30112,1,0,90,False,885,18,2780,0,809,0,False,0,0,0,32100,32118,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,100,0,0,False,0,-1,0,0,0,0,False,0,67,38,0,0,0,False,0 +30112,1,0,90,False,885,18,2780,0,809,0,False,0,0,0,32100,32118,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,100,0,4,False,0,-1,0,0,0,0,False,0,67,38,0,0,0,False,0 30113,1,0,90,False,885,18,2774,0,810,0,False,0,0,0,30901,30904,0,0,0,0,40,0,0,0,10,5,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,False,0,-1,0,0,0,0,False,0,65,39,0,0,0,False,0 -30114,1,0,90,False,885,18,2782,0,811,0,False,0,0,0,30901,30904,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,100,0,0,False,30112,-1,0,0,0,0,False,0,65,39,0,0,0,False,0 +30114,1,0,90,False,885,18,2782,0,811,0,False,0,0,0,30901,30904,0,0,0,0,100,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,100,0,4,False,30112,-1,0,0,0,0,False,0,65,39,0,0,0,False,0 30115,1,1,120,False,913,18,2848,9085561,866,0,False,0,0,0,33000,33089,0,0,0,0,50,0,0,0,40,20,0,0,0,0,0,0,0,0,0,0,10,20,30,0,0,0,0,0,0,0,0,0,270,100,0,0,False,0,-1,0,0,0,43,False,0,84,48,0,0,0,True,0 30116,1,1,90,False,937,18,2916,0,872,0,False,0,0,0,34900,34900,0,0,0,0,40,0,0,0,20,10,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,False,0,-1,0,0,0,0,False,0,95,51,0,0,0,True,0 30117,1,0,90,False,937,18,2924,0,873,0,False,0,0,0,34900,34900,0,0,0,0,100,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,274,100,0,0,False,0,0,0,0,63,0,False,0,104,51,0,0,0,False,0 diff --git a/csv/Item.csv b/csv/Item.csv index c45ca9f95..58e7d8bc1 100644 --- a/csv/Item.csv +++ b/csv/Item.csv @@ -51042,8 +51042,8 @@ Meal benefits when used: 38645,"Ripples in the Sea orchestrion roll",0,"Ripples in the Sea orchestrion rolls",0,0,1,0,0,"Music roll for Ripples in the Sea. Use to add to your orchestrion list.","Ripples in the Sea Orchestrion Roll",25945,1,1,32,552,94,80,0,59,10000,999,False,False,False,False,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False 38646,"The Sands' Secrets orchestrion roll",0,"The Sands' Secrets orchestrion rolls",0,0,1,0,0,"Music roll for The Sands' Secrets. Use to add to your orchestrion list.","The Sands' Secrets Orchestrion Roll",25945,1,1,32,553,94,80,0,59,10000,999,False,False,False,False,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False 38647,"Unworthy orchestrion roll",0,"Unworthy orchestrion rolls",0,1,1,0,0,"Music roll for Unworthy. Use to add to your orchestrion list.","Unworthy Orchestrion Roll",25945,1,1,32,554,94,80,0,59,10000,999,False,False,False,False,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False -38648,"Stigma orchestrion roll",0,"Stigma orchestrion rolls",0,0,1,0,0,"Music roll for Stigma. Use to add to your orchestrion list.","Stigma Orchestrion Roll",25945,1,1,32,555,94,80,0,59,10000,999,False,False,False,True,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False -38649,"Toll of the Bells orchestrion roll",0,"Toll of the Bells orchestrion rolls",0,0,1,0,0,"Music roll for Toll of the Bells. Use to add to your orchestrion list.","Toll of the Bells Orchestrion Roll",25945,1,1,32,556,94,80,0,59,10000,999,False,False,False,True,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False +38648,"Toll of the Bells orchestrion roll",0,"Toll of the Bells orchestrion rolls",0,0,1,0,0,"Music roll for Toll of the Bells. Use to add to your orchestrion list.","Toll of the Bells Orchestrion Roll",25945,1,1,32,555,94,80,0,59,10000,999,False,False,False,True,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False +38649,"Stigma orchestrion roll",0,"Stigma orchestrion rolls",0,0,1,0,0,"Music roll for Stigma. Use to add to your orchestrion list.","Stigma Orchestrion Roll",25945,1,1,32,556,94,80,0,59,10000,999,False,False,False,True,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False 38650,"The Emperor's Wont orchestrion roll",0,"The Emperor's Wont orchestrion rolls",0,0,1,0,0,"Music roll for The Emperor's Wont. Use to add to your orchestrion list.","The Emperor's Wont Orchestrion Roll",25945,1,1,32,557,94,0,0,59,10000,1,True,True,True,False,2,0,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False 38651,"Penitus orchestrion roll",0,"Penitus orchestrion rolls",0,0,1,0,0,"Music roll for Penitus. Use to add to your orchestrion list.","Penitus Orchestrion Roll",25945,1,1,32,558,94,0,0,59,10000,1,True,True,True,False,2,0,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False 38652,"A Thousand Screams orchestrion roll",0,"A Thousand Screams orchestrion rolls",0,1,1,0,0,"Music roll for A Thousand Screams. Use to add to your orchestrion list.","A Thousand Screams Orchestrion Roll",25945,1,1,32,559,94,80,0,59,10000,999,False,False,False,True,99999,150,False,False,False,2235,0,0,0,0,0,0,False,False,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,False,False,0,False diff --git a/csv/LogMessage.csv b/csv/LogMessage.csv index d24da30bf..e7862d487 100644 --- a/csv/LogMessage.csv +++ b/csv/LogMessage.csv @@ -10342,7 +10342,7 @@ Realize visions to unlock additional ranks." 10198,60,8,0,False,"Unable to summon mount until further progress has been made." 10199,60,9,0,False,"You must free an animal for any more to fit in the pasture." 10200,0,0,0,False,"" -10201,0,0,0,False,"" +10201,57,33,0,False,"Your conversation with the tactful taskmaster was cut short. The season has changed." 10202,0,0,0,False,"" 10203,0,0,0,False,"" 10204,0,0,0,False,"" diff --git a/csv/MJIAnimals.csv b/csv/MJIAnimals.csv index d55cd5788..ce62c052d 100644 --- a/csv/MJIAnimals.csv +++ b/csv/MJIAnimals.csv @@ -1,6 +1,6 @@ key,0,1,2,3,4,5,6 -#,,,,,,, -int32,uint32,byte,byte,byte,uint32,uint32,int32 +#,BNpcBase,Size,,,Reward[0],Reward[1],Icon +int32,BNpcBase,byte,byte,byte,Item,Item,Image 0,0,0,0,0,0,0,0 1,14906,1,1,1,37603,37611,70121 2,14907,1,2,1,37611,37603,70122 diff --git a/csv/MJIBuilding.csv b/csv/MJIBuilding.csv index cb505395f..b9a481f51 100644 --- a/csv/MJIBuilding.csv +++ b/csv/MJIBuilding.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 -#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -int32,byte,uint16,byte,byte,uint16,byte,uint16,byte,uint16,byte,uint16,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,uint32,uint32,uint32 +#,,,,,,,,,,,,,,,,,,,,Material[0],Material[1],Material[2],Material[3],Material[4],Amount[0],Amount[1],Amount[2],Amount[3],Amount[4],Name,,Icon +int32,byte,uint16,byte,byte,uint16,byte,uint16,byte,uint16,byte,uint16,byte,byte,byte,byte,byte,byte,byte,byte,MJIItemPouch,MJIItemPouch,MJIItemPouch,MJIItemPouch,MJIItemPouch,byte,byte,byte,byte,byte,MJIText,uint32,Image 0.0,1,29953,24,0,29954,0,0,0,0,0,0,0,0,0,0,0,0,0,255,10,0,11,3,8,10,10,5,5,5,2,47,53919 0.1,4,29955,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,10,11,14,0,13,15,10,10,5,5,3,48,53920 0.2,7,29788,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,9,14,17,18,19,15,10,10,10,5,4,49,53921 diff --git a/csv/MJICraftworksObject.csv b/csv/MJICraftworksObject.csv index 671bfa5ec..f931c1eeb 100644 --- a/csv/MJICraftworksObject.csv +++ b/csv/MJICraftworksObject.csv @@ -1,6 +1,6 @@ key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14 -#,Item,,,,,,,,,,,,,, -int32,Item,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16,uint16 +#,Item,Theme[0],Theme[1],,Material[0],Amount[0],Material[1],Amount[1],Material[2],Amount[2],Material[3],Amount[3],LevelReq,CraftingTime,Value +int32,Item,MJICraftworksObjectTheme,MJICraftworksObjectTheme,uint16,MJIItemPouch,uint16,MJIItemPouch,uint16,MJIItemPouch,uint16,MJIItemPouch,uint16,uint16,uint16,uint16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1,37628,8,0,0,0,2,7,2,0,0,0,0,1,4,28 2,37633,8,16,0,8,2,14,1,7,1,0,0,1,4,28 diff --git a/csv/MJICraftworksObjectTheme.csv b/csv/MJICraftworksObjectTheme.csv index d7f4a2bc0..75c132afb 100644 --- a/csv/MJICraftworksObjectTheme.csv +++ b/csv/MJICraftworksObjectTheme.csv @@ -1,5 +1,5 @@ key,0 -#, +#,Name int32,str 0,"" 1,"Preserved Food" diff --git a/csv/MJICraftworksPopularity.csv b/csv/MJICraftworksPopularity.csv index a188c07ab..e594fc564 100644 --- a/csv/MJICraftworksPopularity.csv +++ b/csv/MJICraftworksPopularity.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,60,61 -#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -int32,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte +#,Popularity[0],Popularity[1],Popularity[2],Popularity[3],Popularity[4],Popularity[5],Popularity[6],Popularity[7],Popularity[8],Popularity[9],Popularity[10],Popularity[11],Popularity[12],Popularity[13],Popularity[14],Popularity[15],Popularity[16],Popularity[17],Popularity[18],Popularity[19],Popularity[20],Popularity[21],Popularity[22],Popularity[23],Popularity[24],Popularity[25],Popularity[26],Popularity[27],Popularity[28],Popularity[29],Popularity[30],Popularity[31],Popularity[32],Popularity[33],Popularity[34],Popularity[35],Popularity[36],Popularity[37],Popularity[38],Popularity[39],Popularity[40],Popularity[41],Popularity[42],Popularity[43],Popularity[44],Popularity[45],Popularity[46],Popularity[47],Popularity[48],Popularity[49],Popularity[50],Popularity[51],Popularity[52],Popularity[53],Popularity[54],Popularity[55],Popularity[56],Popularity[57],Popularity[58],Popularity[59],Popularity[60],Popularity[61] +int32,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType,MJICraftworksPopularityType 0,0,3,2,1,1,2,2,2,3,3,3,1,4,4,1,2,4,3,2,3,4,4,3,4,3,1,2,3,3,1,2,4,1,2,1,4,1,2,3,2,1,3,2,1,3,2,3,2,3,1,2,0,0,0,0,0,0,0,0,0,0,0 1,0,3,1,2,2,3,3,3,2,4,1,1,4,1,2,2,4,3,2,2,1,1,2,3,1,2,2,3,3,2,1,3,3,4,4,2,4,2,1,4,1,3,4,3,1,2,3,3,1,3,2,0,0,0,0,0,0,0,0,0,0,0 2,0,2,1,3,3,2,1,1,3,2,4,1,4,3,2,2,4,3,3,1,2,2,3,2,2,4,3,2,2,4,1,3,2,4,3,3,1,1,4,2,2,3,1,1,1,3,4,3,2,1,3,0,0,0,0,0,0,0,0,0,0,0 diff --git a/csv/MJICraftworksPopularityType.csv b/csv/MJICraftworksPopularityType.csv index a90088f41..726038f6c 100644 --- a/csv/MJICraftworksPopularityType.csv +++ b/csv/MJICraftworksPopularityType.csv @@ -1,5 +1,5 @@ key,0 -#, +#,Ratio int32,uint16 0,0 1,140 diff --git a/csv/MJICraftworksRankRatio.csv b/csv/MJICraftworksRankRatio.csv index 7caa61465..274d76457 100644 --- a/csv/MJICraftworksRankRatio.csv +++ b/csv/MJICraftworksRankRatio.csv @@ -1,5 +1,5 @@ key,0 -#, +#,Ratio int32,uint16 0,0 1,100 diff --git a/csv/MJICraftworksSupplyDefine.csv b/csv/MJICraftworksSupplyDefine.csv index 86acf539c..5466957c7 100644 --- a/csv/MJICraftworksSupplyDefine.csv +++ b/csv/MJICraftworksSupplyDefine.csv @@ -1,5 +1,5 @@ key,0,1 -#,, +#,Supply,Ratio int32,int16,uint16 0,18,160 1,10,130 diff --git a/csv/MJIGathering.csv b/csv/MJIGathering.csv index b54a9c6e1..d64e34eb0 100644 --- a/csv/MJIGathering.csv +++ b/csv/MJIGathering.csv @@ -1,6 +1,6 @@ key,0 -#, -int32,byte +#,GatheringObject +int32,MJIGatheringObject 0,4 1,4 2,4 diff --git a/csv/MJIGatheringItem.csv b/csv/MJIGatheringItem.csv index 8fcf33075..e8074c432 100644 --- a/csv/MJIGatheringItem.csv +++ b/csv/MJIGatheringItem.csv @@ -1,6 +1,6 @@ key,0,1,2,3,4,5 -#,,,,,, -int32,uint32,byte,byte,int16,int16,uint16 +#,Item,Sort,,X,Y,Radius +int32,Item,byte,byte,int16,int16,uint16 0,0,0,0,0,0,0 1,37551,0,0,20,0,100 2,37552,21,1,194,72,100 diff --git a/csv/MJIHudMode.csv b/csv/MJIHudMode.csv index 0310d0035..3a22f68e3 100644 --- a/csv/MJIHudMode.csv +++ b/csv/MJIHudMode.csv @@ -1,6 +1,6 @@ key,0,1,2,3 -#,,,, -int32,str,str,uint32,uint32 +#,Name,Title,Icon, +int32,str,str,Image,uint32 0,"Free","",82041,0 1,"Gather","Gather",82042,0 2,"Sow","Sow",82043,3 diff --git a/csv/MJIItemCategory.csv b/csv/MJIItemCategory.csv index b13c69449..f8e6a63ca 100644 --- a/csv/MJIItemCategory.csv +++ b/csv/MJIItemCategory.csv @@ -1,5 +1,5 @@ key,0,1 -#,, +#,Singular,Plural int32,str,str 0,"","" 1,"Material","Materials" diff --git a/csv/MJIItemPouch.csv b/csv/MJIItemPouch.csv index 199f995e9..869445356 100644 --- a/csv/MJIItemPouch.csv +++ b/csv/MJIItemPouch.csv @@ -1,6 +1,6 @@ key,0,1,2 -#,Item,, -int32,Item,int32,byte +#,Item,Category,Seed +int32,Item,MJIItemCategory,MJICropSeed 0,37551,1,0 1,37552,1,0 2,37553,1,0 diff --git a/csv/MJILandmark.csv b/csv/MJILandmark.csv index c3cd5777b..fcef75f7f 100644 --- a/csv/MJILandmark.csv +++ b/csv/MJILandmark.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 -#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -int32,byte,uint16,uint16,byte,uint16,byte,uint16,byte,uint16,byte,uint16,byte,byte,byte,byte,byte,byte,uint16,uint16,uint16,uint16,uint16,byte,byte,byte,byte,byte,uint32,uint16,uint32 +#,,,,,,,,,,,,,,,,,,Material[0],Material[1],Material[2],Material[3],Material[4],Amount[0],Amount[1],Amount[2],Amount[3],Amount[4],Name,,Icon +int32,byte,uint16,uint16,byte,uint16,byte,uint16,byte,uint16,byte,uint16,byte,byte,byte,byte,byte,byte,MJIItemPouch,MJIItemPouch,MJIItemPouch,MJIItemPouch,MJIItemPouch,byte,byte,byte,byte,byte,MJIText,uint16,Image 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,0,0,0,0,0,0,0,0 1,2,0,30118,31,30266,27,30267,28,30268,29,30118,30,12,10,4,0,12,9,14,10,11,13,15,15,10,5,5,20,57,53914 2,2,0,30121,36,30272,32,30281,33,30282,34,30121,35,12,10,4,0,12,10,9,14,7,11,15,15,10,5,5,21,58,53911 diff --git a/csv/MJIProgress.csv b/csv/MJIProgress.csv index 90c3364a9..9b8e458d3 100644 --- a/csv/MJIProgress.csv +++ b/csv/MJIProgress.csv @@ -1,5 +1,5 @@ key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21 -#,,,,,,,,,,,,,,,,,,,,,, +#,Vision,Objective,PreviousObjective,,,,,,,,,,,,,,,,,,, int32,str,str,str,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,int16,int16,uint16 0,"","","",255,0,0,255,0,0,255,0,0,255,0,0,255,0,0,0,0,0,0 1,"The Coziest of Cabins","FEFF0A6992Speak with the felicitous furball.EC","",255,0,0,255,0,0,255,0,0,255,0,0,255,0,0,0,0,0,0 diff --git a/csv/MJIRank.csv b/csv/MJIRank.csv index ab05a3988..1eba6410e 100644 --- a/csv/MJIRank.csv +++ b/csv/MJIRank.csv @@ -1,5 +1,5 @@ key,0,1,2,3,4 -#,,,,, +#,ExpToNext,,,, int32,uint32,byte,uint32,uint32,uint32 0,0,0,0,0,0 1,3000,0,0,0,0 diff --git a/csv/MJIRecipe.csv b/csv/MJIRecipe.csv index 6c3ac80b0..340457fae 100644 --- a/csv/MJIRecipe.csv +++ b/csv/MJIRecipe.csv @@ -1,6 +1,6 @@ key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14 -#,,,,,,,,,,,,,,, -int32,uint32,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte +#,LogMessage,KeyItem,ItemPouch,,Material[0],Amount[0],Material[1],Amount[1],Material[2],Amount[2],Material[3],Amount[3],Material[4],Amount[4],Order +int32,LogMessage,MJIKeyItem,MJIItemPouch,byte,MJIRecipeMaterial,byte,MJIRecipeMaterial,byte,MJIRecipeMaterial,byte,MJIRecipeMaterial,byte,MJIRecipeMaterial,byte,byte 0,9904,1,0,1,3,2,4,2,21,3,0,0,0,0,20 1,9905,2,0,1,4,3,7,2,9,4,0,0,0,0,21 2,9906,3,0,1,7,3,9,3,11,4,0,0,0,0,22 diff --git a/csv/MJIRecipeMaterial.csv b/csv/MJIRecipeMaterial.csv index fc41807de..016cbc95c 100644 --- a/csv/MJIRecipeMaterial.csv +++ b/csv/MJIRecipeMaterial.csv @@ -1,6 +1,6 @@ key,0,1 -#,, -int32,int32,int32 +#,ItemPouch, +int32,MJIItemPouch,int32 0,0,0 1,0,4 2,1,0 diff --git a/csv/MJIText.csv b/csv/MJIText.csv index 75297ed79..7814a76c6 100644 --- a/csv/MJIText.csv +++ b/csv/MJIText.csv @@ -1,5 +1,5 @@ key,0 -#, +#,Text int32,str 0,"" 1,"None" diff --git a/csv/Orchestrion.csv b/csv/Orchestrion.csv index 2531156ef..2f8c393bc 100644 --- a/csv/Orchestrion.csv +++ b/csv/Orchestrion.csv @@ -612,8 +612,8 @@ int32,str,str 552,"Ripples in the Sea","Available for exchange at Maelstrom Command." 553,"The Sands' Secrets","Available for exchange at the Hall of Flames." 554,"Unworthy","Available for exchange in the Firmament." -555,"Stigma","Obtained in the Vault." -556,"Toll of the Bells","Obtained in the Vault." +555,"Toll of the Bells","Obtained in the Vault." +556,"Stigma","Obtained in the Vault." 557,"The Emperor's Wont","Available for exchange in Garlemald." 558,"Penitus","Available for exchange in Garlemald." 559,"A Thousand Screams","Obtained in the Thousand Maws of Toto-Rak." diff --git a/csv/TerritoryType.csv b/csv/TerritoryType.csv index e38817770..f4844d47f 100644 --- a/csv/TerritoryType.csv +++ b/csv/TerritoryType.csv @@ -991,7 +991,7 @@ int32,str,str,byte,PlaceName,PlaceName,PlaceName,Map,LoadingImage,byte,byte,Cont 1090,"a2fd_3","ex1/03_abr_a2/fld/a2fd/level/a2fd",1,497,510,2256,283,7,2,10,875,False,66,False,0,True,False,False,False,1001,122019,124165,0,0,0,-1,638,-1,False,4,0,0,0,0,False,False,0,False,False,False,False,True,0 1091,"ec046","ex4/05_zon_z5/dun/z5d1/level/z5d1",1,2405,519,4185,769,1,1,29,874,False,149,False,0,True,False,False,False,1001,-1,-1,0,0,0,-1,631,-1,False,4,0,0,0,0,False,False,0,False,False,True,False,True,0 1092,"z5fa_event","ex4/05_zon_z5/fld/z5fa/level/z5fa",1,2405,519,4045,790,1,0,15,0,False,149,False,0,True,False,False,False,930,-1,-1,854650,0,169,-1,0,-1,False,4,0,0,0,0,False,False,0,False,False,False,False,False,0 -1093,"n5r8_event","ex4/01_nvt_n5/rad/n5r8/level/n5r8",1,3705,3743,4250,809,27,0,15,0,False,0,False,0,True,False,False,False,884,-1,-1,854637,0,0,-1,0,-1,False,4,0,0,0,0,False,False,0,False,False,False,False,False,0 +1093,"n5r8_event","ex4/01_nvt_n5/rad/n5r8/level/n5r8",1,3705,3743,4250,809,27,0,15,0,False,0,False,0,True,False,False,False,884,-1,-1,854637,0,168,-1,0,-1,False,4,0,0,0,0,False,False,0,False,False,False,False,False,0 1094,"f1ea","ffxiv/fst_f1/evt/f1ea/level/f1ea",1,23,507,4040,789,3,0,32,0,False,0,False,0,True,False,False,False,174,-1,-1,0,0,3,-1,0,-1,False,0,0,0,0,0,False,False,0,False,False,False,False,False,0 1095,"","",0,0,0,0,0,0,0,0,0,False,0,False,0,False,False,False,False,0,0,0,0,0,0,0,0,0,False,0,0,0,0,0,False,False,0,False,False,False,False,False,0 1096,"","",0,0,0,0,0,0,0,0,0,False,0,False,0,False,False,False,False,0,0,0,0,0,0,0,0,0,False,0,0,0,0,0,False,False,0,False,False,False,False,False,0 diff --git a/csv/TerritoryTypeTelepo.csv b/csv/TerritoryTypeTelepo.csv index 7fe4a1f23..2cb31743c 100644 --- a/csv/TerritoryTypeTelepo.csv +++ b/csv/TerritoryTypeTelepo.csv @@ -991,7 +991,7 @@ int32,uint16,uint16,uint16,byte 1090,0,0,0,0 1091,0,0,0,0 1092,1000,1000,600,5 -1093,0,0,0,0 +1093,1000,1000,600,3 1094,12252,7936,200,0 1095,0,0,0,0 1096,0,0,0,0 diff --git a/csv/TraitTransient.csv b/csv/TraitTransient.csv index 65e3cf216..3918ef061 100644 --- a/csv/TraitTransient.csv +++ b/csv/TraitTransient.csv @@ -637,8 +637,8 @@ Enhances F201F4F201F5Astral FlowF201F8F201F9Ifrit's Favor Upgrade: 0101F201F4F201F5Crimson Cyclone0101 F201F8F201F9Titan's Favor Upgrade: 0101F201F4F201F5Mountain Buster0101 F201F8F201F9Garuda's Favor Upgrade: 0101F201F4F201F5Slipstream0101" -504,"Increases the potency of F201F4F201F5Fast Blade0101 to 200, F201F4F201F5Riot Blade0101 to 170, F201F4F201F5Royal Authority0101 to 130, F201F4F201F5Holy Spirit0101 to 280, and F201F4F201F5Atonement0101 to 420." -505,"Increases the potency of F201F4F201F5Heavy Swing0101 to 200, F201F4F201F5Maim0101 to 150, F201F4F201F5Storm's Path0101 to 130, and F201F4F201F5Storm's Eye0101 to 130." +504,"Increases the potency of F201F4F201F5Fast Blade0101 to 200, F201F4F201F5Riot Blade0101 to 170, F201F4F201F5Royal Authority0101 to 130, F201F4F201F5Holy Spirit0101 to 300, and F201F4F201F5Atonement0101 to 420." +505,"Increases the potency of F201F4F201F5Heavy Swing0101 to 200, F201F4F201F5Maim0101 to 150, F201F4F201F5Storm's Path0101 to 150, and F201F4F201F5Storm's Eye0101 to 150." 506,"Increases the potency of F201F4F201F5Hard Slash0101 to 170, F201F4F201F5Syphon Strike0101 to 120, and F201F4F201F5Souleater0101 to 120." 507,"Increases the potency of F201F4F201F5Keen Edge0101 to 170, F201F4F201F5Brutal Shell0101 to 130, and F201F4F201F5Solid Barrel0101 to 140." 508,"Increases the potency of F201F4F201F5Geirskogul0101 to 260 and F201F4F201F5Nastrond0101 to 360. diff --git a/csv/custom/007/CtsMjiWorkShopManagement_00780.csv b/csv/custom/007/CtsMjiWorkShopManagement_00780.csv index 9812e9291..640870cfd 100644 --- a/csv/custom/007/CtsMjiWorkShopManagement_00780.csv +++ b/csv/custom/007/CtsMjiWorkShopManagement_00780.csv @@ -1,7 +1,7 @@ key,0,1 #,, int32,str,str -0,"TEXT_CTSMJIWORKSHOPMANAGEMENT_00780_SALE_SUCCESS","Ah, the owner returns. You'll pleased to know the team has finished production of the items you requested. We've taken the liberty of shipping them as well. Here are the earnings." +0,"TEXT_CTSMJIWORKSHOPMANAGEMENT_00780_SALE_SUCCESS","Ah, the owner returns. You'll be pleased to know the team has finished production of the items you requested. We've taken the liberty of shipping them as well. Here are the earnings." 1,"TEXT_CTSMJIWORKSHOPMANAGEMENT_00780_OWNER_OTHER","Apologies, but information regarding the workshop is given on a need-to-know basis, and only the owner needs to know." 2,"TEXT_CTSMJIWORKSHOPMANAGEMENT_00780_CHECK_OVER_GILLS","Warning: You will not be able to receive all the seafarer's cowries. Do you still wish to proceed?" 3,"TEXT_CTSMJIWORKSHOPMANAGEMENT_00780_MENU_00","What will you do?" diff --git a/csv/cut_scene/062/VoiceMan_06200.csv b/csv/cut_scene/062/VoiceMan_06200.csv index 13c776ae7..fff8de72c 100644 --- a/csv/cut_scene/062/VoiceMan_06200.csv +++ b/csv/cut_scene/062/VoiceMan_06200.csv @@ -279,7 +279,7 @@ int32,str,str 275,"TEXT_VOICEMAN_06200_002600_ESTINIEN","She's here!" 276,"TEXT_VOICEMAN_06200_002610_WINDMONOLITH","Excellent. You've saved me the trouble of traveling to Troia." 277,"TEXT_VOICEMAN_06200_002620_ESTINIEN","So you're Barbariccia. " -278,"TEXT_VOICEMAN_06200_002630_WINDMONOLITH","Mind you manners, mortal! My name is not to be spoken save in reverence and fear." +278,"TEXT_VOICEMAN_06200_002630_WINDMONOLITH","Mind your manners, mortal! My name is not to be spoken save in reverence and fear." 279,"TEXT_VOICEMAN_06200_002640_WINDMONOLITH","And what is this pitiful domain?" 280,"TEXT_VOICEMAN_06200_002650_WINDMONOLITH","Pitiful wretches all. I will put you out of your misery!" 281,"TEXT_VOICEMAN_06200_002660_WINDMONOLITH","Alas, poor Scarmiglione, and good riddance. Felled by outsiders in pursuit of what, pray tell?" @@ -292,7 +292,7 @@ int32,str,str 288,"TEXT_VOICEMAN_06200_002730_WINDMONOLITH","Heh, you even share its scent. How curious...and irresistible! " 289,"TEXT_VOICEMAN_06200_002740_VARSHAHNBIG","Report if displayed." 290,"TEXT_VOICEMAN_06200_002750_ESTINIEN","If you think us easy prey, you're wrong." -291,"TEXT_VOICEMAN_06200_002760_WINDMONOLITH","Unlike Scarmilgione, I need not skulk in shadow to claim what is mine." +291,"TEXT_VOICEMAN_06200_002760_WINDMONOLITH","Unlike Scarmiglione, I need not skulk in shadow to claim what is mine." 292,"TEXT_VOICEMAN_06200_002770_WINDMONOLITH","If you would know about the dragon you seek, then enter into my domain." 293,"TEXT_VOICEMAN_06200_002780_WINDMONOLITH","You may flee instead if you wish─if the fate of the sorry lot here is of no concern to you. One way or another, I will have satisfaction." 294,"TEXT_VOICEMAN_06200_002790_ESTINIEN","What's the plan, then?" @@ -306,7 +306,7 @@ int32,str,str 302,"TEXT_VOICEMAN_06200_002840_MYSTERIOUSPERSON","Nevertheless, if you are desperate for my aid...you know my price." 303,"TEXT_VOICEMAN_06200_002850_VARSHAHNBIG","I shall pay it." 304,"TEXT_VOICEMAN_06200_002860_VARSHAHNBIG","So long as you leave me strength enough to see my sister home, you may take as much as you wish." -305,"TEXT_VOICEMAN_06200_002870_VARSHAHNBIG","And lest you forget, mine is no ordinary aether. Barbaricia too recognized its potency." +305,"TEXT_VOICEMAN_06200_002870_VARSHAHNBIG","And lest you forget, mine is no ordinary aether. Barbariccia too recognized its potency." 306,"TEXT_VOICEMAN_06200_002880_MYSTERIOUSPERSON","...Very well. We have a bargain." 307,"TEXT_VOICEMAN_06200_002890_ESTINIEN","You're not the only ones who can ride the wind!" 308,"TEXT_VOICEMAN_06200_002900_MYSTERIOUSPERSON","Report if displayed." diff --git a/csv/quest/046/FesHlw801_04655.csv b/csv/quest/046/FesHlw801_04655.csv index 45ac6ee09..4a7ae5de4 100644 --- a/csv/quest/046/FesHlw801_04655.csv +++ b/csv/quest/046/FesHlw801_04655.csv @@ -150,7 +150,7 @@ int32,str,str 140,"TEXT_FESHLW801_04655_INVESTIGATOR04655_000_104","Oh, my friend! You are truly a sight for sore eyes. Never in all my years of service have I been so humiliated." 141,"TEXT_FESHLW801_04655_INVESTIGATOR04655_000_105","I knew those fiends would be up to no good. Knew they would take advantage of the season's festivities, as is their wont. Yet for all my vigilance, here I am, their very first victim. Oh, the shame of it all─'tis as a spear piercing my very soul." 142,"TEXT_FESHLW801_04655_INVESTIGATOR04655_000_106","(-???-)I-It worked! You have my thanks..." -143,"TEXT_FESHLW801_04655_INVESTIGATOR04655_000_107","A pleasure to make your acquaintance, though I wish we had met under better circumstances. As our fiendish friend explained amidst his gloating, I'm an investigator working for the Adventurer's Guild." +143,"TEXT_FESHLW801_04655_INVESTIGATOR04655_000_107","A pleasure to make your acquaintance, though I wish we had met under better circumstances. As our fiendish friend explained amidst his gloating, I'm an investigator working for the Adventurers' Guild." 144,"TEXT_FESHLW801_04655_INVESTIGATOR04655_000_108","I knew that red-nosed charlatan would be up to no good. Knew he would take advantage of the season's festivities as he did once before. Yet for all my vigilance, here I am, his very first victim. Oh, the shame of it all─'tis as a spear piercing my very soul." 145,"TEXT_FESHLW801_04655_INVESTIGATOR04655_000_109","But thanks to you, I am free of that foul enchantment. I owe you my life, Miss...?" 146,"TEXT_FESHLW801_04655_PUMPKIN_000_110","I fear you'd sooner forget a name as unremarkable as my own. I am but a passing woman of science." @@ -215,7 +215,7 @@ int32,str,str 205,"TEXT_FESHLW801_04655_PIERROTFATHER_000_154","Why you conniving little... You may have put a damper on my plans, but all is not lost! Yes, if I start again now, all can be ready in time for supper..." 206,"TEXT_FESHLW801_04655_PUMPKIN_000_155","(-???-)Heh heh heh...surely, you jest..." 207,"TEXT_FESHLW801_04655_PUMPKIN_000_156","(-Wake Doctor-)All Saints' Wake is meant for all to partake in and enjoy." -208,"TEXT_FESHLW801_04655_PIERROTFATHER_000_157","Y-You! It cannot be! T-The Great Gourd of legend herself..." +208,"TEXT_FESHLW801_04655_PIERROTFATHER_000_157","Y-You! It cannot be! Th-The Great Gourd of legend herself..." 209,"TEXT_FESHLW801_04655_PUMPKIN_000_158","You poor, misguided soul. Gone are days when you might wreak havoc as you please. This truth I will drill into your head, slowly and meticulously, until there is naught else you can think of." 210,"TEXT_FESHLW801_04655_PUMPKIN_000_159","Have I frightened you, child? Forgive me. Such was not my intention..." 211,"TEXT_FESHLW801_04655_PUMPKIN_000_160","（★未使用／削除予定★）"