diff --git a/data/CommonEvents.json b/data/CommonEvents.json index 612e8d0..a42f894 100644 --- a/data/CommonEvents.json +++ b/data/CommonEvents.json @@ -27486,6 +27486,24 @@ 1 ] }, + { + "code": 121, + "indent": 0, + "parameters": [ + 208, + 208, + 1 + ] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 209, + 209, + 1 + ] + }, { "code": 0, "indent": 0, @@ -324585,43 +324603,6 @@ "indent": 1, "parameters": [] }, - { - "code": 111, - "indent": 1, - "parameters": [ - 1, - 35, - 0, - 1, - 0 - ] - }, - { - "code": 231, - "indent": 2, - "parameters": [ - 17, - "H-Prof2_Comment12(LostAnalVirgin)", - 0, - 0, - 0, - 0, - 100, - 100, - 255, - 0 - ] - }, - { - "code": 0, - "indent": 2, - "parameters": [] - }, - { - "code": 412, - "indent": 1, - "parameters": [] - }, { "code": 111, "indent": 1, @@ -324790,6 +324771,238 @@ "indent": 1, "parameters": [] }, + { + "code": 111, + "indent": 1, + "parameters": [ + 1, + 49, + 0, + 1, + 0 + ] + }, + { + "code": 111, + "indent": 2, + "parameters": [ + 1, + 35, + 0, + 1, + 0 + ] + }, + { + "code": 231, + "indent": 3, + "parameters": [ + 17, + "H-Prof2_Comment12(LostAnalVirgin)", + 0, + 0, + 0, + 0, + 100, + 100, + 255, + 0 + ] + }, + { + "code": 0, + "indent": 3, + "parameters": [] + }, + { + "code": 412, + "indent": 2, + "parameters": [] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, + { + "code": 111, + "indent": 1, + "parameters": [ + 1, + 49, + 0, + 2, + 0 + ] + }, + { + "code": 111, + "indent": 2, + "parameters": [ + 1, + 35, + 0, + 1, + 0 + ] + }, + { + "code": 231, + "indent": 3, + "parameters": [ + 17, + "H-Prof2_Comment12(LostAnalVirgin)", + 0, + 0, + 0, + 0, + 100, + 100, + 255, + 0 + ] + }, + { + "code": 0, + "indent": 3, + "parameters": [] + }, + { + "code": 412, + "indent": 2, + "parameters": [] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, + { + "code": 111, + "indent": 1, + "parameters": [ + 1, + 49, + 0, + 5, + 0 + ] + }, + { + "code": 111, + "indent": 2, + "parameters": [ + 1, + 35, + 0, + 1, + 0 + ] + }, + { + "code": 231, + "indent": 3, + "parameters": [ + 17, + "H-Prof2_Comment12(LostAnalVirgin)", + 0, + 0, + 0, + 0, + 100, + 100, + 255, + 0 + ] + }, + { + "code": 0, + "indent": 3, + "parameters": [] + }, + { + "code": 412, + "indent": 2, + "parameters": [] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, + { + "code": 111, + "indent": 1, + "parameters": [ + 1, + 49, + 0, + 23, + 0 + ] + }, + { + "code": 111, + "indent": 2, + "parameters": [ + 1, + 35, + 0, + 1, + 0 + ] + }, + { + "code": 231, + "indent": 3, + "parameters": [ + 17, + "H-Prof2_Comment12(LostAnalVirgin)", + 0, + 0, + 0, + 0, + 100, + 100, + 255, + 0 + ] + }, + { + "code": 0, + "indent": 3, + "parameters": [] + }, + { + "code": 412, + "indent": 2, + "parameters": [] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, { "code": 111, "indent": 1, diff --git a/data/Enemies.json b/data/Enemies.json index 2411504..0096685 100644 --- a/data/Enemies.json +++ b/data/Enemies.json @@ -2121,9 +2121,9 @@ "battlerName": "Enemy_BanditElite", "dropItems": [ { - "dataId": 1, - "denominator": 1, - "kind": 0 + "kind": 1, + "dataId": 49, + "denominator": 5 }, { "dataId": 1, @@ -2190,9 +2190,9 @@ "battlerName": "Enemy_BanditElite", "dropItems": [ { - "dataId": 1, - "denominator": 1, - "kind": 0 + "kind": 1, + "dataId": 49, + "denominator": 5 }, { "dataId": 1, @@ -3363,9 +3363,9 @@ "battlerName": "Enemy_Eel", "dropItems": [ { - "dataId": 1, - "denominator": 1, - "kind": 0 + "kind": 1, + "dataId": 45, + "denominator": 5 }, { "dataId": 1, @@ -3432,9 +3432,9 @@ "battlerName": "Enemy_Eel", "dropItems": [ { - "dataId": 1, - "denominator": 1, - "kind": 0 + "kind": 1, + "dataId": 45, + "denominator": 5 }, { "dataId": 1, diff --git a/data/Map001.json b/data/Map001.json index 34af525..0dec779 100644 --- a/data/Map001.json +++ b/data/Map001.json @@ -46904,18 +46904,7 @@ 56, 0, 0, - 48 - ] - }, - { - "code": 122, - "indent": 0, - "parameters": [ - 131, - 131, - 0, - 0, - 19 + 27 ] }, { @@ -46940,17 +46929,6 @@ 1 ] }, - { - "code": 122, - "indent": 0, - "parameters": [ - 66, - 66, - 0, - 0, - 3 - ] - }, { "code": 117, "indent": 0, @@ -46963,9 +46941,9 @@ "indent": 0, "parameters": [ 0, - 58, - 10, - 6, + 124, + 11, + 25, 8, 0 ] diff --git a/data/Map005.json b/data/Map005.json index 90c1f8d..60134e7 100644 --- a/data/Map005.json +++ b/data/Map005.json @@ -1,6 +1,6 @@ { "autoplayBgm": true, - "autoplayBgs": false, + "autoplayBgs": true, "battleback1Name": "", "battleback2Name": "", "bgm": { diff --git a/data/Map010.json b/data/Map010.json index 9e90b78..d71c0d3 100644 --- a/data/Map010.json +++ b/data/Map010.json @@ -1,6 +1,6 @@ { "autoplayBgm": true, - "autoplayBgs": false, + "autoplayBgs": true, "battleback1Name": "", "battleback2Name": "", "bgm": { diff --git a/data/Map018.json b/data/Map018.json index 815c9eb..ab61e39 100644 --- a/data/Map018.json +++ b/data/Map018.json @@ -15112,6 +15112,11 @@ 48 ] }, + { + "code": 222, + "indent": 1, + "parameters": [] + }, { "code": 101, "indent": 1, diff --git a/data/Map027.json b/data/Map027.json index ee6cffe..4b7efd7 100644 --- a/data/Map027.json +++ b/data/Map027.json @@ -7319,7 +7319,7 @@ 0, 5, 0, - 0, + 15, 0, 0, 0, diff --git a/data/Map046.json b/data/Map046.json index f204ae6..90272d3 100644 --- a/data/Map046.json +++ b/data/Map046.json @@ -10263,7 +10263,7 @@ { "list": [ { - "code": 40, + "code": 39, "indent": null }, { @@ -10281,7 +10281,7 @@ "indent": 0, "parameters": [ { - "code": 40, + "code": 39, "indent": null } ] diff --git a/data/Map058.json b/data/Map058.json index 572b7d6..8dde64a 100644 --- a/data/Map058.json +++ b/data/Map058.json @@ -14448,6 +14448,16 @@ 40 ] }, + { + "code": 313, + "indent": 0, + "parameters": [ + 0, + 0, + 1, + 28 + ] + }, { "code": 121, "indent": 0, diff --git a/data/Map070.json b/data/Map070.json index 386a2e2..3169d9c 100644 --- a/data/Map070.json +++ b/data/Map070.json @@ -1779,10 +1779,10 @@ 3556, 3556, 3556, - 3556, - 3556, - 3556, - 3556, + -1, + -1, + -1, + -1, 3537, 3536, 3536, @@ -9711,8 +9711,8 @@ } ], "repeat": false, - "skippable": false, - "wait": true + "skippable": true, + "wait": false } ] }, @@ -9736,6 +9736,59 @@ } ] }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, + "skippable": false, + "wait": true + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 37, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + } + ] + }, { "code": 311, "indent": 0, @@ -9748,6 +9801,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -10022,8 +10080,8 @@ } ], "repeat": false, - "skippable": false, - "wait": true + "skippable": true, + "wait": false } ] }, @@ -10047,6 +10105,59 @@ } ] }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, + "skippable": false, + "wait": true + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 37, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + } + ] + }, { "code": 311, "indent": 0, @@ -10059,6 +10170,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -10319,8 +10435,8 @@ } ], "repeat": false, - "skippable": false, - "wait": true + "skippable": true, + "wait": false } ] }, @@ -10344,6 +10460,59 @@ } ] }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, + "skippable": false, + "wait": true + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 37, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + } + ] + }, { "code": 311, "indent": 0, @@ -10356,6 +10525,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -10612,8 +10786,8 @@ } ], "repeat": false, - "skippable": false, - "wait": true + "skippable": true, + "wait": false } ] }, @@ -10637,6 +10811,59 @@ } ] }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, + "skippable": false, + "wait": true + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 37, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + } + ] + }, { "code": 311, "indent": 0, @@ -10649,6 +10876,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -10919,8 +11151,8 @@ } ], "repeat": false, - "skippable": false, - "wait": true + "skippable": true, + "wait": false } ] }, @@ -10944,6 +11176,59 @@ } ] }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, + "skippable": false, + "wait": true + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 37, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + } + ] + }, { "code": 311, "indent": 0, @@ -10956,6 +11241,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -11214,8 +11504,8 @@ } ], "repeat": false, - "skippable": false, - "wait": true + "skippable": true, + "wait": false } ] }, @@ -11239,6 +11529,59 @@ } ] }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, + "skippable": false, + "wait": true + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 37, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + } + ] + }, { "code": 311, "indent": 0, @@ -11251,6 +11594,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -11338,6 +11686,10 @@ ], "indent": null }, + { + "code": 38, + "indent": null + }, { "code": 1, "indent": 0 @@ -11346,6 +11698,10 @@ "code": 1, "indent": 0 }, + { + "code": 37, + "indent": null + }, { "code": 14, "parameters": [ @@ -11548,7 +11904,7 @@ { "list": [ { - "code": 18, + "code": 17, "indent": null }, { @@ -11560,6 +11916,55 @@ } ], "repeat": false, + "skippable": true, + "wait": false + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 17, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 13, + "indent": null + } + ] + }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, "skippable": false, "wait": true } @@ -11570,7 +11975,7 @@ "indent": 0, "parameters": [ { - "code": 18, + "code": 37, "indent": null } ] @@ -11580,7 +11985,11 @@ "indent": 0, "parameters": [ { - "code": 13, + "code": 14, + "parameters": [ + 0, + 3 + ], "indent": null } ] @@ -11597,6 +12006,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -11852,7 +12266,7 @@ { "list": [ { - "code": 18, + "code": 17, "indent": null }, { @@ -11864,6 +12278,55 @@ } ], "repeat": false, + "skippable": true, + "wait": false + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 17, + "indent": null + } + ] + }, + { + "code": 505, + "indent": 0, + "parameters": [ + { + "code": 13, + "indent": null + } + ] + }, + { + "code": 205, + "indent": 0, + "parameters": [ + 0, + { + "list": [ + { + "code": 37, + "indent": null + }, + { + "code": 14, + "parameters": [ + 0, + 3 + ], + "indent": null + }, + { + "code": 0 + } + ], + "repeat": false, "skippable": false, "wait": true } @@ -11874,7 +12337,7 @@ "indent": 0, "parameters": [ { - "code": 18, + "code": 37, "indent": null } ] @@ -11884,7 +12347,11 @@ "indent": 0, "parameters": [ { - "code": 13, + "code": 14, + "parameters": [ + 0, + 3 + ], "indent": null } ] @@ -11901,6 +12368,11 @@ false ] }, + { + "code": 214, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, diff --git a/data/Map103.json b/data/Map103.json index 86a415e..550582b 100644 --- a/data/Map103.json +++ b/data/Map103.json @@ -21878,6 +21878,57 @@ "through": false, "trigger": 0, "walkAnime": true + }, + { + "conditions": { + "actorId": 1, + "actorValid": false, + "itemId": 268, + "itemValid": true, + "selfSwitchCh": "A", + "selfSwitchValid": false, + "switch1Id": 1, + "switch1Valid": false, + "switch2Id": 1, + "switch2Valid": false, + "variableId": 1, + "variableValid": false, + "variableValue": 0 + }, + "directionFix": false, + "image": { + "characterIndex": 0, + "characterName": "", + "direction": 2, + "pattern": 0, + "tileId": 0 + }, + "list": [ + { + "code": 0, + "indent": 0, + "parameters": [] + } + ], + "moveFrequency": 3, + "moveRoute": { + "list": [ + { + "code": 0, + "parameters": [] + } + ], + "repeat": true, + "skippable": false, + "wait": false + }, + "moveSpeed": 3, + "moveType": 0, + "priorityType": 0, + "stepAnime": false, + "through": false, + "trigger": 0, + "walkAnime": true } ], "x": 23, diff --git a/data/Map124.json b/data/Map124.json index 65d8051..6413473 100644 --- a/data/Map124.json +++ b/data/Map124.json @@ -7888,7 +7888,7 @@ ], "repeat": false, "skippable": false, - "wait": false + "wait": true } ] }, diff --git a/data/Map191.json b/data/Map191.json index 9e6d963..0db3427 100644 --- a/data/Map191.json +++ b/data/Map191.json @@ -1971,17 +1971,6 @@ 23 ] }, - { - "code": 128, - "indent": 0, - "parameters": [ - 12, - 0, - 0, - 1, - false - ] - }, { "code": 117, "indent": 0, diff --git a/data/Map195.json b/data/Map195.json index 20d75fe..4232ca1 100644 --- a/data/Map195.json +++ b/data/Map195.json @@ -11522,6 +11522,36 @@ "characterIndex": 1 }, "list": [ + { + "code": 111, + "indent": 0, + "parameters": [ + 10, + 12, + true + ] + }, + { + "code": 128, + "indent": 1, + "parameters": [ + 12, + 1, + 0, + 1, + false + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 111, "indent": 0, @@ -12714,6 +12744,13 @@ 2 ] }, + { + "code": 117, + "indent": 5, + "parameters": [ + 50 + ] + }, { "code": 101, "indent": 5, @@ -13674,6 +13711,78 @@ "" ] }, + { + "code": 121, + "indent": 5, + "parameters": [ + 21, + 21, + 1 + ] + }, + { + "code": 121, + "indent": 5, + "parameters": [ + 9, + 9, + 1 + ] + }, + { + "code": 121, + "indent": 5, + "parameters": [ + 8, + 8, + 1 + ] + }, + { + "code": 121, + "indent": 5, + "parameters": [ + 19, + 19, + 1 + ] + }, + { + "code": 121, + "indent": 5, + "parameters": [ + 20, + 20, + 1 + ] + }, + { + "code": 121, + "indent": 5, + "parameters": [ + 18, + 18, + 1 + ] + }, + { + "code": 121, + "indent": 5, + "parameters": [ + 17, + 17, + 1 + ] + }, + { + "code": 121, + "indent": 5, + "parameters": [ + 16, + 16, + 1 + ] + }, { "code": 121, "indent": 5, @@ -13683,6 +13792,15 @@ 1 ] }, + { + "code": 121, + "indent": 5, + "parameters": [ + 15, + 15, + 1 + ] + }, { "code": 121, "indent": 5, @@ -13935,6 +14053,78 @@ "" ] }, + { + "code": 121, + "indent": 4, + "parameters": [ + 21, + 21, + 1 + ] + }, + { + "code": 121, + "indent": 4, + "parameters": [ + 9, + 9, + 1 + ] + }, + { + "code": 121, + "indent": 4, + "parameters": [ + 8, + 8, + 1 + ] + }, + { + "code": 121, + "indent": 4, + "parameters": [ + 19, + 19, + 1 + ] + }, + { + "code": 121, + "indent": 4, + "parameters": [ + 20, + 20, + 1 + ] + }, + { + "code": 121, + "indent": 4, + "parameters": [ + 18, + 18, + 1 + ] + }, + { + "code": 121, + "indent": 4, + "parameters": [ + 17, + 17, + 1 + ] + }, + { + "code": 121, + "indent": 4, + "parameters": [ + 16, + 16, + 1 + ] + }, { "code": 121, "indent": 4, @@ -13944,6 +14134,15 @@ 1 ] }, + { + "code": 121, + "indent": 4, + "parameters": [ + 15, + 15, + 1 + ] + }, { "code": 121, "indent": 4, diff --git a/data/Map201.json b/data/Map201.json index a25aaca..ba1280c 100644 --- a/data/Map201.json +++ b/data/Map201.json @@ -9490,8 +9490,39 @@ ] }, { - "code": 201, + "code": 111, "indent": 0, + "parameters": [ + 0, + 12, + 0 + ] + }, + { + "code": 201, + "indent": 1, + "parameters": [ + 0, + 318, + 8, + 7, + 8, + 0 + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 411, + "indent": 0, + "parameters": [] + }, + { + "code": 201, + "indent": 1, "parameters": [ 0, 199, @@ -9501,6 +9532,16 @@ 0 ] }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 231, "indent": 0, @@ -11624,8 +11665,39 @@ ] }, { - "code": 201, + "code": 111, "indent": 0, + "parameters": [ + 0, + 12, + 0 + ] + }, + { + "code": 201, + "indent": 1, + "parameters": [ + 0, + 318, + 10, + 7, + 6, + 0 + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 411, + "indent": 0, + "parameters": [] + }, + { + "code": 201, + "indent": 1, "parameters": [ 0, 199, @@ -11635,6 +11707,16 @@ 0 ] }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 211, "indent": 0, @@ -12784,8 +12866,39 @@ ] }, { - "code": 201, + "code": 111, "indent": 0, + "parameters": [ + 0, + 12, + 0 + ] + }, + { + "code": 201, + "indent": 1, + "parameters": [ + 0, + 318, + 8, + 7, + 8, + 0 + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 411, + "indent": 0, + "parameters": [] + }, + { + "code": 201, + "indent": 1, "parameters": [ 0, 199, @@ -12795,6 +12908,16 @@ 0 ] }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 241, "indent": 0, @@ -14958,8 +15081,39 @@ ] }, { - "code": 201, + "code": 111, "indent": 0, + "parameters": [ + 0, + 12, + 0 + ] + }, + { + "code": 201, + "indent": 1, + "parameters": [ + 0, + 318, + 8, + 7, + 8, + 0 + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 411, + "indent": 0, + "parameters": [] + }, + { + "code": 201, + "indent": 1, "parameters": [ 0, 199, @@ -14969,6 +15123,16 @@ 0 ] }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 241, "indent": 0, diff --git a/data/Map281.json b/data/Map281.json index 4e8b48b..edabd77 100644 --- a/data/Map281.json +++ b/data/Map281.json @@ -12347,7 +12347,7 @@ 48, 0, 0, - 14 + 12 ] }, { diff --git a/data/Map291.json b/data/Map291.json index 079263d..fb153aa 100644 --- a/data/Map291.json +++ b/data/Map291.json @@ -4256,6 +4256,28 @@ "characterIndex": 0 }, "list": [ + { + "code": 221, + "indent": 0, + "parameters": [] + }, + { + "code": 201, + "indent": 0, + "parameters": [ + 0, + 291, + 22, + 16, + 2, + 0 + ] + }, + { + "code": 222, + "indent": 0, + "parameters": [] + }, { "code": 213, "indent": 0, @@ -4842,6 +4864,10 @@ 0, { "list": [ + { + "code": 37, + "indent": null + }, { "code": 14, "parameters": [ @@ -4864,6 +4890,16 @@ } ] }, + { + "code": 505, + "indent": 1, + "parameters": [ + { + "code": 37, + "indent": null + } + ] + }, { "code": 505, "indent": 1, diff --git a/data/Map314.json b/data/Map314.json index 9681c4c..2b06f9b 100644 --- a/data/Map314.json +++ b/data/Map314.json @@ -6983,7 +6983,7 @@ "code": 213, "indent": 2, "parameters": [ - 3, + 7, 6, false ] diff --git a/data/MapInfos.json b/data/MapInfos.json index b2f9f02..a068110 100644 --- a/data/MapInfos.json +++ b/data/MapInfos.json @@ -7,7 +7,7 @@ "order": 5, "parentId": 0, "scrollX": 1181, - "scrollY": 890, + "scrollY": 906, "quick": true }, { @@ -161,8 +161,8 @@ "name": "Beach", "order": 57, "parentId": 0, - "scrollX": 1181, - "scrollY": 890 + "scrollX": 1197, + "scrollY": 1410 }, { "id": 19, @@ -225,8 +225,8 @@ "name": "Thieves' Hideout 1F", "order": 66, "parentId": 23, - "scrollX": 1012.2857142857142, - "scrollY": 762.8571428571428 + "scrollX": 1181, + "scrollY": 906 }, { "id": 26, @@ -243,7 +243,7 @@ "name": "Thieves' Hideout 2F", "order": 68, "parentId": 25, - "scrollX": 1181, + "scrollX": 1197, "scrollY": 1014 }, { @@ -352,8 +352,8 @@ "name": "Port Town -Inn", "order": 54, "parentId": 15, - "scrollX": 787.3333333333334, - "scrollY": 604 + "scrollX": 1181, + "scrollY": 890 }, { "id": 40, @@ -646,7 +646,7 @@ "order": 196, "parentId": 69, "scrollX": 1181, - "scrollY": 1014, + "scrollY": 906, "quick": false }, { @@ -805,7 +805,7 @@ "name": "Church Cathedral", "order": 227, "parentId": 82, - "scrollX": 1181, + "scrollX": 1197, "scrollY": 1014, "quick": false }, @@ -866,7 +866,7 @@ "order": 158, "parentId": 60, "scrollX": 1181, - "scrollY": 1478, + "scrollY": 1990, "quick": false }, { @@ -1185,8 +1185,8 @@ "name": "Factory 4", "order": 325, "parentId": 110, - "scrollX": 1185, - "scrollY": 897, + "scrollX": 832, + "scrollY": 898, "quick": false }, { @@ -1296,7 +1296,7 @@ "order": 159, "parentId": 92, "scrollX": 1181, - "scrollY": 890, + "scrollY": 906, "quick": false }, { @@ -1365,8 +1365,8 @@ "name": "Slum House 3", "order": 162, "parentId": 92, - "scrollX": 816, - "scrollY": 624, + "scrollX": 1181, + "scrollY": 890, "quick": false }, { @@ -1625,8 +1625,8 @@ "name": "Church Bathhouse", "order": 242, "parentId": 85, - "scrollX": 885.75, - "scrollY": 679.5, + "scrollX": 1181, + "scrollY": 890, "quick": true }, { @@ -1765,8 +1765,8 @@ "name": "Public Bathhouse", "order": 123, "parentId": 62, - "scrollX": 1012.2857142857142, - "scrollY": 762.8571428571428, + "scrollX": 1181, + "scrollY": 890, "quick": false }, { @@ -1795,8 +1795,8 @@ "name": "Royal Capital Tavern", "order": 156, "parentId": 217, - "scrollX": 1012.2857142857142, - "scrollY": 761.1428571428571, + "scrollX": 1181, + "scrollY": 906, "quick": false }, { @@ -2115,7 +2115,7 @@ "name": "Royal Capital Entertainment District", "order": 145, "parentId": 62, - "scrollX": 1197, + "scrollX": 1181, "scrollY": 1014, "quick": false }, @@ -2668,7 +2668,7 @@ "order": 253, "parentId": 275, "scrollX": 1181, - "scrollY": 890, + "scrollY": 906, "quick": false }, { @@ -2677,7 +2677,7 @@ "name": "Church Cathedral (Kaname Event)", "order": 252, "parentId": 275, - "scrollX": 1181, + "scrollX": 1197, "scrollY": 1014, "quick": false }, @@ -3138,7 +3138,7 @@ "order": 153, "parentId": 186, "scrollX": 1181, - "scrollY": 906, + "scrollY": 890, "quick": true }, { @@ -3157,8 +3157,8 @@ "name": "Church Baptism Room (For Kaname Recollection)", "order": 254, "parentId": 273, - "scrollX": 1012.2857142857142, - "scrollY": 762.8571428571428, + "scrollX": 1181, + "scrollY": 906, "quick": false }, { @@ -3195,8 +3195,8 @@ "name": "Village Doctor's House (For Recollection)", "order": 24, "parentId": 11, - "scrollX": 1012.2857142857142, - "scrollY": 762.8571428571428, + "scrollX": 1181, + "scrollY": 906, "quick": true }, { diff --git a/data/States.json b/data/States.json index fbd0b02..1d363aa 100644 --- a/data/States.json +++ b/data/States.json @@ -859,7 +859,7 @@ "note": "", "overlay": 0, "priority": 50, - "removeAtBattleEnd": false, + "removeAtBattleEnd": true, "removeByDamage": false, "removeByRestriction": false, "removeByWalking": false, diff --git a/data/System.json b/data/System.json index 59a13f9..9234e81 100644 --- a/data/System.json +++ b/data/System.json @@ -119,7 +119,7 @@ "pitch": 100, "volume": 30 }, - "editMapId": 108, + "editMapId": 58, "elements": [ "", "物理", @@ -140,7 +140,7 @@ "Accessories", "H Title" ], - "gameTitle": "Dragon Conquista | TL: DazedAnon & O&M", + "gameTitle": "Dragon Conquista v1.03 | TL: DazedAnon & O&M", "gameoverMe": { "name": "Gameover1", "pan": 0, @@ -344,7 +344,7 @@ ], "startMapId": 42, "startX": 8, - "startY": 4, + "startY": 5, "switches": [ "", "腕組", @@ -2020,7 +2020,7 @@ "", "" ], - "versionId": 34928678, + "versionId": 69893380, "victoryMe": { "name": "Victory1", "pan": 0, diff --git a/data/Tilesets.json b/data/Tilesets.json index bec58e0..d762ec2 100644 --- a/data/Tilesets.json +++ b/data/Tilesets.json @@ -108290,7 +108290,7 @@ 1536, 1536, 1536, - 1536, + 1551, 1536, 1536, 1536, @@ -212558,54 +212558,54 @@ 1536, 1536, 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, - 1536, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3584, + 3586, + 3586, + 3586, + 3586, + 3592, + 3592, + 3592, + 3592, + 3588, + 3588, + 3588, + 3588, + 3584, + 3584, + 3584, + 3584, + 3590, + 3592, + 3594, + 3594, + 3596, + 3596, + 3588, + 3588, + 3586, + 3586, + 3598, + 3594, + 3590, + 3596, + 3598, + 3599, 3599, 3599, 3599, diff --git a/data/Troops.json b/data/Troops.json index 1fc35a0..b8ec898 100644 --- a/data/Troops.json +++ b/data/Troops.json @@ -2865,7 +2865,14 @@ "code": 401, "indent": 0, "parameters": [ - "\\c[14]Normal attacks consume SP, and you can\ncontinue attacking as long as you have SP." + "\\c[14]通常攻撃にはSP(青ゲージ)を消費し、" + ] + }, + { + "code": 401, + "indent": 0, + "parameters": [ + "SPの続く限り攻撃し続けることができます。" ] }, { @@ -2886,6 +2893,31 @@ "However, if your SP reaches 0, you'll be subject\nto a \\c[27]special counterattack\\c[0], so keep an\neye on your SP and choose \\c[14]\"End Action\"\\c[0]\nto recover SP." ] }, + { + "code": 101, + "indent": 0, + "parameters": [ + "", + 0, + 0, + 2, + "" + ] + }, + { + "code": 401, + "indent": 0, + "parameters": [ + "\\c[14]また、TP(緑ゲージ)を消費して剣技を使用できます。" + ] + }, + { + "code": 401, + "indent": 0, + "parameters": [ + "剣技には3つの種類があり、それぞれ強力な効果を有しています。" + ] + }, { "code": 101, "indent": 0,