From cea6a3690b1d298fab2928e5d872f4b4da4c6d1f Mon Sep 17 00:00:00 2001 From: xiashtra <91220277+xiashtra@users.noreply.github.com> Date: Thu, 3 Jul 2025 02:14:18 -0500 Subject: [PATCH] 7.25h3 (#79) --- csv/ContentFinderCondition.csv | 2 +- csv/ContentMemberType.csv | 76 +++++++++++++++++----------------- csv/DescriptionString.csv | 2 +- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/csv/ContentFinderCondition.csv b/csv/ContentFinderCondition.csv index 6e0903c75..0f7acfcde 100644 --- a/csv/ContentFinderCondition.csv +++ b/csv/ContentFinderCondition.csv @@ -1019,7 +1019,7 @@ int32,str,TerritoryType,byte,Row,bit&01,bit&02,byte,uint32,uint32,ClassJobCatego 1015,"z6r1",1248,1,30144,False,False,5,0,0,108,4,0,0,0,0,0,0,100,100,695,0,False,False,False,False,True,False,False,False,False,0,True,True,False,True,0,False,False,True,True,False,False,False,"Jeuno: The First Walk","",5,50,302,3144,158,112585,0,-1,0,True,True,0,False,False,False,False,False,False,False,False,True,False,False,False,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False 1016,"ec064",1246,1,5082,False,False,5,0,0,142,1,0,0,0,0,0,0,100,100,0,730,False,False,False,False,False,True,False,False,False,0,False,False,False,False,0,False,False,False,True,False,False,False,"Bar the Passage","",7,0,0,0,0,0,0,-1,0,True,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False 1017,"x6fc",1243,1,20099,False,False,5,0,0,108,3,0,0,0,0,0,0,100,100,710,0,False,False,False,False,True,True,False,False,False,1,True,True,False,True,0,False,False,False,True,False,False,False,"The Minstrel's Ballad: Sphene's Burden","",4,47,303,2104,242,112588,0,-1,0,True,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False -1018,"o6b1",1252,3,45,False,False,5,0,0,142,12,0,0,1,70847,0,0,100,100,690,700,False,True,False,False,True,False,False,False,False,0,False,False,False,True,0,False,False,False,False,False,False,False,"the Occult Crescent: South Horn","",38,0,304,7011,0,112593,0,-1,0,True,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False +1018,"o6b1",1252,3,45,False,False,5,0,0,142,35,0,0,1,70847,0,0,100,100,690,700,False,True,False,False,True,False,False,False,False,0,False,False,False,True,0,False,False,False,False,False,False,False,"the Occult Crescent: South Horn","",38,0,304,7011,0,112593,0,-1,0,True,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False 1019,"x6r5",1256,1,30145,False,False,5,0,0,108,3,0,0,0,0,0,0,100,100,715,0,False,False,False,False,True,True,False,False,False,1,True,True,False,True,0,False,False,False,True,False,False,False,"AAC Cruiserweight M1","",5,48,302,3145,174,112597,0,0,0,True,True,0,False,False,False,False,False,False,False,False,True,False,False,False,False,False,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False 1020,"x6r5_2",1257,1,30146,False,False,5,0,0,110,3,0,0,0,0,0,0,100,100,730,0,False,False,False,False,False,True,False,False,False,1,True,False,True,True,1,True,False,False,True,False,False,False,"AAC Cruiserweight M1 (Savage)","",5,49,302,3149,194,112598,0,-1,0,True,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False 1021,"x6r6",1258,1,30147,False,False,5,0,0,108,3,0,0,0,0,0,0,100,100,715,0,False,False,False,False,True,True,False,False,False,1,True,True,False,True,0,False,False,False,True,False,False,False,"AAC Cruiserweight M2","",5,48,302,3146,175,112599,0,1,0,True,True,0,False,False,False,False,False,False,False,False,True,False,False,False,False,False,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False diff --git a/csv/ContentMemberType.csv b/csv/ContentMemberType.csv index 8d52108f2..4142f16f2 100644 --- a/csv/ContentMemberType.csv +++ b/csv/ContentMemberType.csv @@ -1,37 +1,39 @@ -key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18 -#,,,,,,,,,,,TanksPerParty,HealersPerParty,MeleesPerParty,RangedPerParty,,,,, -int32,bit&01,byte,bit&02,bit&04,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,bit&08,bit&10,bit&20,bit&40,bit&80 -0,False,0,False,False,0,8,0,4,1,0,0,0,0,0,False,True,False,False,False -1,False,0,False,False,0,8,1,1,1,0,0,0,0,0,False,False,False,False,False -2,False,0,False,False,0,8,4,4,1,0,1,1,1,1,False,True,False,False,True -3,False,0,False,False,0,8,8,8,1,0,2,2,2,2,False,True,False,False,True -4,True,1,True,False,3,24,24,8,3,0,1,2,3,2,False,False,False,False,True -5,True,1,False,False,3,24,24,8,3,0,1,2,3,2,False,False,False,False,True -6,False,0,False,False,0,8,8,4,2,0,1,1,1,1,True,False,False,False,False -7,True,1,False,False,3,24,72,8,9,0,0,0,0,0,False,False,False,False,False -8,False,0,False,False,0,8,72,8,9,1,1,2,3,2,False,True,False,False,False -9,False,0,False,False,0,8,16,8,2,0,2,2,2,2,True,False,False,False,False -10,False,0,False,False,0,8,2,2,1,0,0,0,0,0,False,True,False,False,False -11,False,0,False,False,0,8,4,4,1,0,0,0,0,0,False,True,False,False,False -12,False,0,False,False,0,8,72,8,72,1,0,0,0,0,False,True,True,False,False -13,False,0,False,False,0,8,8,8,1,0,0,0,0,0,False,True,False,False,False -14,False,0,True,True,2,8,8,4,2,0,0,0,0,0,False,True,False,False,False -15,False,0,True,True,2,16,16,8,2,0,0,0,0,0,False,True,False,False,False -16,False,0,False,False,0,8,72,8,9,1,0,0,0,0,False,True,False,False,False -17,False,0,False,False,0,8,16,8,2,0,0,0,0,0,False,False,False,False,False -18,True,2,False,False,0,8,48,4,12,0,0,0,0,0,False,False,False,False,False -19,False,0,False,False,0,8,144,8,144,1,0,0,0,0,False,True,True,False,False -20,False,0,False,False,0,8,2,2,1,0,0,0,0,0,False,True,False,False,False -21,False,0,False,False,0,8,8,4,2,0,1,1,1,1,True,False,False,True,False -22,False,0,True,True,2,8,8,4,2,0,0,0,0,0,False,True,False,True,False -23,False,0,False,False,0,8,8,8,1,0,0,0,0,0,False,True,False,False,False -24,False,0,False,False,0,8,4,4,1,0,0,0,0,0,False,False,False,False,False -25,False,0,False,False,0,8,24,8,3,0,0,0,0,0,False,False,False,False,False -26,True,1,True,False,3,24,24,8,3,0,0,0,0,0,False,False,False,False,False -27,True,3,True,True,6,48,48,8,6,0,0,0,0,0,False,False,False,False,False -28,True,3,True,True,3,24,48,8,6,0,0,0,0,0,False,False,False,False,False -29,False,0,False,False,0,8,10,5,2,0,0,0,0,0,True,False,False,False,False -30,False,0,True,True,2,10,10,5,2,0,0,0,0,0,False,True,False,False,False -31,False,0,False,False,0,8,4,4,1,0,1,1,1,1,True,True,False,False,True -32,True,1,True,False,3,24,24,8,24,1,0,0,0,0,False,True,True,False,False -33,True,1,True,False,3,12,24,8,3,0,2,2,2,2,False,False,False,False,True +key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19 +#,,,,,,,,,,,TanksPerParty,HealersPerParty,MeleesPerParty,RangedPerParty,,,,,, +int32,bit&01,byte,bit&02,bit&04,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,byte,bit&08,bit&10,bit&20,bit&40,bit&80 +0,False,0,False,False,0,8,0,4,1,0,0,0,0,0,0,False,True,False,False,False +1,False,0,False,False,0,8,1,1,1,0,0,0,0,0,0,False,False,False,False,False +2,False,0,False,False,0,8,4,4,1,0,0,1,1,1,1,False,True,False,False,True +3,False,0,False,False,0,8,8,8,1,0,0,2,2,2,2,False,True,False,False,True +4,True,1,True,False,3,24,24,8,3,0,0,1,2,3,2,False,False,False,False,True +5,True,1,False,False,3,24,24,8,3,0,0,1,2,3,2,False,False,False,False,True +6,False,0,False,False,0,8,8,4,2,0,0,1,1,1,1,True,False,False,False,False +7,True,1,False,False,3,24,72,8,9,0,0,0,0,0,0,False,False,False,False,False +8,False,0,False,False,0,8,72,8,9,0,1,1,2,3,2,False,True,False,False,False +9,False,0,False,False,0,8,16,8,2,0,0,2,2,2,2,True,False,False,False,False +10,False,0,False,False,0,8,2,2,1,0,0,0,0,0,0,False,True,False,False,False +11,False,0,False,False,0,8,4,4,1,0,0,0,0,0,0,False,True,False,False,False +12,False,0,False,False,0,8,72,8,72,0,1,0,0,0,0,False,True,True,False,False +13,False,0,False,False,0,8,8,8,1,0,0,0,0,0,0,False,True,False,False,False +14,False,0,True,True,2,8,8,4,2,0,0,0,0,0,0,False,True,False,False,False +15,False,0,True,True,2,16,16,8,2,0,0,0,0,0,0,False,True,False,False,False +16,False,0,False,False,0,8,72,8,9,0,1,0,0,0,0,False,True,False,False,False +17,False,0,False,False,0,8,16,8,2,0,0,0,0,0,0,False,False,False,False,False +18,True,2,False,False,0,8,48,4,12,0,0,0,0,0,0,False,False,False,False,False +19,False,0,False,False,0,8,144,8,144,0,1,0,0,0,0,False,True,True,False,False +20,False,0,False,False,0,8,2,2,1,0,0,0,0,0,0,False,True,False,False,False +21,False,0,False,False,0,8,8,4,2,0,0,1,1,1,1,True,False,False,True,False +22,False,0,True,True,2,8,8,4,2,0,0,0,0,0,0,False,True,False,True,False +23,False,0,False,False,0,8,8,8,1,0,0,0,0,0,0,False,True,False,False,False +24,False,0,False,False,0,8,4,4,1,0,0,0,0,0,0,False,False,False,False,False +25,False,0,False,False,0,8,24,8,3,0,0,0,0,0,0,False,False,False,False,False +26,True,1,True,False,3,24,24,8,3,0,0,0,0,0,0,False,False,False,False,False +27,True,3,True,True,6,48,48,8,6,0,0,0,0,0,0,False,False,False,False,False +28,True,3,True,True,3,24,48,8,6,0,0,0,0,0,0,False,False,False,False,False +29,False,0,False,False,0,8,10,5,2,0,0,0,0,0,0,True,False,False,False,False +30,False,0,True,True,2,10,10,5,2,0,0,0,0,0,0,False,True,False,False,False +31,False,0,False,False,0,8,4,4,1,0,0,1,1,1,1,True,True,False,False,True +32,True,1,True,False,3,24,24,8,24,0,1,0,0,0,0,False,True,True,False,False +33,True,1,True,False,3,12,24,8,3,0,0,2,2,2,2,False,False,False,False,True +34,False,0,False,False,0,8,4,4,1,0,0,1,1,1,1,True,True,False,False,True +35,True,3,True,False,6,9,72,8,72,6,1,0,0,0,0,False,True,True,False,False diff --git a/csv/DescriptionString.csv b/csv/DescriptionString.csv index 57f2038bf..6c5e8a417 100644 --- a/csv/DescriptionString.csv +++ b/csv/DescriptionString.csv @@ -3533,7 +3533,7 @@ Restoring an outfit glamour will return each included item to its original form. 1231,"" 1232,"On the Occult Crescent, players must explore widely and overcome deadly threats, all in aid of unraveling the isle's mysteries." 1233,"■Basic Rules -Players can enter the Occult Crescent solo or in a party. It is possible to form a party even after entering the instance. +Players can enter the Occult Crescent solo, in a party, or in an alliance of between nine and 48 players. It is possible to form a party even after entering the instance. ■Requirements A F201FAF201FBDisciple of War or Magic level 100 or higher0101 is required to enter, and the F201FAF201FBrequired average item level is 6900101.