Skip to content

Commit e4af4d7

Browse files
xiashtraxiashtra
authored
resources: 7.45 (#1021)
1 parent a6e698c commit e4af4d7

7 files changed

Lines changed: 111 additions & 22 deletions

File tree

‎resources/bozja_encounters.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const data: CeInfoType = {
121121
'fr': 'Menace spectrale',
122122
'ja': '怨念の死霊「スパルトイ」',
123123
'ko': '원념의 사령 \'스파르토이\'',
124-
'tc': '怨念死靈——地生人',
124+
'tc': '怨念死靈——地浮靈',
125125
},
126126
},
127127
'TheFiresOfWar': {

‎resources/content_list.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,9 @@ const contentList: (ZoneIdType)[] = [
467467
ZoneId.AloaloIsland,
468468
ZoneId.AnotherAloaloIsland,
469469
ZoneId.AnotherAloaloIslandSavage,
470+
ZoneId.TheMerchantsTale,
471+
ZoneId.TheMerchantsTaleAdvanced,
472+
ZoneId.AnotherMerchantsTale,
470473

471474
// Chaotic Alliance Raids
472475
ZoneId.TheCloudOfDarknessChaotic,

‎resources/effect_id.ts‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,8 @@ const data = {
512512
'BrushWithDeath': '84F',
513513
'BrutalShell_76A': '76A',
514514
'BrutalShell_7CD': '7CD',
515-
'BubbleGaol': 'EA2',
515+
'BubbleGaol_13B7': '13B7',
516+
'BubbleGaol_EA2': 'EA2',
516517
'BubbleNet': 'EA0',
517518
'BubbleWeave': 'E9F',
518519
'BullsEye': 'E9E',
@@ -615,6 +616,8 @@ const data = {
615616
'ChainsOfCondemnation': '11D2',
616617
'ChainsOfEverlastingLight': '103D',
617618
'ChainsOfMemory': '65B',
619+
'ChainsOfPassion_12EC': '12EC',
620+
'ChainsOfPassion_12ED': '12ED',
618621
'ChainsOfResentment': 'CDE',
619622
'ChanceOfBlizzards': 'FAE',
620623
'ChanceOfGaleForceWinds': 'FAD',
@@ -815,8 +818,11 @@ const data = {
815818
'Cube': '42E',
816819
'CureIiiReady': 'C0B',
817820
'Curl': '136',
821+
'CurseOfCompanionship': '1208',
818822
'CurseOfDarkness': '953',
819823
'CurseOfEverlastingLight': '103E',
824+
'CurseOfImmolation': '1209',
825+
'CurseOfSolitude': '1207',
820826
'CurseOfTheMummy': '25A',
821827
'CurseOfTheRonka': '736',
822828
'CursedChange': '10F9',
@@ -1364,6 +1370,7 @@ const data = {
13641370
'Fangbound_AD8': 'AD8',
13651371
'FangedMuse': '1010',
13661372
'FantasticalRegeneration': '1296',
1373+
'FarShoreShackles': '1275',
13671374
'FastDraw': '884',
13681375
'FatalAttraction': 'F50',
13691376
'FateOfTheWurm': '12A4',
@@ -1650,6 +1657,7 @@ const data = {
16501657
'FurtherRuin_4BC': '4BC',
16511658
'FurtherRuin_A8D': 'A8D',
16521659
'Fury_10FD': '10FD',
1660+
'Fury_1213': '1213',
16531661
'Fury_EDD': 'EDD',
16541662
'FurysBolt': '8B7',
16551663
'Fusefield': 'CD9',
@@ -1971,7 +1979,8 @@ const data = {
19711979
'Huton_1F4': '1F4',
19721980
'Huton_C72': 'C72',
19731981
'Huton_E20': 'E20',
1974-
'HydrobulletTarget': 'EA4',
1982+
'HydrobulletTarget_1368': '1368',
1983+
'HydrobulletTarget_EA4': 'EA4',
19751984
'HydrofallTarget': 'EA3',
19761985
'Hypercharge': '2B0',
19771986
'Hypercharged': 'F18',
@@ -2026,6 +2035,7 @@ const data = {
20262035
'ImprovisedFinish': 'A89',
20272036
'InControl': '165',
20282037
'InCostume': '8E4',
2038+
'InEvent_136D': '136D',
20292039
'InEvent_4F4': '4F4',
20302040
'InEvent_791': '791',
20312041
'InEvent_B23': 'B23',
@@ -2034,6 +2044,7 @@ const data = {
20342044
'InTheHeadlights': '242',
20352045
'InTheLineOfFire': '23A',
20362046
'InTheSpotlight': '1177',
2047+
'InTheWeeds': '1214',
20372048
'InTraining': '1057',
20382049
'Incapacitated': 'B08',
20392050
'IncapacitatingSoulSnare': 'DDD',
@@ -2298,7 +2309,8 @@ const data = {
22982309
'LiveWire': '657',
22992310
'LivingDead': '32A',
23002311
'LlymlaensWard': 'E6',
2301-
'LoadBearing': '4C0',
2312+
'LoadBearing_1420': '1420',
2313+
'LoadBearing_4C0': '4C0',
23022314
'LocalCodeSmell_D70': 'D70',
23032315
'LocalCodeSmell_DAF': 'DAF',
23042316
'LocalRegression_688': '688',
@@ -2396,17 +2408,36 @@ const data = {
23962408
'MagitekField_5A4': '5A4',
23972409
'MagitekField_876': '876',
23982410
'MagitekLevitation': '551',
2411+
'MagneticLevitation_12E5': '12E5',
23992412
'MagneticLevitation_414': '414',
24002413
'MagneticLevitation_610': '610',
24012414
'MagneticLysis_60E': '60E',
24022415
'MagneticLysis_60F': '60F',
2416+
'MagneticPull': '12E6',
24032417
'MagossMantle': 'B3D',
24042418
'Maim': '55',
24052419
'MainHullOperational': '469',
24062420
'MainHullReassembly': '466',
24072421
'MakersMark': '36E',
24082422
'MakeshiftBait': 'ADB',
24092423
'Malady': 'BF',
2424+
'MaleficEW': '12A7',
2425+
'MaleficE_12A5': '12A5',
2426+
'MaleficE_1366': '1366',
2427+
'MaleficN': '12AC',
2428+
'MaleficNE': '12AD',
2429+
'MaleficNEW': '12AF',
2430+
'MaleficNS': '12B0',
2431+
'MaleficNSE': '12B1',
2432+
'MaleficNSEW': '12B3',
2433+
'MaleficNSW': '12B2',
2434+
'MaleficNW': '12AE',
2435+
'MaleficS': '12A8',
2436+
'MaleficSE': '12A9',
2437+
'MaleficSEW': '12AB',
2438+
'MaleficSW': '12AA',
2439+
'MaleficW_12A6': '12A6',
2440+
'MaleficW_1367': '1367',
24102441
'Malodorous': '6B3',
24112442
'ManaCapacitor': '2B1',
24122443
'ManaCharge': '5CA',
@@ -2589,13 +2620,16 @@ const data = {
25892620
'NaturesMinne': '4B2',
25902621
'Nausea': '954',
25912622
'NeapTide': 'D01',
2623+
'NearShoreShackles': '1274',
25922624
'Nebula_72A': '72A',
25932625
'Nebula_BEB': 'BEB',
25942626
'Necrosis': 'B95',
25952627
'Nectar': '39F',
25962628
'NeedlePoised': '116B',
25972629
'NeedleVeil': 'EA7',
25982630
'NegativeCharge_11C8': '11C8',
2631+
'NegativeCharge_12D6': '12D6',
2632+
'NegativeCharge_12D8': '12D8',
25992633
'NegativeCharge_2BB': '2BB',
26002634
'NegativeCharge_D59': 'D59',
26012635
'NegativeCharge_D5B': 'D5B',
@@ -2870,6 +2904,8 @@ const data = {
28702904
'PoppetResistance_3D8': '3D8',
28712905
'PoppetVulnerability': '3D0',
28722906
'PositiveCharge_11C7': '11C7',
2907+
'PositiveCharge_12D5': '12D5',
2908+
'PositiveCharge_12D7': '12D7',
28732909
'PositiveCharge_2BA': '2BA',
28742910
'PositiveCharge_D58': 'D58',
28752911
'PositiveCharge_D5A': 'D5A',
@@ -3939,6 +3975,7 @@ const data = {
39393975
'ThunderousMemory': '111E',
39403976
'Thunderstruck_1D2': '1D2',
39413977
'Thunderstruck_B11': 'B11',
3978+
'TidalspoutTarget': '1276',
39423979
'TimeAndTide': 'E9B',
39433980
'TimesFive_ECE': 'ECE',
39443981
'TimesFive_F63': 'F63',

‎resources/hunt.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ const data: HuntMap = {
13271327
'fr': 'Minhocao',
13281328
'ja': 'ミニョーカオン',
13291329
'ko': '미뇨카온',
1330-
'tc': '蚓螈巨蟲',
1330+
'tc': '蚓螈蠕蟲',
13311331
},
13321332
'rank': 'S',
13331333
},
@@ -1734,7 +1734,7 @@ const data: HuntMap = {
17341734
'fr': 'pampa ballerine',
17351735
'ja': 'サボテンダー・バイラリーナ',
17361736
'ko': '사보텐더 무희',
1737-
'tc': '花舞仙人掌',
1737+
'tc': '花舞仙人掌怪',
17381738
},
17391739
'rank': 'A',
17401740
},
@@ -2250,7 +2250,7 @@ const data: HuntMap = {
22502250
'fr': 'Verpuy',
22512251
'ja': 'ウェルウォーム',
22522252
'ko': '우물지렁이',
2253-
'tc': '大井巨蟲',
2253+
'tc': '大井蠕蟲',
22542254
},
22552255
'rank': 'B',
22562256
},
@@ -2582,7 +2582,7 @@ const data: HuntMap = {
25822582
'fr': 'pampa sélénienne reine',
25832583
'ja': 'ルナテンダー・クイーン',
25842584
'ko': '루나텐더 여왕',
2585-
'tc': '月面仙人掌女王',
2585+
'tc': '月面仙人掌怪女王',
25862586
},
25872587
'rank': 'A',
25882588
},

‎resources/pet_names.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,29 +165,29 @@ const data: PetData = {
165165
'솔 바하무트',
166166
],
167167
'tc': [
168-
'卡邦庫爾 綠寶石',
169-
'卡邦庫爾 黃寶石',
168+
'卡邦庫爾-綠寶石',
169+
'卡邦庫爾-黃寶石',
170170
'朝日小仙女',
171171
'夕月小仙女',
172172
'車型浮游砲塔',
173173
'象型浮游砲塔',
174174
'亞靈神巴哈姆特',
175175
'亞靈神鳳凰',
176176
'熾天使',
177-
'卡邦庫爾 月長石',
177+
'卡邦庫爾-月長石',
178178
'英雄的掠影',
179179
'后型自走人偶',
180180
'分身',
181181
'卡邦庫爾',
182-
'卡邦庫爾 紅寶石',
183-
'伊弗利特 艾基',
184-
'泰坦 艾基',
185-
'迦樓羅 艾基',
186-
'伊弗利特 紅寶石',
187-
'泰坦 黃寶石',
188-
'迦樓羅 綠寶石',
189-
'卡邦庫爾 琥珀石',
190-
'卡邦庫爾 黑曜石',
182+
'卡邦庫爾-紅寶石',
183+
'伊弗利特-艾基',
184+
'泰坦-艾基',
185+
'迦樓羅-艾基',
186+
'伊弗利特-紅寶石',
187+
'泰坦-黃寶石',
188+
'迦樓羅-綠寶石',
189+
'卡邦庫爾-琥珀石',
190+
'卡邦庫爾-黑曜石',
191191
'烈日巴哈姆特',
192192
],
193193
};

‎resources/zone_id.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ const data = {
103103
'AnnoyTheVoid': 222,
104104
'AnotherAloaloIsland': 1179,
105105
'AnotherAloaloIslandSavage': 1180,
106+
'AnotherMerchantsTale': 1317,
106107
'AnotherMountRokkon': 1155,
107108
'AnotherMountRokkonSavage': 1156,
108109
'AnotherSildihnSubterrane': 1075,
@@ -540,6 +541,8 @@ const data = {
540541
'TheLostCityOfAmdaporHard': 519,
541542
'TheLunarSubterrane': 1164,
542543
'TheMaskedCarnivale': 796,
544+
'TheMerchantsTale': 1315,
545+
'TheMerchantsTaleAdvanced': 1316,
543546
'TheMesoTerminal': 1292,
544547
'TheMightiestShield': 1217,
545548
'TheMinstrelsBalladEndsingersAria': 998,

‎resources/zone_info.ts‎

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4499,7 +4499,7 @@ const data: ZoneInfoType = {
44994499
'fr': 'La légende de Musosai : l\'assassin de Limsa Lominsa',
45004500
'ja': '海都を震わす人斬りの宴！',
45014501
'ko': '해양도시를 흔드는 살인자의 연회!',
4502-
'tc': '海之都路人身首異',
4502+
'tc': '海都路人身首異',
45034503
},
45044504
'offsetX': 0,
45054505
'offsetY': 0,
@@ -6136,7 +6136,7 @@ const data: ZoneInfoType = {
61366136
'fr': 'Amaurote',
61376137
'ja': '終末幻想 アーモロート',
61386138
'ko': '아모로트',
6139-
'tc': '末日暗影亞馬烏羅提',
6139+
'tc': '終末幻想亞馬烏羅提',
61406140
},
61416141
'offsetX': 0,
61426142
'offsetY': 0,
@@ -10697,6 +10697,7 @@ const data: ZoneInfoType = {
1069710697
'fr': 'Poids mi-lourds CCA - match 1',
1069810698
'ja': '至天の座アルカディア：ライトヘビー級1',
1069910699
'ko': '아르카디아 선수권: 라이트헤비급 1',
10700+
'tc': '阿卡狄亞登天鬥技場 輕量級1',
1070010701
},
1070110702
'offsetX': -100,
1070210703
'offsetY': -100,
@@ -10729,6 +10730,7 @@ const data: ZoneInfoType = {
1072910730
'fr': 'Poids mi-lourds CCA - match 2',
1073010731
'ja': '至天の座アルカディア：ライトヘビー級2',
1073110732
'ko': '아르카디아 선수권: 라이트헤비급 2',
10733+
'tc': '阿卡狄亞登天鬥技場 輕量級2',
1073210734
},
1073310735
'offsetX': -100,
1073410736
'offsetY': -100,
@@ -10761,6 +10763,7 @@ const data: ZoneInfoType = {
1076110763
'fr': 'Poids mi-lourds CCA - match 3',
1076210764
'ja': '至天の座アルカディア：ライトヘビー級3',
1076310765
'ko': '아르카디아 선수권: 라이트헤비급 3',
10766+
'tc': '阿卡狄亞登天鬥技場 輕量級3',
1076410767
},
1076510768
'offsetX': -100,
1076610769
'offsetY': -100,
@@ -10793,6 +10796,7 @@ const data: ZoneInfoType = {
1079310796
'fr': 'Poids mi-lourds CCA - match 4',
1079410797
'ja': '至天の座アルカディア：ライトヘビー級4',
1079510798
'ko': '아르카디아 선수권: 라이트헤비급 4',
10799+
'tc': '阿卡狄亞登天鬥技場 輕量級4',
1079610800
},
1079710801
'offsetX': -100,
1079810802
'offsetY': -100,
@@ -11703,6 +11707,48 @@ const data: ZoneInfoType = {
1170311707
'sizeFactor': 200,
1170411708
'weatherRate': 37,
1170511709
},
11710+
1315: {
11711+
'contentType': 30,
11712+
'exVersion': 5,
11713+
'name': {
11714+
'de': 'Des Händlers Liebesmüh',
11715+
'en': 'The Merchant\'s Tale',
11716+
'fr': 'Contes du Camelot - Donjon à embranchements',
11717+
'ja': 'ヴァリアントダンジョン 商客物語',
11718+
},
11719+
'offsetX': 574,
11720+
'offsetY': -666,
11721+
'sizeFactor': 200,
11722+
'weatherRate': 0,
11723+
},
11724+
1316: {
11725+
'contentType': 30,
11726+
'exVersion': 5,
11727+
'name': {
11728+
'de': 'Des Händlers Liebesmüh (fortgeschritten)',
11729+
'en': 'The Merchant\'s Tale (Advanced)',
11730+
'fr': 'Contes du Camelot - Donjon à embranchements (avancé)',
11731+
'ja': 'アドバンスド・ヴァリアントダンジョン 商客物語',
11732+
},
11733+
'offsetX': 580,
11734+
'offsetY': -750,
11735+
'sizeFactor': 200,
11736+
'weatherRate': 0,
11737+
},
11738+
1317: {
11739+
'contentType': 30,
11740+
'exVersion': 5,
11741+
'name': {
11742+
'de': 'Des Händlers kuriose Liebesmüh',
11743+
'en': 'Another Merchant\'s Tale',
11744+
'fr': 'Contes du Camelot annexes - Donjon alternatif',
11745+
'ja': 'アナザーダンジョン 異聞商客物語',
11746+
},
11747+
'offsetX': -375,
11748+
'offsetY': -562,
11749+
'sizeFactor': 200,
11750+
'weatherRate': 0,
11751+
},
1170611752
1318: {
1170711753
'contentType': 4,
1170811754
'exVersion': 5,

0 commit comments

Comments
 (0)