diff --git a/AssetStorage.txt b/AssetStorage.txt index ad1a6d1b5..047de3bc5 100644 --- a/AssetStorage.txt +++ b/AssetStorage.txt @@ -1,5 +1,5 @@ -~710597770 -@FgoDataVersion0066,20160420_1,20200409_15:56 +~1314263124 +@FgoDataVersion0066,20160420_1,20200415_02:32 1,DATA0,22876707,2069986583,Movie/ops00100.mp4 1,DATA0,36160078,2927839669,Movie/ops00300.mp4 1,DATA0,25638944,1510111328,Movie/ops00100.usm @@ -9,7 +9,7 @@ 1,DATA0,3987592,644228450,Audio/ChrVoice_100300.cpk.bytes 1,DATA0,7549064,953045805,Audio/ChrVoice_100500.cpk.bytes 1,DATA0,3264648,1373541389,Audio/ChrVoice_100800.cpk.bytes -1,DATA0,3379336,2586034308,Audio/ChrVoice_101300.cpk.bytes +1,DATA0,3653768,243456859,Audio/ChrVoice_101300.cpk.bytes 1,DATA0,2246792,2119694966,Audio/ChrVoice_101800.cpk.bytes 1,DATA0,1355912,1533930523,Audio/ChrVoice_102200.cpk.bytes 1,DATA0,1411208,2326710053,Audio/ChrVoice_102600.cpk.bytes @@ -62,7 +62,7 @@ 1,DATA0,3057800,823225770,Audio/ChrVoice_701300.cpk.bytes 1,DATA0,845960,2893843685,Audio/ChrVoice_701500.cpk.bytes 1,DATA0,1898632,1839757004,Audio/ChrVoice_701600.cpk.bytes -1,DATA0,6893704,3738194986,Audio/ChrVoice_800100.cpk.bytes +1,DATA0,7426184,2904687053,Audio/ChrVoice_800100.cpk.bytes 1,DATA0,2920584,1660373858,Audio/ChrVoice_900100.cpk.bytes 1,DATA0,1114248,2130027997,Audio/ChrVoice_900300.cpk.bytes 1,DATA0,1087624,1933333105,Audio/Servants_100100.cpk.bytes @@ -123,7 +123,7 @@ 1,DATA0,1134728,3402862755,Audio/Servants_701300.cpk.bytes 1,DATA0,444552,3100295112,Audio/Servants_701500.cpk.bytes 1,DATA0,839816,1741816213,Audio/Servants_701600.cpk.bytes -1,DATA0,1579144,4072234646,Audio/Servants_800100.cpk.bytes +1,DATA0,1603720,4018633156,Audio/Servants_800100.cpk.bytes 1,DATA0,317576,1278862846,Audio/Servants_900100.cpk.bytes 1,DATA0,415880,1047480504,Audio/Servants_900300.cpk.bytes 1,DATA0,71808,3068799230,Audio/Servants_9932600.cpk.bytes @@ -336,7 +336,7 @@ 1,DATA0,467080,1455898355,Audio/Servants_502500.cpk.bytes 1,DATA0,854152,3301706713,Audio/Servants_701400.cpk.bytes 1,DATA0,325768,3299237492,Audio/Servants_702000.cpk.bytes -1,DATA0,1579144,14141732,Audio/Servants_800101.cpk.bytes +1,DATA0,1603720,2769094462,Audio/Servants_800101.cpk.bytes 1,DATA0,391304,4104666665,Audio/Servants_9934830.cpk.bytes 1,DATA0,514184,673741937,Audio/NoblePhantasm_101900.cpk.bytes 1,DATA0,516232,2192678383,Audio/NoblePhantasm_201000.cpk.bytes @@ -1819,11 +1819,12 @@ 1,DATA0,6410376,2359088189,Audio/Bgm/BGM_EVENT_119.cpk.bytes 1,DATA0,5619848,3296800908,Audio/ChrVoice_104200.cpk.bytes 1,DATA0,11124872,3664981647,Audio/ChrVoice_304100.cpk.bytes +1,DATA0,3309704,839217300,Audio/ChrVoice_304200.cpk.bytes 1,DATA0,585864,1342379615,Audio/NoblePhantasm_104200.cpk.bytes 1,DATA0,596104,3250637748,Audio/NoblePhantasm_304100.cpk.bytes 1,DATA0,747656,601010459,Audio/NoblePhantasm_304200.cpk.bytes 1,DATA0,1302664,2785747772,Audio/Servants_104200.cpk.bytes -1,DATA0,1812616,1706082780,Audio/Servants_304200.cpk.bytes +1,DATA0,1841288,2281408705,Audio/Servants_304200.cpk.bytes 1,DATA0,931976,1695047677,Audio/Servants_9942270.cpk.bytes 1,DATA0,919688,3522211231,Audio/Servants_9942280.cpk.bytes 1,DATA0,1099912,2579497364,Audio/Servants_9942300.cpk.bytes @@ -1850,7 +1851,7 @@ 1,DATA0,6528480,198629943,Movie/talk_mov055.usm 1,DATA0,6486784,560988485,Movie/talk_mov056.usm 1,DATA0,3963360,372957534,Movie/talk_mov057.usm -1,DATA0,5677152,1348247689,Movie/talk_mov058.usm +1,DATA0,5716224,438674259,Movie/talk_mov058.usm 1,DATA0,6075264,3346833990,Movie/talk_mov059.usm 1,DATA0,5166688,3810023691,Movie/talk_mov060.usm 1,DATA0,10323520,94056444,Movie/talk_mov061.usm @@ -2038,9 +2039,9 @@ 1,SYSTEM,130240,2206861594,UISkin/UISkin02CommonBG1Atlas 1,SYSTEM,100544,3230655632,UISkin/UISkin02CommonBG2Atlas 1,SYSTEM,218432,359855834,UISkin/UISkin02TerminalAtlas -1,SYSTEM,4761600,3595547157,FaceBattle/DownloadFaceBattle -1,SYSTEM,16909120,1613560045,Faces/DownloadFace -1,SYSTEM,5766048,3555259094,EquipFaces/DownloadEquipFace +1,SYSTEM,4765856,3365313081,FaceBattle/DownloadFaceBattle +1,SYSTEM,16939136,3666086126,Faces/DownloadFace +1,SYSTEM,5769600,1740574659,EquipFaces/DownloadEquipFace 1,SYSTEM,400160,1006186032,CommandCodes/DownloadCommandCode 1,SYSTEM,2928768,2029437112,Items/DownloadItem 1,SYSTEM,163168,2637122535,ClassIcons/DownloadClassIcons @@ -2048,7 +2049,7 @@ 1,SYSTEM,116704,728779490,BuffIcons/DownloadBuffIcon 1,SYSTEM,18272,3444763878,Marks/DownloadMark 1,SYSTEM,1072128,2614108530,Banner/DownloadBanner -1,SYSTEM,1221216,1104058896,SummonBanners/DownloadSummonBanner +1,SYSTEM,1434400,2241603900,SummonBanners/DownloadSummonBanner 1,SYSTEM,2395456,670667744,ShopBanners/DownloadShopBanner 1,SYSTEM,747104,110407704,Enemys/DownloadEnemy 1,SYSTEM,454784,1969834476,Notification/DownloadNotification @@ -2058,7 +2059,7 @@ 1,SYSTEM,18560,2201709081,CardLevel/DownloadCardLevel 1,SYSTEM,135968,739024729,MyRoomSound/DownloadMyRoomSound 1,SYSTEM,86816,1923401894,ScriptActionEncrypt/Common -1,DATA0,1770336,2541527983,ScriptActionEncrypt/01 +1,DATA0,1770400,983775787,ScriptActionEncrypt/01 1,DATA0,1037184,3335003765,ScriptActionEncrypt/02 1,DATA0,2327808,721556885,ScriptActionEncrypt/03 1,DATA0,1972928,1404102632,ScriptActionEncrypt/91 @@ -7116,7 +7117,7 @@ 1,DATA0,8832,1146779345,Servants/Camera/248 1,DATA0,9664,3699812928,Servants/Camera/249 1,DATA0,8864,1687390750,Servants/Camera/250 -1,DATA0,8256,3041977597,Servants/Camera/725 +1,DATA0,8352,558207864,Servants/Camera/725 1,DATA0,9376,3229572011,Servants/Camera/727 1,DATA0,9056,503362432,Servants/Camera/195 1,DATA0,259296,1841411214,Effect/weapon/217 @@ -8158,7 +8159,7 @@ 1,DATA0,18272,1732823482,Servants/Motion/267 1,DATA0,17664,2363380781,Servants/Motion/268 1,DATA0,14304,1576585595,Servants/Motion/732 -1,DATA0,14944,638239354,Servants/Motion/733 +1,DATA0,15168,113460751,Servants/Motion/733 1,DATA0,14272,3214459346,Servants/Motion/734 1,DATA0,151456,2990397048,Effect/weapon/263 1,DATA0,340672,3841292703,Effect/weapon/264 @@ -9030,7 +9031,7 @@ 1,DATA0,3837920,896056677,Servants/503500 1,DATA0,1858528,3157292706,Servants/503600 1,DATA0,3922944,2796604925,Servants/703000 -1,DATA0,2020672,659993745,Servants/800140 +1,DATA0,2022208,349247605,Servants/800140 1,DATA0,1882912,1494044070,Servants/1100600 1,DATA0,1698304,3916602504,Servants/1100610 1,DATA0,1404704,962937025,Servants/9941060 @@ -9045,7 +9046,7 @@ 1,DATA0,24096,1482930711,Servants/Motion/284 1,DATA0,20832,3651217357,Servants/Motion/285 1,DATA0,17312,4200804438,Servants/Motion/286 -1,DATA0,20064,3951615884,Servants/Motion/287 +1,DATA0,20160,131839534,Servants/Motion/287 1,DATA0,20608,2865620512,Servants/Motion/288 1,DATA0,23040,2380276612,Servants/Motion/289 1,DATA0,16032,682453325,Servants/Motion/758 @@ -13926,7 +13927,7 @@ 1,DATA0,4787232,1475819629,Servants/304110 1,DATA0,4380192,1530231971,Servants/304120 1,DATA0,2686304,2159243436,Servants/304220 -1,DATA0,2146304,4098912976,Servants/800150 +1,DATA0,2147840,2417841457,Servants/800150 1,DATA0,1133728,3104027228,Servants/9942240 1,DATA0,971808,4070766438,Servants/9942270 1,DATA0,1172768,2809054045,Servants/9942280 @@ -13990,11 +13991,11 @@ 1,DATA0,43424,3752554527,NoblePhantasm/Sequence/9942520 1,DATA0,44832,723651695,Servants/Commands/104200 1,DATA0,65728,2339397019,Servants/Commands/304100 -1,DATA0,30976,1976442730,Servants/Commands/304200 +1,DATA0,54112,3478409451,Servants/Commands/304200 1,DATA0,41056,785067325,Servants/Commands/9942510 1,DATA0,46496,1075497191,Servants/Status/104200 1,DATA0,72832,2969400147,Servants/Status/304100 -1,DATA0,29824,1196245559,Servants/Status/304200 +1,DATA0,56288,4110609567,Servants/Status/304200 1,DATA0,42688,2962240801,Servants/Status/9942510 1,DATA0,80480,2352679221,Back/back86301 1,DATA0,169152,2766907102,Back/back91400 @@ -14289,7 +14290,7 @@ 1,DATA0,103264,2215094948,CharaGraph/800150 1,DATA0,78848,2293608895,NarrowFigure/104200 1,DATA0,90912,3434048657,NarrowFigure/304100 -1,DATA0,24864,1929842958,NarrowFigure/304200 +1,DATA0,91520,1434106343,NarrowFigure/304200 1,DATA0,20352,28208906,NarrowFigure/800150 1,DATA0,130976,3934755589,CharaGraph/9304570 1,DATA0,204544,3421699763,CharaGraph/9304580 @@ -14308,3 +14309,16 @@ 1,DATA0,62688,2397970199,Image/cut193_org08 1,DATA0,1079936,2478195539,Image/cut194_rrsq 1,DATA0,22304,3875674303,NarrowFigure/9942510 +1,DATA0,508032,4225431464,CharaGraph/304200 +1,DATA0,141152,1880436105,CharaGraph/9304590 +1,DATA0,128736,4236403947,CharaFigure/3042000 +1,DATA0,122496,1395816659,CharaFigure/3042001 +1,DATA0,216832,1411358671,CharaFigure/3042002 +1,DATA0,3273024,245242334,Servants/304200 +1,DATA0,3998560,2083896648,Servants/304210 +1,DATA0,24448,3602557067,Servants/Motion/388 +1,DATA0,923712,147335769,Effect/weapon/388 +1,DATA0,1620000,1976501914,NoblePhantasm/304200 +1,DATA0,1553056,1304377300,NoblePhantasm/304201 +1,DATA0,35072,930173741,NoblePhantasm/Sequence/304200 +1,DATA0,35264,1050138919,NoblePhantasm/Sequence/304201 diff --git a/master/mstBuff.json b/master/mstBuff.json index 25068100c..fed119925 100644 --- a/master/mstBuff.json +++ b/master/mstBuff.json @@ -26512,7 +26512,7 @@ "buffGroup": 0, "type": 144, "name": "アトラスの契約", - "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性付与を付与されなくなる", + "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性を付与されなくなる", "iconId": 520, "maxRate": 0, "effectId": 0 @@ -26526,7 +26526,7 @@ "buffGroup": 0, "type": 91, "name": "アトラスの契約", - "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性付与を付与されなくなる", + "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性を付与されなくなる", "iconId": 520, "maxRate": 5000, "effectId": 0 @@ -26540,7 +26540,7 @@ "buffGroup": 0, "type": 31, "name": "アトラスの契約", - "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性付与を付与されなくなる", + "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性を付与されなくなる", "iconId": 520, "maxRate": 0, "effectId": 0 @@ -27390,7 +27390,7 @@ "buffGroup": 0, "type": 91, "name": "アトラスの契約", - "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性付与を付与されなくなる", + "detail": "クラス相性の防御不利を打ち消す&クリティカル攻撃への耐性を得る&〔神性〕特性を付与されなくなる", "iconId": 520, "maxRate": 5000, "effectId": 0 diff --git a/master/mstCombineLimit.json b/master/mstCombineLimit.json index 25b725230..f9a3305de 100644 --- a/master/mstCombineLimit.json +++ b/master/mstCombineLimit.json @@ -3178,6 +3178,36 @@ "id": 304100, "svtLimit": 4, "qp": 50000000 +}, { + "itemIds": [7003], + "itemNums": [5], + "id": 304200, + "svtLimit": 0, + "qp": 100000 +}, { + "itemIds": [7003, 6502], + "itemNums": [12, 9], + "id": 304200, + "svtLimit": 1, + "qp": 300000 +}, { + "itemIds": [7103, 6537, 6518], + "itemNums": [5, 10, 2], + "id": 304200, + "svtLimit": 2, + "qp": 1000000 +}, { + "itemIds": [7103, 6518, 6542], + "itemNums": [12, 4, 5], + "id": 304200, + "svtLimit": 3, + "qp": 3000000 +}, { + "itemIds": [7999], + "itemNums": [1], + "id": 304200, + "svtLimit": 4, + "qp": 10000000 }, { "itemIds": [7004], "itemNums": [4], diff --git a/master/mstCombineSkill.json b/master/mstCombineSkill.json index 9ae44370e..140c654e5 100644 --- a/master/mstCombineSkill.json +++ b/master/mstCombineSkill.json @@ -5722,6 +5722,60 @@ "id": 304100, "skillLv": 9, "qp": 10000000 +}, { + "itemIds": [6003], + "itemNums": [5], + "id": 304200, + "skillLv": 1, + "qp": 200000 +}, { + "itemIds": [6003], + "itemNums": [12], + "id": 304200, + "skillLv": 2, + "qp": 400000 +}, { + "itemIds": [6103], + "itemNums": [5], + "id": 304200, + "skillLv": 3, + "qp": 1200000 +}, { + "itemIds": [6103, 6537], + "itemNums": [12, 5], + "id": 304200, + "skillLv": 4, + "qp": 1600000 +}, { + "itemIds": [6203, 6537], + "itemNums": [5, 10], + "id": 304200, + "skillLv": 5, + "qp": 4000000 +}, { + "itemIds": [6203, 6502], + "itemNums": [12, 6], + "id": 304200, + "skillLv": 6, + "qp": 5000000 +}, { + "itemIds": [6502, 6545], + "itemNums": [12, 6], + "id": 304200, + "skillLv": 7, + "qp": 10000000 +}, { + "itemIds": [6545, 6546], + "itemNums": [18, 15], + "id": 304200, + "skillLv": 8, + "qp": 12000000 +}, { + "itemIds": [6999], + "itemNums": [1], + "id": 304200, + "skillLv": 9, + "qp": 20000000 }, { "itemIds": [6004], "itemNums": [4], diff --git a/master/mstEffect.json b/master/mstEffect.json index 8b5bb0f64..e71cc683e 100644 --- a/master/mstEffect.json +++ b/master/mstEffect.json @@ -153894,6 +153894,646 @@ "folderType": 3, "num": 0, "nodeName": "" +}, { + "id": 103880001, + "name": "ef_slash_388_a01", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880002, + "name": "ef_slash_388_a02", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880003, + "name": "ef_slash_388_a03", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880004, + "name": "ef_slash_388_a04", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880005, + "name": "ef_slash_388_a05", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880006, + "name": "ef_slash_388_a06", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880007, + "name": "ef_slash_388_a07", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880008, + "name": "ef_slash_388_a08", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880009, + "name": "ef_slash_388_a09", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880010, + "name": "ef_slash_388_a10", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880011, + "name": "ef_slash_388_a11", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880012, + "name": "ef_slash_388_a12", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880013, + "name": "ef_slash_388_b01", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880014, + "name": "ef_slash_388_b02", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880015, + "name": "ef_slash_388_b03", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880016, + "name": "ef_slash_388_b04", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880017, + "name": "ef_slash_388_b05", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880018, + "name": "ef_slash_388_b06", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880019, + "name": "ef_slash_388_b07", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880020, + "name": "ef_slash_388_b08", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880021, + "name": "ef_slash_388_b09", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880022, + "name": "ef_slash_388_b10", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880023, + "name": "ef_slash_388_b11", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880024, + "name": "ef_slash_388_b12", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880025, + "name": "ef_slash_388_b13", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880026, + "name": "ef_slash_388_b14", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880027, + "name": "ef_slash_388_b15", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880028, + "name": "ef_slash_388_b16", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880029, + "name": "ef_slash_388_b17", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880030, + "name": "ef_slash_388_b18", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880031, + "name": "ef_slash_388_b19", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880032, + "name": "ef_slash_388_b20", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880033, + "name": "ef_slash_388_b21", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880034, + "name": "ef_slash_388_q01", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880035, + "name": "ef_slash_388_q02", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880036, + "name": "ef_slash_388_q03", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880037, + "name": "ef_slash_388_q04", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880038, + "name": "ef_slash_388_q05", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880039, + "name": "ef_slash_388_q06", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880040, + "name": "ef_slash_388_q07", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880041, + "name": "ef_slash_388_q08", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880042, + "name": "ef_slash_388_q09", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880043, + "name": "ef_slash_388_q10", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880044, + "name": "ef_slash_388_q11", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880045, + "name": "ef_slash_388_q12", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880046, + "name": "ef_slash_388_ex01", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880047, + "name": "ef_slash_388_ex02", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880048, + "name": "ef_slash_388_ex03", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880049, + "name": "ef_slash_388_ex04", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880050, + "name": "ef_slash_388_ex05", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880051, + "name": "ef_slash_388_ex06", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880052, + "name": "ef_slash_388_ex07", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880053, + "name": "ef_slash_388_ex08", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880054, + "name": "ef_slash_388_ex09", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880055, + "name": "ef_slash_388_s01", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880056, + "name": "ef_slash_388_s02", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880057, + "name": "ef_slash_388_s03", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880058, + "name": "ef_slash_388_s04", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880059, + "name": "ef_slash_388_s05", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880060, + "name": "ef_slash_388_s06", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880061, + "name": "ef_slash_388_r01", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880062, + "name": "ef_slash_388_r02", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880063, + "name": "ef_slash_388_r03", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880064, + "name": "ef_slash_388_r04", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880065, + "name": "ef_slash_388_r05", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880066, + "name": "ef_slash_388_r06", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880067, + "name": "ef_slash_388_r07", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880068, + "name": "ef_slash_388_r08", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880069, + "name": "ef_slash_388_r09", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880070, + "name": "ef_slash_388_r10", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880071, + "name": "ef_slash_388_r11", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880072, + "name": "ef_slash_388_r12", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880073, + "name": "ef_slash_388_r13", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880074, + "name": "ef_slash_388_r14", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880075, + "name": "ef_slash_388_r15", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880076, + "name": "ef_slash_388_r16", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880077, + "name": "ef_slash_388_r17", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880078, + "name": "ef_slash_388_r18", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880079, + "name": "ef_slash_388_r19", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" +}, { + "id": 103880080, + "name": "ef_slash_388_r20", + "se": "", + "delayTime": 0, + "folderType": 3, + "num": 0, + "nodeName": "" }, { "id": 103890001, "name": "ef_slash_389_a01", diff --git a/master/mstGacha.json b/master/mstGacha.json index 464d6949d..c4c4955c7 100644 --- a/master/mstGacha.json +++ b/master/mstGacha.json @@ -35473,4 +35473,37 @@ "detailUrl": "/jdeal_olympus", "bannerQuestId": 1000002, "bannerQuestPhase": 1 +}, { + "id": 50011551, + "name": "オリュンポスピックアップ2召喚", + "imageId": 81260, + "priority": 21159, + "warId": 100, + "gachaSlot": 4, + "type": 1, + "shopId1": 4, + "shopId2": 5, + "rarityId": 3, + "baseId": 20045, + "adjustId": 50005331, + "pickupId": 50006762, + "ticketItemId": 4001, + "gachaGroupId": 0, + "drawNum1": 1, + "drawNum2": 11, + "extraGroupId1": 47, + "extraGroupId2": 0, + "extraAddCount1": 1, + "extraAddCount2": 0, + "freeDrawFlag": 0, + "maxDrawNum": 0, + "beforeGachaId": 101, + "beforeDrawNum": 1, + "openedAt": 1587027600, + "closedAt": 1588219199, + "condQuestId": 1000002, + "condQuestPhase": 1, + "detailUrl": "/ursoa_olympus_2", + "bannerQuestId": 1000002, + "bannerQuestPhase": 1 }] \ No newline at end of file diff --git a/master/mstGift.json b/master/mstGift.json index b92df4132..5d8d7caef 100644 --- a/master/mstGift.json +++ b/master/mstGift.json @@ -20824,6 +20824,12 @@ "objectId": 9304580, "priority": 0, "num": 1 +}, { + "id": 41275, + "type": 1, + "objectId": 9304590, + "priority": 0, + "num": 1 }, { "id": 50000, "type": 1, diff --git a/master/mstShop.json b/master/mstShop.json index 7e8c930e1..3bf491148 100644 --- a/master/mstShop.json +++ b/master/mstShop.json @@ -21174,6 +21174,32 @@ "bgImageId": 0, "openedAt": 1586347200, "closedAt": 1893423600 +}, { + "itemIds": [17], + "prices": [10], + "targetIds": [304200], + "script": {}, + "id": 4000451, + "baseShopId": 4000451, + "eventId": 0, + "slot": 0, + "flag": 0, + "priority": 853, + "purchaseType": 4, + "setNum": 1, + "payType": 9, + "shopType": 7, + "limitNum": 1, + "defaultLv": 1, + "defaultLimitCount": 0, + "name": "ロムルス=クィリヌス", + "detail": "期間限定★5サーヴァントへ交換", + "infoMessage": "", + "warningMessage": "", + "imageId": 0, + "bgImageId": 0, + "openedAt": 1587027600, + "closedAt": 1588219199 }, { "itemIds": [16], "prices": [7], diff --git a/master/mstSkill.json b/master/mstSkill.json index f79906267..4bb94117a 100644 --- a/master/mstSkill.json +++ b/master/mstSkill.json @@ -10657,7 +10657,7 @@ "ruby": "ぶらっくばれる", "maxLv": 10, "iconId": 306, - "motion": 1101 + "motion": 1102 }, { "effectList": [], "actIndividuality": [], @@ -75923,6 +75923,17 @@ "maxLv": 1, "iconId": 306, "motion": 102 +}, { + "effectList": [], + "actIndividuality": [304200], + "script": {}, + "id": 992175, + "type": 2, + "name": "ソラへ", + "ruby": "", + "maxLv": 1, + "iconId": 300, + "motion": 102 }, { "effectList": [], "actIndividuality": [], diff --git a/master/mstSkillDetail.json b/master/mstSkillDetail.json index 3f413629f..ce2b61fa4 100644 --- a/master/mstSkillDetail.json +++ b/master/mstSkillDetail.json @@ -13138,4 +13138,8 @@ "id": 992174, "detail": "[servantName 304100](ランサー)装備時のみ、自身がフィールドにいる間、味方全体のBusterカード性能を15%アップ&クリティカル威力を15%アップ&防御力を10%ダウン【デメリット】", "detailShort": "[servantName 304100](ランサー)装備時のみ、自身がフィールドにいる間、味方全体のBusterカード性能を15%アップ&クリティカル威力を15%アップ&防御力を10%ダウン【デメリット】" +}, { + "id": 992175, + "detail": "[servantName 304200](ランサー)装備時のみ、自身がフィールドにいる間、〔ローマ〕特性の味方全体の攻撃力を20%アップ", + "detailShort": "[servantName 304200](ランサー)装備時のみ、自身がフィールドにいる間、〔ローマ〕特性の味方全体の攻撃力を20%アップ" }] \ No newline at end of file diff --git a/master/mstSkillLv.json b/master/mstSkillLv.json index 4a57f55f2..9c9399b04 100644 --- a/master/mstSkillLv.json +++ b/master/mstSkillLv.json @@ -148627,6 +148627,15 @@ "chargeTurn": 0, "skillDetailId": 992174, "priority": 0 +}, { + "funcId": [5395], + "svals": ["[1000,-1,-1,200,OnField:1]"], + "script": {}, + "skillId": 992175, + "lv": 1, + "chargeTurn": 0, + "skillDetailId": 992175, + "priority": 0 }, { "funcId": [2926, 316], "svals": ["[1000,300,ForceDisplayPreDamageEffect:1]", "[1000,3,-1,1000,HideNoEffect:1]"], diff --git a/master/mstSvt.json b/master/mstSvt.json index abceb71f5..9a1928d86 100644 --- a/master/mstSvt.json +++ b/master/mstSvt.json @@ -4060,10 +4060,10 @@ "starRate": 122, "deathRate": 260, "attackAttri": 1, - "illustratorId": -1, - "cvId": -1, - "collectionNo": 0, - "materialStoryPriority": 0, + "illustratorId": 14, + "cvId": 22, + "collectionNo": 280, + "materialStoryPriority": 1000, "flag": 0 }, { "relateQuestIds": [91400101, 94003405, 94026508], @@ -32236,6 +32236,43 @@ "collectionNo": 1212, "materialStoryPriority": 1000, "flag": 4 +}, { + "relateQuestIds": [], + "individuality": [], + "classPassive": [], + "cardIds": [3, 3, 3, 3, 3], + "script": {}, + "id": 9304590, + "baseSvtId": 9304590, + "name": "ソラへ", + "ruby": "ソラヘ", + "battleName": "-", + "classId": 1001, + "type": 6, + "limitMax": 4, + "rewardLv": 0, + "friendshipId": 1000, + "maxFriendshipRank": 0, + "genderType": 3, + "attri": 2, + "combineSkillId": 0, + "combineLimitId": 0, + "sellQp": 1000, + "sellMana": 3, + "sellRarePri": 0, + "expType": 19, + "combineMaterialId": 39, + "cost": 9, + "battleSize": 2, + "hpGaugeY": 0, + "starRate": 0, + "deathRate": 0, + "attackAttri": 1, + "illustratorId": 260, + "cvId": 0, + "collectionNo": 1213, + "materialStoryPriority": 1000, + "flag": 4 }, { "relateQuestIds": [], "individuality": [], diff --git a/master/mstSvtCommandCodeUnlock.json b/master/mstSvtCommandCodeUnlock.json index 7aa3edcf9..0156ae040 100644 --- a/master/mstSvtCommandCodeUnlock.json +++ b/master/mstSvtCommandCodeUnlock.json @@ -3148,6 +3148,36 @@ "svtId": 304100, "cardIdx": 4, "qp": 500000 +}, { + "itemIds": [5000], + "itemNums": [1], + "svtId": 304200, + "cardIdx": 0, + "qp": 1000000 +}, { + "itemIds": [5001], + "itemNums": [1], + "svtId": 304200, + "cardIdx": 1, + "qp": 1000000 +}, { + "itemIds": [5001], + "itemNums": [1], + "svtId": 304200, + "cardIdx": 2, + "qp": 1000000 +}, { + "itemIds": [5002], + "itemNums": [1], + "svtId": 304200, + "cardIdx": 3, + "qp": 1000000 +}, { + "itemIds": [5002], + "itemNums": [1], + "svtId": 304200, + "cardIdx": 4, + "qp": 1000000 }, { "itemIds": [5000], "itemNums": [1], diff --git a/master/mstSvtComment.json b/master/mstSvtComment.json index 45c2e65fd..915cc56f9 100644 --- a/master/mstSvtComment.json +++ b/master/mstSvtComment.json @@ -6631,6 +6631,69 @@ "comment": "第二部に於いては、キリシュタリア・ヴォーダイムのサーヴァントとして登場。\nあらゆる神性を嫌い、憎み、厭うカイニスが従順なまでに仕えてみせた理由は、ヴォーダイムの類い希なカリスマだけが理由ではない。\nヴォーダイムは、自らの思惑である「神代の再編」の真相をつまびらかにカイニスへと伝えていたのである。\n\n人間をすべて神へと変えて神代を再編させる―――\nつまるところ、旧い時代の神々はみなその在り方を失う。無論ギリシャの古き神々も、カイニスが怒りの対象とする海神ポセイドンも!\n\n「いいじゃねえか、最高の後始末だ!」\n\nカイニスは大いにヴォーダイムへ賛同した。\nならばこの身に宝具として具わった海神の加護と祝福、存分に揮ってみせようとも!", "condType": 1, "condValue2": 0 +}, { + "condValues": [0], + "svtId": 304200, + "id": 1, + "priority": 0, + "condMessage": "", + "comment": "ローマとは浪漫であり―――\n神代より卒業し、人として人を愛す心を得た、\n人間的なるもの。\nその全ての象徴である。\n\n軍神マルスと美姫シルウィアの間に生まれ、\n獣を友として育ち、やがて大ローマの礎を作り上げる\n事になる建国王ロムルスの若き日の姿にして、\n天へと至ってローマ最高神三柱の一柱クィリヌスとして\n祀られた概念が形をとった姿。\n\n神として祀られる存在であり、\n現界にあたっては特に「文明の発展と拡大」という\n人類史に於ける古代ローマ文明の荒々しき事象を\n象徴するに至った。\n治世と繁栄を示す同名の英霊と同じく、\n神代を脱してゆく人間の可能性を示す存在である。", + "condType": 0, + "condValue2": 0 +}, { + "condValues": [1], + "svtId": 304200, + "id": 2, + "priority": 0, + "condMessage": "", + "comment": "身長/体重:185cm・73kg\n出典:ローマ神話\n地域:欧州\n属性:混沌・中庸  性別:―\n最高存在として概念化したロムルスは、最早生物としての特徴や地上の役職などには当てはまらない。", + "condType": 9, + "condValue2": 0 +}, { + "condValues": [2], + "svtId": 304200, + "id": 3, + "priority": 0, + "condMessage": "", + "comment": "時に世界を裂き、時に文明を拓き、\n人として人を愛するもの。\nその浪漫なる両腕を“槍”に喩えるならば、あまりに大きく、あまりに鋭い。\n通常の霊基では到底足りず、\n冠位の霊基を以てこそ真に迎えられよう。\nすなわち―――\nグランドランサー、である。\n\nカルデア式召喚での現界にあたっては通常のランサーとなっているが、それでも、破格の存在である事は間違いがない。", + "condType": 9, + "condValue2": 0 +}, { + "condValues": [3], + "svtId": 304200, + "id": 4, + "priority": 0, + "condMessage": "", + "comment": "○主神の神核:B+\n軍神マルスの子であり、死後にローマ神話大系の最高神クィリヌスとなったロムルスは、この霊基に於いては例外的に神核を有している。\n本来はランク規格外だが、カルデアでの召喚ではB+ランクまでに留まる。\n\n○単独行動:B+\n本来、主神にして最高神を縛り得る者は地上に存在しない……のだが、ロムルス=クィリヌスは敢えて自分でランクを下げている。\n\n○クィリヌスの玉座:EX\n神話大系の最高神として、\n地中海世界を統べる神としての在り方。\n皇帝特権が転成したスキルであり、本来であれば複数の権能を示すはずだが、本作では基本的に権能としては使用されない。\n\n○神格転成:B\n天性の肉体スキルが霊基と共に変質したもの。\nロムルスは、人として生まれ落ちながら神へと至る。", + "condType": 9, + "condValue2": 0 +}, { + "condValues": [4], + "svtId": 304200, + "id": 5, + "priority": 0, + "condMessage": "", + "comment": "『射殺す百頭・羅馬式』\nランク:A 種別:絶技宝具\nレンジ:― 最大捕捉:自身\n\nナインライブズ・ローマ。\nギリシャ神話の大英雄ヘラクレスが編み出した戦闘方法。彼の壮絶な戦いのすべてを見守っていた軍神マルス(アレス)によって伝えられ戦闘情報―――或いは、「ヘラクレスを父とする」というロムルスにまつわる伝承が、新たな現界にあたり昇華されたもの。\n流派ヘラクレス・ローマ分派。\n光の槍にも似た拳閃の乱打は命なき怪物であろうと鏖殺し、星空に煌めきを迸らせる。\n\n常時発動型の宝具。\n本作ではスキルとして表現されている。\n真名解放時には烈光の乱打を繰り出すが、本作では基本的に使用されない。", + "condType": 9, + "condValue2": 0 +}, { + "condValues": [5], + "svtId": 304200, + "id": 6, + "priority": 0, + "condMessage": "", + "comment": "『我らの腕はすべてを拓き、宙へ』\nランク:EX 種別:対星宝具\nレンジ:1~90 最大捕捉:800人\n\nペル・アスペラ・アド・アストラ。\n同名の英霊が有する宝具『すべては我が槍に通ずる』と本質を同じくする大宝具。\n「文明の発展と拡大」という概念が\n宝具へと昇華されたモノ。\n\n世界を裂き、文明を拓き、\nいつか星々の宙(ソラ)へまで届かんとする\n浪漫なる両の腕は、まるで光の槍が如し―――\nそれは森羅万象を制する人々の傲慢の顕れであると同時に、まだ見ぬ明日を夢見て進歩を続けんとする人々の煌めきの顕れでもある。\n攻撃へと用いれば苛烈な破壊をもたらす。\n守り、生み出すために用いれば、更なる輝きを見る事になるだろうが―――本作では基本的に使用されない。\n\nダウンサイジングされてはいるが国造りの権能の一側面、或いは応用、という可能性がある、とホームズおよびダ・ヴィンチは予想を口にしている。", + "condType": 9, + "condValue2": 0 +}, { + "condValues": [3000628], + "svtId": 304200, + "id": 7, + "priority": 0, + "condMessage": "Lostbelt No.5 オリュンポスクリアおよび絆Lv.5で開放", + "comment": "あくまで人の枠に収まっていた\nローマ建国の英雄ロムルスが、\n遂に神としての側面を明らかにした姿。\n通常、神霊がグランドクラスの霊基で召喚される事はあり得ないが、深く人類史に関わり、人間でありながら最高神となった超例外の存在である彼は、幾つもの奇跡の果てにグランドランサーとして第五の異聞帯にて召喚された。\n\n第五の異聞帯では、数多くの人理の英霊たちが異聞帯の王ゼウスに立ち向かったが、悉く敗北。\nいずれ来たるであろうカルデアへ希望を託すため、英霊たちは最後の力を振り絞って一大計画を遺した。\nそれこそが「破神作戦」。\n一神話大系の最高神でありながら人間としての側面を有し、人理の側に立ち、全知全能と時に称されるギリシャの主神ゼウスの振るう雷霆と同質の力を秘めた英霊/神霊ロムルス=クィリヌスの召喚である。\n\nそしてカルデア一行は来訪し、「破神作戦」は成った。\nロムルス=クィリヌスは異聞帯に現界し、\nカルデアと共に戦い、\nオリュンポスの機神群を打ち倒すに至ったのである。\n\n破神と共に彼は消えた。\n二度と現界を果たす事はないかに思えたが……\nしかし、マスターとの縁を交わし、ひとたびノウム・カルデアのトリスメギストスに記録されたその霊基は、冠位霊基ではない状態での召喚が可能となった。\n召喚された彼は、再び、\nその光の槍が如き腕を人理のために振るう。", + "condType": 1, + "condValue2": 0 }, { "condValues": [0], "svtId": 400100, @@ -21391,6 +21454,15 @@ "comment": "\nオレの刃は神の刃だ。\nすなわちは神の武具、海神の三叉矛!\n\nコイツも一種の宝具って奴だな。\nオレの宝具『海神の偏愛(ポセイドン・ブレッシング)』の本質は防御に類する加護と祝福だが、攻撃についての加護と祝福を別個に具象化したのが、この槍だ。\n本来は、海の権能すべてを操ることだってできる、スゲー神造兵装って話だが……まあ、あんまり期待すんな。オレの装備として存在している以上、権能の使用にゃ制限が掛かる。使いすぎると、つーかまともに権能なんざ使えるか! 神核が砕けて死ぬだろうが!\n契約してるテメェだってタダじゃすまねえ。\n\nあん?\n心配してくれるのか、だぁ?\n何がどうしてそういう話になンだよ!\n殺すぞテメェ!\nいや。殺す。", "condType": 0, "condValue2": 0 +}, { + "condValues": [0], + "svtId": 9304590, + "id": 1, + "priority": 0, + "condMessage": "", + "comment": "\n満天の星―――\n夜空に浮かぶ数多の、無数の輝きたち。\nそして、輝きのすべてを受け止めるかのように伸ばされた、誰かの両腕。\n\n君は思う。\nこの腕は、かの最高神の腕に違いないと。\n\n君は見る。\nこの腕は、かの最高神の腕であり……\n\n君は知る。\nこの腕は、いずれソラへと届く、君と契約を交わした最高神の腕であり、君自身の腕であり、君の後に続く誰かの腕であり、明日であり、未来であり……\n\n愛であり、\n浪漫であり、\nヒトの夢のカタチであるのだと。\n\n", + "condType": 0, + "condValue2": 0 }, { "condValues": [0], "svtId": 9400010, diff --git a/master/mstSvtCommentAdd.json b/master/mstSvtCommentAdd.json index 892115d80..4da87eaee 100644 --- a/master/mstSvtCommentAdd.json +++ b/master/mstSvtCommentAdd.json @@ -270,6 +270,14 @@ "idx": 0, "condType": 9, "condValue2": 0 +}, { + "condValues": [5], + "svtId": 304200, + "id": 7, + "priority": 0, + "idx": 0, + "condType": 9, + "condValue2": 0 }, { "condValues": [1], "svtId": 402500, diff --git a/master/mstSvtGroup.json b/master/mstSvtGroup.json index 7e7953313..a5946c600 100644 --- a/master/mstSvtGroup.json +++ b/master/mstSvtGroup.json @@ -133,6 +133,9 @@ }, { "id": 1007, "svtId": 301000 +}, { + "id": 1007, + "svtId": 304200 }, { "id": 1007, "svtId": 400200 @@ -697,6 +700,9 @@ }, { "id": 1039, "svtId": 303000 +}, { + "id": 1039, + "svtId": 304200 }, { "id": 1039, "svtId": 400100 @@ -1282,6 +1288,9 @@ }, { "id": 1065, "svtId": 304100 +}, { + "id": 1065, + "svtId": 304200 }, { "id": 1065, "svtId": 401400 @@ -1708,6 +1717,9 @@ }, { "id": 1080, "svtId": 304100 +}, { + "id": 1080, + "svtId": 304200 }, { "id": 1080, "svtId": 402900 @@ -4219,6 +4231,9 @@ }, { "id": 1193, "svtId": 301000 +}, { + "id": 1193, + "svtId": 304200 }, { "id": 1194, "svtId": 104200 @@ -4243,6 +4258,9 @@ }, { "id": 1194, "svtId": 303000 +}, { + "id": 1194, + "svtId": 304200 }, { "id": 1194, "svtId": 400100 @@ -4288,6 +4306,9 @@ }, { "id": 1195, "svtId": 301000 +}, { + "id": 1195, + "svtId": 304200 }, { "id": 1195, "svtId": 503200 diff --git a/master/mstSvtLimit.json b/master/mstSvtLimit.json index e0f870de8..3b3c7522d 100644 --- a/master/mstSvtLimit.json +++ b/master/mstSvtLimit.json @@ -97323,6 +97323,131 @@ "deity": 99, "stepProbability": 1000, "strParam": "{}" +}, { + "weaponColor": 16777215, + "svtId": 9304590, + "limitCount": 0, + "rarity": 4, + "lvMax": 20, + "weaponGroup": 104, + "weaponScale": 2, + "effectFolder": 1, + "hpBase": 100, + "hpMax": 100, + "atkBase": 100, + "atkMax": 100, + "criticalWeight": 0, + "power": 99, + "defense": 99, + "agility": 99, + "magic": 99, + "luck": 99, + "treasureDevice": 99, + "policy": 0, + "personality": 0, + "deity": 99, + "stepProbability": 1000, + "strParam": "{}" +}, { + "weaponColor": 16777215, + "svtId": 9304590, + "limitCount": 1, + "rarity": 4, + "lvMax": 35, + "weaponGroup": 104, + "weaponScale": 2, + "effectFolder": 1, + "hpBase": 100, + "hpMax": 100, + "atkBase": 100, + "atkMax": 100, + "criticalWeight": 0, + "power": 99, + "defense": 99, + "agility": 99, + "magic": 99, + "luck": 99, + "treasureDevice": 99, + "policy": 0, + "personality": 0, + "deity": 99, + "stepProbability": 1000, + "strParam": "{}" +}, { + "weaponColor": 16777215, + "svtId": 9304590, + "limitCount": 2, + "rarity": 4, + "lvMax": 50, + "weaponGroup": 104, + "weaponScale": 2, + "effectFolder": 1, + "hpBase": 100, + "hpMax": 100, + "atkBase": 100, + "atkMax": 100, + "criticalWeight": 0, + "power": 99, + "defense": 99, + "agility": 99, + "magic": 99, + "luck": 99, + "treasureDevice": 99, + "policy": 0, + "personality": 0, + "deity": 99, + "stepProbability": 1000, + "strParam": "{}" +}, { + "weaponColor": 16777215, + "svtId": 9304590, + "limitCount": 3, + "rarity": 4, + "lvMax": 65, + "weaponGroup": 104, + "weaponScale": 2, + "effectFolder": 1, + "hpBase": 100, + "hpMax": 100, + "atkBase": 100, + "atkMax": 100, + "criticalWeight": 0, + "power": 99, + "defense": 99, + "agility": 99, + "magic": 99, + "luck": 99, + "treasureDevice": 99, + "policy": 0, + "personality": 0, + "deity": 99, + "stepProbability": 1000, + "strParam": "{}" +}, { + "weaponColor": 16777215, + "svtId": 9304590, + "limitCount": 4, + "rarity": 4, + "lvMax": 80, + "weaponGroup": 104, + "weaponScale": 2, + "effectFolder": 1, + "hpBase": 100, + "hpMax": 100, + "atkBase": 100, + "atkMax": 100, + "criticalWeight": 0, + "power": 99, + "defense": 99, + "agility": 99, + "magic": 99, + "luck": 99, + "treasureDevice": 99, + "policy": 0, + "personality": 0, + "deity": 99, + "stepProbability": 1000, + "strParam": "{}" }, { "weaponColor": 16777215, "svtId": 9400010, diff --git a/master/mstSvtLimitAdd.json b/master/mstSvtLimitAdd.json index 351c33f94..5027adde6 100644 --- a/master/mstSvtLimitAdd.json +++ b/master/mstSvtLimitAdd.json @@ -2262,6 +2262,45 @@ "battleCharaOffsetZ": 0, "svtVoiceId": 304100, "voicePrefix": 2 +}, { + "individuality": [], + "script": {}, + "svtId": 304200, + "limitCount": 0, + "battleCharaId": 304200, + "fileConvertLimitCount": 0, + "battleCharaLimitCount": 0, + "battleCharaOffsetX": 0, + "battleCharaOffsetY": 0, + "battleCharaOffsetZ": 0, + "svtVoiceId": 304200, + "voicePrefix": 0 +}, { + "individuality": [], + "script": {}, + "svtId": 304200, + "limitCount": 1, + "battleCharaId": 304210, + "fileConvertLimitCount": 1, + "battleCharaLimitCount": 1, + "battleCharaOffsetX": 0, + "battleCharaOffsetY": 0, + "battleCharaOffsetZ": 0, + "svtVoiceId": 304200, + "voicePrefix": 0 +}, { + "individuality": [], + "script": {}, + "svtId": 304200, + "limitCount": 2, + "battleCharaId": 304210, + "fileConvertLimitCount": 2, + "battleCharaLimitCount": 2, + "battleCharaOffsetX": 0, + "battleCharaOffsetY": 0, + "battleCharaOffsetZ": 0, + "svtVoiceId": 304200, + "voicePrefix": 0 }, { "individuality": [], "script": {}, @@ -2275,6 +2314,19 @@ "battleCharaOffsetZ": 0, "svtVoiceId": 304200, "voicePrefix": 0 +}, { + "individuality": [], + "script": {}, + "svtId": 304200, + "limitCount": 4, + "battleCharaId": 304220, + "fileConvertLimitCount": 4, + "battleCharaLimitCount": 4, + "battleCharaOffsetX": 0, + "battleCharaOffsetY": 0, + "battleCharaOffsetZ": 0, + "svtVoiceId": 304200, + "voicePrefix": 0 }, { "individuality": [], "script": {}, diff --git a/master/mstSvtPassiveSkill.json b/master/mstSvtPassiveSkill.json index f3e739c47..40294a896 100644 --- a/master/mstSvtPassiveSkill.json +++ b/master/mstSvtPassiveSkill.json @@ -12094,6 +12094,118 @@ "flag": 0, "startedAt": 1482382800, "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 10, + "priority": 1, + "skillId": 960502, + "condQuestId": 1000722, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 5, + "eventId": 80038, + "flag": 0, + "startedAt": 1482382800, + "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 12, + "priority": 1, + "skillId": 960837, + "condQuestId": 1000822, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 0, + "eventId": 80059, + "flag": 0, + "startedAt": 1498726800, + "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 13, + "priority": 1, + "skillId": 961154, + "condQuestId": 1000822, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 0, + "eventId": 80072, + "flag": 0, + "startedAt": 1507986000, + "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 10, + "priority": 2, + "skillId": 960503, + "condQuestId": 1000722, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 6, + "eventId": 80038, + "flag": 0, + "startedAt": 1482382800, + "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 10, + "priority": 3, + "skillId": 960504, + "condQuestId": 1000722, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 7, + "eventId": 80038, + "flag": 0, + "startedAt": 1482382800, + "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 10, + "priority": 4, + "skillId": 960505, + "condQuestId": 1000722, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 8, + "eventId": 80038, + "flag": 0, + "startedAt": 1482382800, + "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 10, + "priority": 5, + "skillId": 960506, + "condQuestId": 1000722, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 9, + "eventId": 80038, + "flag": 0, + "startedAt": 1482382800, + "endedAt": 1893423600 +}, { + "svtId": 304200, + "num": 10, + "priority": 6, + "skillId": 960507, + "condQuestId": 1000722, + "condQuestPhase": 1, + "condLv": 0, + "condLimitCount": 0, + "condFriendshipRank": 10, + "eventId": 80038, + "flag": 0, + "startedAt": 1482382800, + "endedAt": 1893423600 }, { "svtId": 400100, "num": 10, diff --git a/master/mstSvtProfile.json b/master/mstSvtProfile.json index 24f00fd6f..2fd175888 100644 --- a/master/mstSvtProfile.json +++ b/master/mstSvtProfile.json @@ -733,6 +733,13 @@ "priority": 0, "condType": 0, "condValue": 0 +}, { + "svtId": 304200, + "svtCommentId": 1, + "svtCommentPriority": 0, + "priority": 0, + "condType": 0, + "condValue": 0 }, { "svtId": 400100, "svtCommentId": 1, diff --git a/master/mstSvtScript.json b/master/mstSvtScript.json index 4c1d289ba..2dd371738 100644 --- a/master/mstSvtScript.json +++ b/master/mstSvtScript.json @@ -4249,6 +4249,42 @@ "offsetY": 136, "offsetXMyroom": 304, "offsetYMyroom": 138 +}, { + "extendData": {}, + "id": 3042000, + "form": 0, + "faceX": 381, + "faceY": 135, + "bgImageId": 0, + "scale": 1.0, + "offsetX": -5, + "offsetY": 139, + "offsetXMyroom": 314, + "offsetYMyroom": 139 +}, { + "extendData": {}, + "id": 3042001, + "form": 0, + "faceX": 381, + "faceY": 135, + "bgImageId": 0, + "scale": 1.0, + "offsetX": -5, + "offsetY": 139, + "offsetXMyroom": 314, + "offsetYMyroom": 139 +}, { + "extendData": {}, + "id": 3042002, + "form": 0, + "faceX": 397, + "faceY": 135, + "bgImageId": 0, + "scale": 1.0, + "offsetX": -5, + "offsetY": 139, + "offsetXMyroom": 314, + "offsetYMyroom": 139 }, { "extendData": {}, "id": 4001000, diff --git a/master/mstSvtSkill.json b/master/mstSvtSkill.json index 852c6d246..fd2ff4001 100644 --- a/master/mstSvtSkill.json +++ b/master/mstSvtSkill.json @@ -4126,6 +4126,42 @@ "condLimitCount": 3, "eventId": 0, "flag": 0 +}, { + "strengthStatus": 0, + "svtId": 304200, + "num": 1, + "priority": 1, + "skillId": 741650, + "condQuestId": 0, + "condQuestPhase": 0, + "condLv": 0, + "condLimitCount": 0, + "eventId": 0, + "flag": 0 +}, { + "strengthStatus": 0, + "svtId": 304200, + "num": 2, + "priority": 1, + "skillId": 742450, + "condQuestId": 0, + "condQuestPhase": 0, + "condLv": 0, + "condLimitCount": 1, + "eventId": 0, + "flag": 0 +}, { + "strengthStatus": 0, + "svtId": 304200, + "num": 3, + "priority": 1, + "skillId": 743550, + "condQuestId": 0, + "condQuestPhase": 0, + "condLv": 0, + "condLimitCount": 3, + "eventId": 0, + "flag": 0 }, { "strengthStatus": 0, "svtId": 400100, @@ -16582,6 +16618,18 @@ "condLimitCount": 0, "eventId": 0, "flag": 0 +}, { + "strengthStatus": 0, + "svtId": 9304590, + "num": 1, + "priority": 1, + "skillId": 992175, + "condQuestId": 0, + "condQuestPhase": 0, + "condLv": 0, + "condLimitCount": 0, + "eventId": 0, + "flag": 0 }, { "strengthStatus": 1, "svtId": 9400010, diff --git a/master/mstSvtVoice.json b/master/mstSvtVoice.json index 7e712eea0..bbfde83f2 100644 --- a/master/mstSvtVoice.json +++ b/master/mstSvtVoice.json @@ -10466,6 +10466,50 @@ "value": 1186, "eventId": 0 }] + }, { + "overwriteName": "会話 21", + "infos": [{ + "id": "0_H310", + "face": 4, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H311", + "face": 2, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H312", + "face": 2, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H313", + "face": 4, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H314", + "face": 4, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H315", + "face": 5, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 4, + "value": 304200, + "eventId": 0 + }] }, { "overwriteName": "", "infos": [{ @@ -109368,6 +109412,1085 @@ "id": 304100, "voicePrefix": 2, "type": 7 +}, { + "scriptJson": [{ + "overwriteName": "", + "infos": [{ + "id": "0_H090", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H091", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H092", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 3, + "value": 1, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H100", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H101", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H102", + "face": 8, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H103", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H104", + "face": 4, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 3, + "value": 2, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H110", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H111", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 3, + "value": 3, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H120", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H121", + "face": 6, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H122", + "face": 1, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H123", + "face": 7, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H124", + "face": 7, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H125", + "face": 1, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 3, + "value": 4, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H130", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H131", + "face": 6, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H132", + "face": 7, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H133", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H134", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H135", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 3, + "value": 5, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H030", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H031", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H040", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H041", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H050", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H051", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H052", + "face": 7, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H053", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H060", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H061", + "face": 7, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H062", + "face": 1, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H070", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H071", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H080", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H081", + "face": 3, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "会話 4", + "infos": [{ + "id": "0_H170", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H171", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H172", + "face": 7, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 5, + "value": 1033, + "eventId": 0 + }] + }, { + "overwriteName": "会話 5", + "infos": [{ + "id": "0_H180", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H181", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H182", + "face": 6, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 4, + "value": 701000, + "eventId": 0 + }] + }, { + "overwriteName": "会話 6", + "infos": [{ + "id": "0_H190", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H191", + "face": 2, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H192", + "face": 2, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 4, + "value": 101300, + "eventId": 0 + }] + }, { + "overwriteName": "会話 7", + "infos": [{ + "id": "0_H200", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H201", + "face": 6, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H202", + "face": 2, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 4, + "value": 200900, + "eventId": 0 + }] + }, { + "overwriteName": "会話 8", + "infos": [{ + "id": "0_H210", + "face": 2, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H211", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H212", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 4, + "value": 700100, + "eventId": 0 + }] + }, { + "overwriteName": "会話 9", + "infos": [{ + "id": "0_H220", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H221", + "face": 4, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H222", + "face": 3, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 5, + "value": 1095, + "eventId": 0 + }] + }, { + "overwriteName": "会話 10", + "infos": [{ + "id": "0_H230", + "face": 4, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H231", + "face": 0, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 4, + "value": 401100, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H020", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H021", + "face": 2, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 2, + "value": 0, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_H010", + "face": 2, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H011", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H012", + "face": 7, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 1, + "value": 0, + "eventId": 0 + }] + }], + "id": 304200, + "voicePrefix": 0, + "type": 1 +}, { + "scriptJson": [{ + "overwriteName": "レベルアップ 1", + "infos": [{ + "id": "0_G010", + "face": 7, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_G011", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 8, + "value": 0, + "eventId": 0 + }] + }, { + "overwriteName": "レベルアップ 2", + "infos": [{ + "id": "0_G110", + "face": 3, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 8, + "value": 0, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_G030", + "face": 7, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 9, + "value": 1, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_G020", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 10, + "value": 0, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_G040", + "face": 7, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_G041", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 9, + "value": 3, + "eventId": 0 + }] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_G050", + "face": 1, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_G051", + "face": 1, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 11, + "value": 0, + "eventId": 0 + }] + }], + "id": 304200, + "voicePrefix": 0, + "type": 2 +}, { + "scriptJson": [{ + "overwriteName": "", + "infos": [{ + "id": "0_S010", + "face": 6, + "delay": 0.0, + "text": "───私を、呼ぶ者は誰か。", + "form": 0 + }, { + "id": "0_S011", + "face": 0, + "delay": 0.10000000149011612, + "text": "\nそうか。おまえか。[r]", + "form": 0 + }, { + "id": "0_S012", + "face": 0, + "delay": 0.10000000149011612, + "text": "\n……承知。[r]", + "form": 0 + }, { + "id": "0_S013", + "face": 1, + "delay": 0.10000000149011612, + "text": "\n此処は、そういった時間軸であるのだな。[r]", + "form": 0 + }, { + "id": "0_S014", + "face": 0, + "delay": 0.10000000149011612, + "text": "\nならば私はこう言おう。[r]", + "form": 0 + }, { + "id": "0_S015", + "face": 2, + "delay": 0.10000000149011612, + "text": "\n私はロムルス=クィリヌス![r]", + "form": 0 + }, { + "id": "0_S016", + "face": 2, + "delay": 0.10000000149011612, + "text": "\n光の槍が如き腕を振るう、人理のサーヴァントである!", + "form": 0 + }], + "conds": [] + }], + "id": 304200, + "voicePrefix": 0, + "type": 3 +}, { + "scriptJson": [{ + "overwriteName": "", + "infos": [{ + "id": "0_B100", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B110", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B500", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B510", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B080", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B090", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B480", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B180", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B190", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B200", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "宝具カード {0}", + "infos": [{ + "id": "0_B210", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "宝具カード {0}", + "infos": [{ + "id": "0_B220", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "宝具カード {0}", + "infos": [{ + "id": "0_B230", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B010", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B020", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B030", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B410", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B420", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B430", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "エクストラアタック 1", + "infos": [{ + "id": "0_B040", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "エクストラアタック 2", + "infos": [{ + "id": "0_B440", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "エクストラアタック 3", + "infos": [{ + "id": "0_B840", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "エクストラアタック 4", + "infos": [{ + "id": "0_B2440", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "ダメージ 1", + "infos": [{ + "id": "0_B150", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "ダメージ 2", + "infos": [{ + "id": "0_B140", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "ダメージ 3", + "infos": [{ + "id": "0_B540", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B160", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B170", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B560", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B120", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B130", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B520", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "", + "infos": [{ + "id": "0_B530", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }], + "id": 304200, + "voicePrefix": 0, + "type": 6 +}, { + "scriptJson": [{ + "overwriteName": "宝具 {0}", + "infos": [{ + "id": "0_B050", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_B051", + "face": 0, + "delay": 0.090000003576278687, + "text": "", + "form": 0 + }, { + "id": "0_B052", + "face": 0, + "delay": 0.23999999463558197, + "text": "", + "form": 0 + }, { + "id": "0_B053", + "face": 0, + "delay": 0.20999999344348907, + "text": "", + "form": 0 + }, { + "id": "0_B054", + "face": 0, + "delay": 0.47999998927116394, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "宝具 {0}", + "infos": [{ + "id": "0_B800", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_B801", + "face": 0, + "delay": 0.18999999761581421, + "text": "", + "form": 0 + }, { + "id": "0_B802", + "face": 0, + "delay": 0.31999999284744263, + "text": "", + "form": 0 + }, { + "id": "0_B803", + "face": 0, + "delay": 0.25999999046325684, + "text": "", + "form": 0 + }, { + "id": "0_B804", + "face": 0, + "delay": 0.25999999046325684, + "text": "", + "form": 0 + }], + "conds": [] + }], + "id": 304200, + "voicePrefix": 0, + "type": 7 }, { "scriptJson": [{ "overwriteName": "", @@ -247562,6 +248685,10 @@ "condType": 6, "value": 3000421, "eventId": 0 + }, { + "condType": 7, + "value": 3000628, + "eventId": 0 }] }, { "overwriteName": "会話 13", @@ -247618,6 +248745,48 @@ "condType": 6, "value": 3000531, "eventId": 0 + }, { + "condType": 7, + "value": 3000628, + "eventId": 0 + }] + }, { + "overwriteName": "会話 14", + "infos": [{ + "id": "0_H240", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "0_H241", + "face": 12, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "0_H242", + "face": 4, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H243", + "face": 4, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "0_H244", + "face": 4, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 6, + "value": 3000628, + "eventId": 0 }] }], "id": 800100, @@ -248472,6 +249641,10 @@ "condType": 6, "value": 3000421, "eventId": 0 + }, { + "condType": 7, + "value": 3000628, + "eventId": 0 }] }, { "overwriteName": "会話 8", @@ -248528,6 +249701,48 @@ "condType": 6, "value": 3000531, "eventId": 0 + }, { + "condType": 7, + "value": 3000628, + "eventId": 0 + }] + }, { + "overwriteName": "会話 9", + "infos": [{ + "id": "12_H240", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }, { + "id": "12_H241", + "face": 12, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }, { + "id": "12_H242", + "face": 4, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "12_H243", + "face": 4, + "delay": 0.30000001192092896, + "text": "", + "form": 0 + }, { + "id": "12_H244", + "face": 12, + "delay": 0.10000000149011612, + "text": "", + "form": 0 + }], + "conds": [{ + "condType": 6, + "value": 3000628, + "eventId": 0 }] }], "id": 800100, @@ -248586,6 +249801,106 @@ "type": 2 }, { "scriptJson": [{ + "overwriteName": "開始 1 オルテナウス", + "infos": [{ + "id": "12_B100", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "開始 2 オルテナウス", + "infos": [{ + "id": "12_B110", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "スキル 1 オルテナウス", + "infos": [{ + "id": "12_B080", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "スキル 2 オルテナウス", + "infos": [{ + "id": "12_B090", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "スキル 3 オルテナウス", + "infos": [{ + "id": "12_B480", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "コマンドカード 1 オルテナウス", + "infos": [{ + "id": "12_B180", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "コマンドカード 2 オルテナウス", + "infos": [{ + "id": "12_B190", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "コマンドカード 3 オルテナウス", + "infos": [{ + "id": "12_B200", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "宝具カード 1 オルテナウス", + "infos": [{ + "id": "12_B210", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { + "overwriteName": "宝具カード 2 オルテナウス", + "infos": [{ + "id": "12_B220", + "face": 0, + "delay": 0.0, + "text": "", + "form": 0 + }], + "conds": [] + }, { "overwriteName": "アタック 1 オルテナウス", "infos": [{ "id": "12_B010", @@ -248664,59 +249979,9 @@ }], "conds": [] }, { - "overwriteName": "スキル 1 オルテナウス", + "overwriteName": "ダメージ 1 オルテナウス", "infos": [{ - "id": "12_B080", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "スキル 2 オルテナウス", - "infos": [{ - "id": "12_B090", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "開始 1 オルテナウス", - "infos": [{ - "id": "12_B100", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "開始 2 オルテナウス", - "infos": [{ - "id": "12_B110", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "勝利 1 オルテナウス", - "infos": [{ - "id": "12_B120", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "勝利 2 オルテナウス", - "infos": [{ - "id": "12_B130", + "id": "12_B150", "face": 0, "delay": 0.0, "text": "", @@ -248733,16 +249998,6 @@ "form": 0 }], "conds": [] - }, { - "overwriteName": "ダメージ 1 オルテナウス", - "infos": [{ - "id": "12_B150", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] }, { "overwriteName": "戦闘不能 1 オルテナウス", "infos": [{ @@ -248764,9 +250019,9 @@ }], "conds": [] }, { - "overwriteName": "コマンドカード 1 オルテナウス", + "overwriteName": "勝利 1 オルテナウス", "infos": [{ - "id": "12_B180", + "id": "12_B120", "face": 0, "delay": 0.0, "text": "", @@ -248774,39 +250029,9 @@ }], "conds": [] }, { - "overwriteName": "コマンドカード 2 オルテナウス", + "overwriteName": "勝利 2 オルテナウス", "infos": [{ - "id": "12_B190", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "コマンドカード 3 オルテナウス", - "infos": [{ - "id": "12_B200", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "宝具カード 1 オルテナウス", - "infos": [{ - "id": "12_B210", - "face": 0, - "delay": 0.0, - "text": "", - "form": 0 - }], - "conds": [] - }, { - "overwriteName": "宝具カード 2 オルテナウス", - "infos": [{ - "id": "12_B220", + "id": "12_B130", "face": 0, "delay": 0.0, "text": "", diff --git a/master/mstTreasureDevice.json b/master/mstTreasureDevice.json index 1c3823cc0..c4e1035b6 100644 --- a/master/mstTreasureDevice.json +++ b/master/mstTreasureDevice.json @@ -7254,8 +7254,10 @@ }, { "individuality": [3002, 4002, 4007], "script": { + "limitSeqId_1": 304201, + "limitSeqId_3": 304202, "limitSeqId_4": 304202, - "limitSeqId_3": 304202 + "limitSeqId_2": 304201 }, "id": 304201, "seqId": 304200, diff --git a/master/mstVoiceCond.json b/master/mstVoiceCond.json index c9a0d9c29..c5543de4a 100644 --- a/master/mstVoiceCond.json +++ b/master/mstVoiceCond.json @@ -6154,6 +6154,42 @@ "closedType": 2, "condPriority": 50, "closedMessageId": 0 +}, { + "svtId": 304200, + "voicePrefix": -1, + "voiceId": "B2440", + "condType": 7, + "targetId": 304200, + "condGroup": 0, + "condValue": 3, + "priority": -1, + "closedType": 1, + "condPriority": 50, + "closedMessageId": 0 +}, { + "svtId": 304200, + "voicePrefix": -1, + "voiceId": "H130", + "condType": 1, + "targetId": 3000628, + "condGroup": 0, + "condValue": 0, + "priority": 1, + "closedType": 1, + "condPriority": 90, + "closedMessageId": 22 +}, { + "svtId": 304200, + "voicePrefix": -1, + "voiceId": "H130", + "condType": 9, + "targetId": 304200, + "condGroup": 0, + "condValue": 5, + "priority": 1, + "closedType": 1, + "condPriority": 90, + "closedMessageId": 22 }, { "svtId": 400400, "voicePrefix": -1, @@ -12790,6 +12826,42 @@ "closedType": 2, "condPriority": 50, "closedMessageId": 0 +}, { + "svtId": 800100, + "voicePrefix": -1, + "voiceId": "H220", + "condType": 1, + "targetId": 3000628, + "condGroup": 1, + "condValue": 0, + "priority": -1, + "closedType": 1, + "condPriority": 50, + "closedMessageId": 0 +}, { + "svtId": 800100, + "voicePrefix": -1, + "voiceId": "H230", + "condType": 1, + "targetId": 3000628, + "condGroup": 1, + "condValue": 0, + "priority": -1, + "closedType": 1, + "condPriority": 50, + "closedMessageId": 0 +}, { + "svtId": 800100, + "voicePrefix": 12, + "voiceId": "B480", + "condType": 1, + "targetId": 3000607, + "condGroup": 0, + "condValue": 0, + "priority": 1, + "closedType": 2, + "condPriority": 50, + "closedMessageId": 0 }, { "svtId": 800101, "voicePrefix": -1, diff --git a/master/mstVoiceMaterialCond.json b/master/mstVoiceMaterialCond.json index 8b87d00e0..e6cd80620 100644 --- a/master/mstVoiceMaterialCond.json +++ b/master/mstVoiceMaterialCond.json @@ -6073,6 +6073,15 @@ "condGroup": 1, "condType": 103, "targetId": 800100 +}, { + "condValues": [0, 1, 3], + "svtId": 800100, + "voicePrefix": 0, + "voiceId": "H240", + "idx": 1, + "condGroup": 1, + "condType": 103, + "targetId": 800100 }, { "condValues": [11], "svtId": 800100, @@ -6208,6 +6217,15 @@ "condGroup": 1, "condType": 103, "targetId": 800100 +}, { + "condValues": [12, 13], + "svtId": 800100, + "voicePrefix": 12, + "voiceId": "H240", + "idx": 1, + "condGroup": 1, + "condType": 103, + "targetId": 800100 }, { "condValues": [0], "svtId": 900900, diff --git a/master/mstVoicePlayCond.json b/master/mstVoicePlayCond.json index 5e927d0b7..f856a4a39 100644 --- a/master/mstVoicePlayCond.json +++ b/master/mstVoicePlayCond.json @@ -412,6 +412,15 @@ "condGroup": 1, "condType": 1, "targetId": 3000628 +}, { + "condValues": [0], + "svtId": 304200, + "voicePrefix": -1, + "voiceId": "H130", + "idx": 1, + "condGroup": 1, + "condType": 1, + "targetId": 3000628 }, { "condValues": [0], "svtId": 401500,