diff --git a/data/Armors.json b/data/Armors.json index 2859eae..1ccd674 100644 --- a/data/Armors.json +++ b/data/Armors.json @@ -9944,7 +9944,7 @@ 0, 0 ], - "price": 0 + "price": 500 }, { "id": 364, diff --git a/data/CommonEvents.json b/data/CommonEvents.json index 50cade4..803c753 100644 --- a/data/CommonEvents.json +++ b/data/CommonEvents.json @@ -6069,6 +6069,13 @@ { "id": 18, "list": [ + { + "code": 242, + "indent": 0, + "parameters": [ + 1 + ] + }, { "code": 355, "indent": 0, @@ -6101,8 +6108,48 @@ "parameters": [] }, { - "code": 357, + "code": 111, "indent": 0, + "parameters": [ + 1, + 1, + 0, + 3, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "敗北輪姦後_02_2" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = 敗北輪姦後_02_2" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 411, + "indent": 0, + "parameters": [] + }, + { + "code": 357, + "indent": 1, "parameters": [ "Nore_Tes", "Run", @@ -6114,11 +6161,21 @@ }, { "code": 657, - "indent": 0, + "indent": 1, "parameters": [ "ファイル名 = 敗北輪姦後_02" ] }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 117, "indent": 0, @@ -8963,6 +9020,78 @@ "indent": 0, "parameters": [] }, + { + "code": 111, + "indent": 0, + "parameters": [ + 12, + "$gameActors.mainActor().boteId == 1" + ] + }, + { + "code": 111, + "indent": 1, + "parameters": [ + 12, + "$gameActors.mainActor().sikyu().taneoyaId > 0" + ] + }, + { + "code": 357, + "indent": 2, + "parameters": [ + "Nore_Cos", + "bote", + "ボテ", + { + "actorId": "1", + "boteId": "2" + } + ] + }, + { + "code": 657, + "indent": 2, + "parameters": [ + "actorId = 1" + ] + }, + { + "code": 657, + "indent": 2, + "parameters": [ + "boteId = 2" + ] + }, + { + "code": 121, + "indent": 2, + "parameters": [ + 36, + 36, + 0 + ] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 111, "indent": 0, @@ -12908,7 +13037,7 @@ "indent": 1, "parameters": [ 12, - "$gameActors.mainActor().boteId >= 2" + "$gameActors.mainActor().boteId >= 3" ] }, { @@ -14158,6 +14287,13 @@ "indent": 1, "parameters": [] }, + { + "code": 117, + "indent": 1, + "parameters": [ + 143 + ] + }, { "code": 0, "indent": 1, @@ -20932,7 +21068,7 @@ "code": 117, "indent": 1, "parameters": [ - 18 + 160 ] }, { @@ -24021,8 +24157,111 @@ ] }, { - "code": 357, + "code": 122, "indent": 1, + "parameters": [ + 121, + 121, + 0, + 2, + 0, + 4 + ] + }, + { + "code": 111, + "indent": 1, + "parameters": [ + 1, + 121, + 0, + 0, + 0 + ] + }, + { + "code": 357, + "indent": 2, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "孤児院系_導入カレン→子供テオ2回目_3" + } + ] + }, + { + "code": 657, + "indent": 2, + "parameters": [ + "ファイル名 = 孤児院系_導入カレン→子供テオ2回目_3" + ] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 411, + "indent": 1, + "parameters": [] + }, + { + "code": 111, + "indent": 2, + "parameters": [ + 1, + 121, + 0, + 1, + 0 + ] + }, + { + "code": 357, + "indent": 3, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "孤児院系_導入カレン→子供テオ2回目_2" + } + ] + }, + { + "code": 657, + "indent": 3, + "parameters": [ + "ファイル名 = 孤児院系_導入カレン→子供テオ2回目_2" + ] + }, + { + "code": 0, + "indent": 3, + "parameters": [] + }, + { + "code": 411, + "indent": 2, + "parameters": [] + }, + { + "code": 111, + "indent": 3, + "parameters": [ + 1, + 121, + 0, + 2, + 0 + ] + }, + { + "code": 357, + "indent": 4, "parameters": [ "Nore_Tes", "Run", @@ -24034,11 +24273,70 @@ }, { "code": 657, - "indent": 1, + "indent": 4, "parameters": [ "ファイル名 = 孤児院系_導入カレン→子供テオ2回目" ] }, + { + "code": 0, + "indent": 4, + "parameters": [] + }, + { + "code": 411, + "indent": 3, + "parameters": [] + }, + { + "code": 357, + "indent": 4, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "孤児院系_導入カレン→子供2回目以降_絶頂" + } + ] + }, + { + "code": 657, + "indent": 4, + "parameters": [ + "ファイル名 = 孤児院系_導入カレン→子供2回目以降_絶頂" + ] + }, + { + "code": 0, + "indent": 4, + "parameters": [] + }, + { + "code": 412, + "indent": 3, + "parameters": [] + }, + { + "code": 0, + "indent": 3, + "parameters": [] + }, + { + "code": 412, + "indent": 2, + "parameters": [] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, { "code": 0, "indent": 1, @@ -24050,8 +24348,45 @@ "parameters": [] }, { - "code": 357, + "code": 111, "indent": 1, + "parameters": [ + 12, + "Math.random() < 0.5" + ] + }, + { + "code": 357, + "indent": 2, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "孤児院系_導入カレン→子供2回目以降_絶頂" + } + ] + }, + { + "code": 657, + "indent": 2, + "parameters": [ + "ファイル名 = 孤児院系_導入カレン→子供2回目以降_絶頂" + ] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 411, + "indent": 1, + "parameters": [] + }, + { + "code": 357, + "indent": 2, "parameters": [ "Nore_Tes", "Run", @@ -24063,11 +24398,21 @@ }, { "code": 657, - "indent": 1, + "indent": 2, "parameters": [ "ファイル名 = 孤児院系_導入カレン→子供2回目以降" ] }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, { "code": 0, "indent": 1, @@ -27335,6 +27680,62 @@ 0 ] }, + { + "code": 111, + "indent": 3, + "parameters": [ + 1, + 4, + 0, + 3, + 2 + ] + }, + { + "code": 357, + "indent": 4, + "parameters": [ + "Nore_Event", + "AddEvent", + "イベントの追加", + { + "actorId": "13", + "event": "宿屋_エロなし_01", + "ero": "false" + } + ] + }, + { + "code": 657, + "indent": 4, + "parameters": [ + "actorId = 13" + ] + }, + { + "code": 657, + "indent": 4, + "parameters": [ + "イベント = 宿屋_エロなし_01" + ] + }, + { + "code": 657, + "indent": 4, + "parameters": [ + "エロ？ = false" + ] + }, + { + "code": 0, + "indent": 4, + "parameters": [] + }, + { + "code": 412, + "indent": 3, + "parameters": [] + }, { "code": 357, "indent": 3, @@ -27886,6 +28287,60 @@ 0 ] }, + { + "code": 111, + "indent": 3, + "parameters": [ + 0, + 71, + 1 + ] + }, + { + "code": 357, + "indent": 4, + "parameters": [ + "Nore_Event", + "AddEvent", + "イベントの追加", + { + "actorId": "14", + "event": "チャラ男_授乳開始", + "ero": "true" + } + ] + }, + { + "code": 657, + "indent": 4, + "parameters": [ + "actorId = 14" + ] + }, + { + "code": 657, + "indent": 4, + "parameters": [ + "イベント = チャラ男_授乳開始" + ] + }, + { + "code": 657, + "indent": 4, + "parameters": [ + "エロ？ = true" + ] + }, + { + "code": 0, + "indent": 4, + "parameters": [] + }, + { + "code": 412, + "indent": 3, + "parameters": [] + }, { "code": 357, "indent": 3, @@ -30870,7 +31325,7 @@ "イベントの追加", { "actorId": "12", - "event": "神父_母乳_02", + "event": "神父_母乳_2回目以降", "ero": "true" } ] @@ -30886,42 +31341,7 @@ "code": 657, "indent": 3, "parameters": [ - "イベント = 神父_母乳_02" - ] - }, - { - "code": 657, - "indent": 3, - "parameters": [ - "エロ？ = true" - ] - }, - { - "code": 357, - "indent": 3, - "parameters": [ - "Nore_Event", - "AddEvent", - "イベントの追加", - { - "actorId": "12", - "event": "神父_母乳_03", - "ero": "true" - } - ] - }, - { - "code": 657, - "indent": 3, - "parameters": [ - "actorId = 12" - ] - }, - { - "code": 657, - "indent": 3, - "parameters": [ - "イベント = 神父_母乳_03" + "イベント = 神父_母乳_2回目以降" ] }, { @@ -31641,7 +32061,7 @@ "parameters": [] } ], - "name": "", + "name": "授乳神父", "switchId": 1, "trigger": 0 }, @@ -44811,6 +45231,15 @@ 999 ] }, + { + "code": 121, + "indent": 0, + "parameters": [ + 243, + 243, + 0 + ] + }, { "code": 121, "indent": 0, @@ -46126,26 +46555,716 @@ { "id": 811, "list": [ + { + "code": 111, + "indent": 0, + "parameters": [ + 0, + 999, + 0 + ] + }, + { + "code": 201, + "indent": 1, + "parameters": [ + 0, + 104, + 11, + 10, + 8, + 2 + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 257, + 257, + 0 + ] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 6, + 6, + 1 + ] + }, + { + "code": 122, + "indent": 0, + "parameters": [ + 20, + 20, + 0, + 2, + 0, + 2 + ] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 1, + 20, + 0, + 0, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "神父_母乳_02" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = 神父_母乳_02" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 1, + 20, + 0, + 1, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "神父_母乳_03" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = 神父_母乳_03" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 1, + 20, + 0, + 2, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "神父_母乳_04" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = 神父_母乳_04" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 257, + 257, + 1 + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 894 + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 45 + ] + }, { "code": 0, "indent": 0, "parameters": [] } ], - "name": "", + "name": "授乳神父", "switchId": 1, "trigger": 0 }, { "id": 812, "list": [ + { + "code": 111, + "indent": 0, + "parameters": [ + 0, + 999, + 0 + ] + }, + { + "code": 121, + "indent": 1, + "parameters": [ + 11, + 11, + 1 + ] + }, + { + "code": 121, + "indent": 1, + "parameters": [ + 12, + 12, + 0 + ] + }, + { + "code": 117, + "indent": 1, + "parameters": [ + 24 + ] + }, + { + "code": 221, + "indent": 1, + "parameters": [] + }, + { + "code": 211, + "indent": 1, + "parameters": [ + 1 + ] + }, + { + "code": 201, + "indent": 1, + "parameters": [ + 0, + 25, + 32, + 31, + 8, + 2 + ] + }, + { + "code": 222, + "indent": 1, + "parameters": [] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 355, + "indent": 0, + "parameters": [ + "this.reco(794)" + ] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 0, + 894, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "チャラ男_授乳導入_02" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = チャラ男_授乳導入_02" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 411, + "indent": 0, + "parameters": [] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "チャラ男_授乳導入_01" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = チャラ男_授乳導入_01" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 245, + 245, + 0 + ] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 6, + 6, + 1 + ] + }, + { + "code": 122, + "indent": 0, + "parameters": [ + 18, + 18, + 0, + 0, + 4 + ] + }, + { + "code": 122, + "indent": 0, + "parameters": [ + 20, + 20, + 0, + 2, + 0, + 6 + ] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 1, + 20, + 0, + 0, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "チャラ男_授乳_01" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = チャラ男_授乳_01" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 1, + 20, + 0, + 1, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "チャラ男_授乳_02" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = チャラ男_授乳_02" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 1, + 20, + 0, + 2, + 0 + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "チャラ男_授乳_03" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = チャラ男_授乳_03" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 1, + 20, + 0, + 3, + 1 + ] + }, + { + "code": 355, + "indent": 1, + "parameters": [ + "$gameSystem.getEro(1).acme += 1" + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "チャラ男_授乳_04_イク" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = チャラ男_授乳_04_イク" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 245, + 245, + 1 + ] + }, + { + "code": 122, + "indent": 0, + "parameters": [ + 18, + 18, + 0, + 0, + 0 + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 900 + ] + }, + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_EroImg", + "ReleaseWebp", + "webpリリース", + { + "file": "01_35_1", + "file2": "", + "file3": "" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "file = 01_35_1" + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "file2 = " + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "file3 = " + ] + }, + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "チャラ男_授乳後_01" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "ファイル名 = チャラ男_授乳後_01" + ] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 71, + 71, + 0 + ] + }, + { + "code": 121, + "indent": 0, + "parameters": [ + 894, + 894, + 0 + ] + }, + { + "code": 355, + "indent": 0, + "parameters": [ + "$gameMedals.onJunyuuMan()" + ] + }, + { + "code": 122, + "indent": 0, + "parameters": [ + 16, + 16, + 0, + 0, + 853 + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 894 + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 45 + ] + }, { "code": 0, "indent": 0, "parameters": [] } ], - "name": "", + "name": "授乳マーク", "switchId": 1, "trigger": 0 }, @@ -55933,8 +57052,45 @@ "parameters": [] }, { - "code": 357, + "code": 111, "indent": 1, + "parameters": [ + 12, + "Math.random() < 0.5" + ] + }, + { + "code": 357, + "indent": 2, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "ショタ_授乳_イク_01" + } + ] + }, + { + "code": 657, + "indent": 2, + "parameters": [ + "ファイル名 = ショタ_授乳_イク_01" + ] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 411, + "indent": 1, + "parameters": [] + }, + { + "code": 357, + "indent": 2, "parameters": [ "Nore_Tes", "Run", @@ -55946,11 +57102,21 @@ }, { "code": 657, - "indent": 1, + "indent": 2, "parameters": [ "ファイル名 = ショタ_授乳_03_01" ] }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, { "code": 117, "indent": 1, @@ -56225,6 +57391,51 @@ "indent": 0, "parameters": [] }, + { + "code": 111, + "indent": 0, + "parameters": [ + 12, + "$gameActors.mainActor().boteId <= 2" + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_EroImg", + "IgnoreFile", + "画像無視", + { + "file": "01_35", + "index": "3" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "無視するファイルID = 01_35" + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "インデックス = 3" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 0, "indent": 0, @@ -60089,25 +61300,6 @@ 1 ] }, - { - "code": 357, - "indent": 0, - "parameters": [ - "Nore_Tes", - "Run", - "実行", - { - "id": "出産準備_カレン" - } - ] - }, - { - "code": 657, - "indent": 0, - "parameters": [ - "ファイル名 = 出産準備_カレン" - ] - }, { "code": 201, "indent": 0, @@ -60202,6 +61394,25 @@ "indent": 1, "parameters": [] }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "出産準備_カレン" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = 出産準備_カレン" + ] + }, { "code": 230, "indent": 1, @@ -63521,6 +64732,15 @@ { "id": 886, "list": [ + { + "code": 121, + "indent": 0, + "parameters": [ + 20, + 20, + 1 + ] + }, { "code": 357, "indent": 0, @@ -80329,51 +81549,6 @@ "acceId = 224" ] }, - { - "code": 111, - "indent": 0, - "parameters": [ - 12, - "! $gameActors.mainActor().hasAcce(208)" - ] - }, - { - "code": 357, - "indent": 1, - "parameters": [ - "Nore_EroImg", - "IgnoreFile", - "画像無視", - { - "file": "01_25", - "index": "5" - } - ] - }, - { - "code": 657, - "indent": 1, - "parameters": [ - "無視するファイルID = 01_25" - ] - }, - { - "code": 657, - "indent": 1, - "parameters": [ - "インデックス = 5" - ] - }, - { - "code": 0, - "indent": 1, - "parameters": [] - }, - { - "code": 412, - "indent": 0, - "parameters": [] - }, { "code": 121, "indent": 0, @@ -80423,6 +81598,58 @@ "ファイル名 = ero_01_25_01" ] }, + { + "code": 117, + "indent": 0, + "parameters": [ + 899 + ] + }, + { + "code": 111, + "indent": 0, + "parameters": [ + 12, + "! $gameActors.mainActor().hasAcce(208)" + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_EroImg", + "IgnoreFile", + "画像無視", + { + "file": "01_25", + "index": "5" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "無視するファイルID = 01_25" + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "インデックス = 5" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 117, "indent": 0, @@ -82006,6 +83233,13 @@ "$gameSystem.createEroInfo(27);" ] }, + { + "code": 117, + "indent": 0, + "parameters": [ + 899 + ] + }, { "code": 357, "indent": 0, @@ -92458,6 +93692,13 @@ "$gameActors.mainActor().sikyu().clearCurrentSeieki()" ] }, + { + "code": 355, + "indent": 0, + "parameters": [ + "this.reco(940)" + ] + }, { "code": 122, "indent": 0, @@ -95971,6 +97212,13 @@ "SceneManager.push(Nore.Scene_CaptureSave)" ] }, + { + "code": 355, + "indent": 0, + "parameters": [ + "this.reco(944)" + ] + }, { "code": 122, "indent": 0, @@ -97738,6 +98986,34 @@ 45 ] }, + { + "code": 111, + "indent": 0, + "parameters": [ + 12, + "$gameActors.mainActor().sikyu().taneoyaId > 0" + ] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_RogueResult", + "plusSyusanAuto", + "出産回数増加自動", + {} + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 357, "indent": 0, @@ -97747,7 +99023,7 @@ "出産回数増加", { "enemyId": "12", - "count": "12" + "count": "8" } ] }, @@ -97762,7 +99038,7 @@ "code": 657, "indent": 0, "parameters": [ - "回数 = 12" + "回数 = 8" ] }, { @@ -97782,7 +99058,7 @@ "出産回数増加", { "enemyId": "12", - "count": "2" + "count": "1" } ] }, @@ -97797,7 +99073,7 @@ "code": 657, "indent": 1, "parameters": [ - "回数 = 2" + "回数 = 1" ] }, { @@ -97988,6 +99264,13 @@ "boteId = 1" ] }, + { + "code": 355, + "indent": 0, + "parameters": [ + "$gameActors.mainActor().sikyu().taneoyaId = 0" + ] + }, { "code": 117, "indent": 0, @@ -102740,6 +104023,53 @@ 999 ] }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "2回目選択" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = 2回目選択" + ] + }, + { + "code": 111, + "indent": 1, + "parameters": [ + 0, + 20, + 0 + ] + }, + { + "code": 121, + "indent": 2, + "parameters": [ + 954, + 954, + 0 + ] + }, + { + "code": 0, + "indent": 2, + "parameters": [] + }, + { + "code": 412, + "indent": 1, + "parameters": [] + }, { "code": 117, "indent": 1, @@ -103023,8 +104353,17 @@ "parameters": [] }, { - "code": 357, + "code": 111, "indent": 0, + "parameters": [ + 0, + 954, + 1 + ] + }, + { + "code": 357, + "indent": 1, "parameters": [ "Nore_Tes", "Run", @@ -103036,11 +104375,50 @@ }, { "code": 657, - "indent": 0, + "indent": 1, "parameters": [ "ファイル名 = ero_02_03_02" ] }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 411, + "indent": 0, + "parameters": [] + }, + { + "code": 357, + "indent": 1, + "parameters": [ + "Nore_Tes", + "Run", + "実行", + { + "id": "ero_02_03_02_2回目以降" + } + ] + }, + { + "code": 657, + "indent": 1, + "parameters": [ + "ファイル名 = ero_02_03_02_2回目以降" + ] + }, + { + "code": 0, + "indent": 1, + "parameters": [] + }, + { + "code": 412, + "indent": 0, + "parameters": [] + }, { "code": 117, "indent": 0, @@ -112947,6 +114325,114 @@ 1 ] }, + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Cos", + "acceOff", + "アクセOFF", + { + "actorId": "1", + "acceId": "204" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "actorId = 1" + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "acceId = 204" + ] + }, + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Cos", + "acceOff", + "アクセOFF", + { + "actorId": "1", + "acceId": "225" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "actorId = 1" + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "acceId = 225" + ] + }, + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Cos", + "acceOff", + "アクセOFF", + { + "actorId": "1", + "acceId": "219" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "actorId = 1" + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "acceId = 219" + ] + }, + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Cos", + "acceOff", + "アクセOFF", + { + "actorId": "1", + "acceId": "257" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "actorId = 1" + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "acceId = 257" + ] + }, { "code": 355, "indent": 0, @@ -112954,13 +114440,6 @@ "$gameActors.mainActor().calcArmor()" ] }, - { - "code": 655, - "indent": 0, - "parameters": [ - "$gameActors.mainActor().acceMap = {}" - ] - }, { "code": 111, "indent": 0, diff --git a/data/Enemies.json b/data/Enemies.json index 1b8afe9..e993836 100644 --- a/data/Enemies.json +++ b/data/Enemies.json @@ -8543,6 +8543,20 @@ "conditionType": 0, "rating": 5, "skillId": 1 + }, + { + "skillId": 110, + "rating": 5, + "conditionType": 0, + "conditionParam1": 0, + "conditionParam2": 0 + }, + { + "skillId": 112, + "rating": 9, + "conditionType": 4, + "conditionParam1": 35, + "conditionParam2": 0 } ], "battlerHue": 0, @@ -8589,7 +8603,7 @@ ], "gold": 5, "name": "Balzac", - "note": "\n\n\n\n\n\n", + "note": "\n\n\n\n\n\n\n\n\n\n\n", "params": [ 94, 0, diff --git a/data/Map013.json b/data/Map013.json index 144deac..822fcf5 100644 --- a/data/Map013.json +++ b/data/Map013.json @@ -2499,17 +2499,10 @@ }, "list": [ { - "code": 117, + "code": 355, "indent": 0, "parameters": [ - 829 - ] - }, - { - "code": 117, - "indent": 0, - "parameters": [ - 213 + "this.reco(794)" ] }, { diff --git a/data/Map067.json b/data/Map067.json index b6ae332..b6cbc86 100644 --- a/data/Map067.json +++ b/data/Map067.json @@ -5887,6 +5887,16 @@ 0 ] }, + { + "code": 605, + "indent": 0, + "parameters": [ + 2, + 363, + 0, + 0 + ] + }, { "code": 0, "indent": 0, diff --git a/data/Map105.json b/data/Map105.json index 522a2ef..da9e0aa 100644 --- a/data/Map105.json +++ b/data/Map105.json @@ -9427,6 +9427,382 @@ ], "x": 16, "y": 18 + }, + { + "id": 24, + "name": "EV024", + "note": "", + "pages": [ + { + "conditions": { + "actorId": 1, + "actorValid": false, + "itemId": 1, + "itemValid": false, + "selfSwitchCh": "A", + "selfSwitchValid": false, + "switch1Id": 1, + "switch1Valid": false, + "switch2Id": 1, + "switch2Valid": false, + "variableId": 84, + "variableValid": true, + "variableValue": 5 + }, + "directionFix": true, + "image": { + "tileId": 0, + "characterName": "$baby01", + "direction": 2, + "pattern": 1, + "characterIndex": 0 + }, + "list": [ + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Ninshin", + "taneoyaName2", + "コレットの種親の名前を設定", + { + "count": "5" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "count = 5" + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 220 + ] + }, + { + "code": 123, + "indent": 0, + "parameters": [ + "A", + 0 + ] + }, + { + "code": 0, + "indent": 0, + "parameters": [] + } + ], + "moveFrequency": 3, + "moveRoute": { + "list": [ + { + "code": 0, + "parameters": [] + } + ], + "repeat": true, + "skippable": false, + "wait": false + }, + "moveSpeed": 3, + "moveType": 0, + "priorityType": 1, + "stepAnime": false, + "through": false, + "trigger": 0, + "walkAnime": true + } + ], + "x": 15, + "y": 8 + }, + { + "id": 25, + "name": "EV025", + "note": "", + "pages": [ + { + "conditions": { + "actorId": 1, + "actorValid": false, + "itemId": 1, + "itemValid": false, + "selfSwitchCh": "A", + "selfSwitchValid": false, + "switch1Id": 1, + "switch1Valid": false, + "switch2Id": 1, + "switch2Valid": false, + "variableId": 84, + "variableValid": true, + "variableValue": 6 + }, + "directionFix": true, + "image": { + "tileId": 0, + "characterName": "$baby01", + "direction": 2, + "pattern": 1, + "characterIndex": 0 + }, + "list": [ + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Ninshin", + "taneoyaName2", + "コレットの種親の名前を設定", + { + "count": "6" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "count = 6" + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 220 + ] + }, + { + "code": 123, + "indent": 0, + "parameters": [ + "A", + 0 + ] + }, + { + "code": 0, + "indent": 0, + "parameters": [] + } + ], + "moveFrequency": 3, + "moveRoute": { + "list": [ + { + "code": 0, + "parameters": [] + } + ], + "repeat": true, + "skippable": false, + "wait": false + }, + "moveSpeed": 3, + "moveType": 0, + "priorityType": 1, + "stepAnime": false, + "through": false, + "trigger": 0, + "walkAnime": true + } + ], + "x": 16, + "y": 8 + }, + { + "id": 26, + "name": "EV026", + "note": "", + "pages": [ + { + "conditions": { + "actorId": 1, + "actorValid": false, + "itemId": 1, + "itemValid": false, + "selfSwitchCh": "A", + "selfSwitchValid": false, + "switch1Id": 1, + "switch1Valid": false, + "switch2Id": 1, + "switch2Valid": false, + "variableId": 84, + "variableValid": true, + "variableValue": 7 + }, + "directionFix": true, + "image": { + "tileId": 0, + "characterName": "$baby01", + "direction": 2, + "pattern": 1, + "characterIndex": 0 + }, + "list": [ + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Ninshin", + "taneoyaName2", + "コレットの種親の名前を設定", + { + "count": "7" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "count = 7" + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 220 + ] + }, + { + "code": 123, + "indent": 0, + "parameters": [ + "A", + 0 + ] + }, + { + "code": 0, + "indent": 0, + "parameters": [] + } + ], + "moveFrequency": 3, + "moveRoute": { + "list": [ + { + "code": 0, + "parameters": [] + } + ], + "repeat": true, + "skippable": false, + "wait": false + }, + "moveSpeed": 3, + "moveType": 0, + "priorityType": 1, + "stepAnime": false, + "through": false, + "trigger": 0, + "walkAnime": true + } + ], + "x": 13, + "y": 8 + }, + { + "id": 27, + "name": "EV027", + "note": "", + "pages": [ + { + "conditions": { + "actorId": 1, + "actorValid": false, + "itemId": 1, + "itemValid": false, + "selfSwitchCh": "A", + "selfSwitchValid": false, + "switch1Id": 1, + "switch1Valid": false, + "switch2Id": 1, + "switch2Valid": false, + "variableId": 84, + "variableValid": true, + "variableValue": 8 + }, + "directionFix": true, + "image": { + "tileId": 0, + "characterName": "$baby01", + "direction": 2, + "pattern": 1, + "characterIndex": 0 + }, + "list": [ + { + "code": 357, + "indent": 0, + "parameters": [ + "Nore_Ninshin", + "taneoyaName2", + "コレットの種親の名前を設定", + { + "count": "8" + } + ] + }, + { + "code": 657, + "indent": 0, + "parameters": [ + "count = 8" + ] + }, + { + "code": 117, + "indent": 0, + "parameters": [ + 220 + ] + }, + { + "code": 123, + "indent": 0, + "parameters": [ + "A", + 0 + ] + }, + { + "code": 0, + "indent": 0, + "parameters": [] + } + ], + "moveFrequency": 3, + "moveRoute": { + "list": [ + { + "code": 0, + "parameters": [] + } + ], + "repeat": true, + "skippable": false, + "wait": false + }, + "moveSpeed": 3, + "moveType": 0, + "priorityType": 1, + "stepAnime": false, + "through": false, + "trigger": 0, + "walkAnime": true + } + ], + "x": 12, + "y": 8 } ] } \ No newline at end of file diff --git a/data/MapInfos.json b/data/MapInfos.json index 3db9105..07e46dd 100644 --- a/data/MapInfos.json +++ b/data/MapInfos.json @@ -60,8 +60,8 @@ "name": "Demon King's Castle Lowest Floor Defeat Event", "order": 110, "parentId": 97, - "scrollX": 703.5555555555555, - "scrollY": 872.8888888888889 + "scrollX": 1139, + "scrollY": 872.5 }, { "id": 8, @@ -69,8 +69,8 @@ "name": "Magic City Sodom", "order": 8, "parentId": 2, - "scrollX": 1005.7777777777778, - "scrollY": 995.5555555555555 + "scrollX": 997.5, + "scrollY": 1267.5 }, { "id": 9, @@ -115,7 +115,7 @@ "order": 1, "parentId": 0, "scrollX": 640.4444444444445, - "scrollY": 495.1111111111111 + "scrollY": 496 }, { "id": 14, @@ -141,8 +141,8 @@ "name": "Guild", "order": 10, "parentId": 8, - "scrollX": 640.4444444444445, - "scrollY": 623.1111111111111 + "scrollX": 1012.4444444444445, + "scrollY": 629.7777777777778 }, { "id": 17, @@ -222,8 +222,8 @@ "name": "Magic City Sodom", "order": 27, "parentId": 8, - "scrollX": 2122.222222222222, - "scrollY": 828.4444444444445 + "scrollX": 2192, + "scrollY": 856.5 }, { "id": 26, @@ -600,8 +600,8 @@ "name": "Suspicious Shop", "order": 25, "parentId": 8, - "scrollX": 943.5555555555555, - "scrollY": 628.4444444444445 + "scrollX": 1131, + "scrollY": 641.5 }, { "id": 68, @@ -681,7 +681,7 @@ "name": "Tower of Twilight 2F", "order": 86, "parentId": 71, - "scrollX": 640.4444444444445, + "scrollX": 640.8888888888889, "scrollY": 495.1111111111111 }, { @@ -807,8 +807,8 @@ "name": "Volcano 5F", "order": 102, "parentId": 81, - "scrollX": 1131.111111111111, - "scrollY": 943.1111111111111 + "scrollX": 1139, + "scrollY": 943.5 }, { "id": 91, @@ -816,8 +816,8 @@ "name": "Ending", "order": 119, "parentId": 0, - "scrollX": 640.4444444444445, - "scrollY": 495.1111111111111 + "scrollX": 1131, + "scrollY": 633.5 }, { "id": 92, @@ -933,8 +933,8 @@ "name": "Church", "order": 28, "parentId": 8, - "scrollX": 1005.3333333333334, - "scrollY": 641.3333333333334 + "scrollX": 1006.5, + "scrollY": 642.5 }, { "id": 105, @@ -1014,8 +1014,8 @@ "name": "MAP113", "order": 123, "parentId": 0, - "scrollX": 0, - "scrollY": 0 + "scrollX": 1131, + "scrollY": 633.5 }, { "id": 114, @@ -1041,8 +1041,8 @@ "name": "Item 2F ", "order": 100, "parentId": 81, - "scrollX": 1104, - "scrollY": 684 + "scrollX": 1131.5555555555557, + "scrollY": 684.4444444444445 }, { "id": 117, diff --git a/data/Skills.json b/data/Skills.json index 353bae0..3036913 100644 --- a/data/Skills.json +++ b/data/Skills.json @@ -986,7 +986,7 @@ }, { "id": 28, - "animationId": 68, + "animationId": 2, "damage": { "critical": true, "elementId": -1, @@ -1009,7 +1009,7 @@ "message2": "", "mpCost": 0, "name": "Tail", - "note": "\n\n\n\n\n\n", + "note": "\n\n\n\n\n\n", "occasion": 1, "repeats": 1, "requiredWtypeId1": 0, diff --git a/data/System.json b/data/System.json index 8eb2292..da330f8 100644 --- a/data/System.json +++ b/data/System.json @@ -124,7 +124,7 @@ "pitch": 100, "volume": 90 }, - "editMapId": 25, + "editMapId": 67, "elements": [ "", "物理", @@ -149,7 +149,7 @@ "Groin", "" ], - "gameTitle": "Lewd Fallen Hero Karen ver1.03", + "gameTitle": "Lewd Fallen Hero Karen ver1.12", "gameoverMe": { "name": "Gameover1", "pan": 0, @@ -612,7 +612,7 @@ "エリス会話3", "火山最上階の会話終わり", "エリス会話4", - "", + "back4を表示", "宵闇クリア？", "性癖ウィンドウ左", "", @@ -1249,7 +1249,7 @@ "", "", "", - "", + "マーク授乳", "", "エロ_829", "エロ_830", @@ -1647,7 +1647,7 @@ "", "", "不明出産回数", - "", + "授乳乱数", "", "", "", @@ -1748,7 +1748,7 @@ "", "" ], - "versionId": 49251957, + "versionId": 14960015, "victoryMe": { "name": "Victory1", "pan": 0, diff --git a/img/ero/ero01_35_1.json b/img/ero/ero01_35_1.json index af25884..82d41a9 100644 --- a/img/ero/ero01_35_1.json +++ b/img/ero/ero01_35_1.json @@ -2,15 +2,15 @@ "01_35_01_01.png": { - "frame": {"x":875,"y":2304,"w":685,"h":768}, - "rotated": false, + "frame": {"x":2979,"y":2195,"w":685,"h":768}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":295,"y":0,"w":685,"h":768}, "sourceSize": {"w":1366,"h":768} }, "01_35_01_03.png": { - "frame": {"x":2241,"y":1536,"w":478,"h":144}, + "frame": {"x":1760,"y":2304,"w":478,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":386,"y":624,"w":478,"h":144}, @@ -18,15 +18,15 @@ }, "01_35_01_04.png": { - "frame": {"x":2537,"y":2228,"w":326,"h":139}, - "rotated": true, + "frame": {"x":2584,"y":2577,"w":326,"h":139}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":426,"y":461,"w":326,"h":139}, "sourceSize": {"w":1366,"h":768} }, "01_35_01_05.png": { - "frame": {"x":2539,"y":2074,"w":70,"h":82}, + "frame": {"x":0,"y":3072,"w":70,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":665,"y":532,"w":70,"h":82}, @@ -34,7 +34,7 @@ }, "01_35_01_06.png": { - "frame": {"x":958,"y":3234,"w":90,"h":49}, + "frame": {"x":2315,"y":3064,"w":90,"h":49}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":653,"y":455,"w":90,"h":49}, @@ -42,15 +42,23 @@ }, "01_35_02_01.png": { - "frame": {"x":1560,"y":2304,"w":685,"h":768}, - "rotated": false, + "frame": {"x":2979,"y":2195,"w":685,"h":768}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":295,"y":0,"w":685,"h":768}, "sourceSize": {"w":1366,"h":768} }, +"01_35_02_02.png": +{ + "frame": {"x":3717,"y":1186,"w":279,"h":252}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":485,"y":54,"w":279,"h":252}, + "sourceSize": {"w":1366,"h":768} +}, "01_35_02_03.png": { - "frame": {"x":2241,"y":1536,"w":478,"h":144}, + "frame": {"x":1760,"y":2304,"w":478,"h":144}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":386,"y":624,"w":478,"h":144}, @@ -58,15 +66,15 @@ }, "01_35_02_04.png": { - "frame": {"x":1560,"y":2304,"w":685,"h":768}, + "frame": {"x":2584,"y":2577,"w":326,"h":139}, "rotated": false, "trimmed": true, - "spriteSourceSize": {"x":295,"y":0,"w":685,"h":768}, + "spriteSourceSize": {"x":426,"y":461,"w":326,"h":139}, "sourceSize": {"w":1366,"h":768} }, "01_35_02_05.png": { - "frame": {"x":2539,"y":2074,"w":70,"h":82}, + "frame": {"x":0,"y":3072,"w":70,"h":82}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":665,"y":532,"w":70,"h":82}, @@ -74,7 +82,151 @@ }, "01_35_02_06.png": { - "frame": {"x":958,"y":3234,"w":90,"h":49}, + "frame": {"x":2315,"y":3064,"w":90,"h":49}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":653,"y":455,"w":90,"h":49}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_03_01.png": +{ + "frame": {"x":2979,"y":2195,"w":685,"h":768}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":295,"y":0,"w":685,"h":768}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_03_02.png": +{ + "frame": {"x":3717,"y":1465,"w":279,"h":252}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":485,"y":54,"w":279,"h":252}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_03_03.png": +{ + "frame": {"x":1760,"y":2304,"w":478,"h":144}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":386,"y":624,"w":478,"h":144}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_03_04.png": +{ + "frame": {"x":2584,"y":2577,"w":326,"h":139}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":426,"y":461,"w":326,"h":139}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_03_05.png": +{ + "frame": {"x":0,"y":3072,"w":70,"h":82}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":665,"y":532,"w":70,"h":82}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_03_06.png": +{ + "frame": {"x":2315,"y":3064,"w":90,"h":49}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":653,"y":455,"w":90,"h":49}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_04_01.png": +{ + "frame": {"x":2979,"y":2195,"w":685,"h":768}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":295,"y":0,"w":685,"h":768}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_04_02.png": +{ + "frame": {"x":3717,"y":1744,"w":279,"h":252}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":485,"y":54,"w":279,"h":252}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_04_03.png": +{ + "frame": {"x":1760,"y":2304,"w":478,"h":144}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":386,"y":624,"w":478,"h":144}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_04_04.png": +{ + "frame": {"x":2584,"y":2577,"w":326,"h":139}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":426,"y":461,"w":326,"h":139}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_04_05.png": +{ + "frame": {"x":0,"y":3072,"w":70,"h":82}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":665,"y":532,"w":70,"h":82}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_04_06.png": +{ + "frame": {"x":2315,"y":3064,"w":90,"h":49}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":653,"y":455,"w":90,"h":49}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_05_01.png": +{ + "frame": {"x":2979,"y":2195,"w":685,"h":768}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":295,"y":0,"w":685,"h":768}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_05_02.png": +{ + "frame": {"x":3747,"y":2023,"w":279,"h":252}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":485,"y":54,"w":279,"h":252}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_05_03.png": +{ + "frame": {"x":1760,"y":2304,"w":478,"h":144}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":386,"y":624,"w":478,"h":144}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_05_04.png": +{ + "frame": {"x":2584,"y":2577,"w":326,"h":139}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":426,"y":461,"w":326,"h":139}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_05_05.png": +{ + "frame": {"x":0,"y":3072,"w":70,"h":82}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":665,"y":532,"w":70,"h":82}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_05_06.png": +{ + "frame": {"x":2315,"y":3064,"w":90,"h":49}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":653,"y":455,"w":90,"h":49}, @@ -90,15 +242,15 @@ }, "01_35_11_04.png": { - "frame": {"x":990,"y":3072,"w":346,"h":162}, - "rotated": false, + "frame": {"x":3828,"y":788,"w":346,"h":162}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":414,"y":472,"w":346,"h":162}, "sourceSize": {"w":1366,"h":768} }, "01_35_11_05.png": { - "frame": {"x":2018,"y":3072,"w":304,"h":160}, + "frame": {"x":2522,"y":2716,"w":304,"h":160}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":414,"y":472,"w":304,"h":160}, @@ -106,7 +258,7 @@ }, "01_35_11_06.png": { - "frame": {"x":958,"y":3234,"w":90,"h":49}, + "frame": {"x":2315,"y":3064,"w":90,"h":49}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":653,"y":475,"w":90,"h":49}, @@ -122,15 +274,15 @@ }, "01_35_12_04.png": { - "frame": {"x":990,"y":3072,"w":346,"h":162}, - "rotated": false, + "frame": {"x":3828,"y":788,"w":346,"h":162}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":414,"y":472,"w":346,"h":162}, "sourceSize": {"w":1366,"h":768} }, "01_35_12_05.png": { - "frame": {"x":2018,"y":3072,"w":304,"h":160}, + "frame": {"x":2522,"y":2716,"w":304,"h":160}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":414,"y":472,"w":304,"h":160}, @@ -138,7 +290,7 @@ }, "01_35_12_06.png": { - "frame": {"x":958,"y":3234,"w":90,"h":49}, + "frame": {"x":2315,"y":3064,"w":90,"h":49}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":653,"y":475,"w":90,"h":49}, @@ -154,23 +306,23 @@ }, "01_35_13_02.png": { - "frame": {"x":2322,"y":3006,"w":264,"h":236}, - "rotated": false, + "frame": {"x":3747,"y":2302,"w":264,"h":236}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":512,"y":84,"w":264,"h":236}, "sourceSize": {"w":1366,"h":768} }, "01_35_13_04.png": { - "frame": {"x":990,"y":3072,"w":346,"h":162}, - "rotated": false, + "frame": {"x":3828,"y":788,"w":346,"h":162}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":414,"y":472,"w":346,"h":162}, "sourceSize": {"w":1366,"h":768} }, "01_35_13_05.png": { - "frame": {"x":2018,"y":3072,"w":304,"h":160}, + "frame": {"x":2522,"y":2716,"w":304,"h":160}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":414,"y":472,"w":304,"h":160}, @@ -178,7 +330,7 @@ }, "01_35_13_06.png": { - "frame": {"x":958,"y":3234,"w":90,"h":49}, + "frame": {"x":2315,"y":3064,"w":90,"h":49}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":653,"y":475,"w":90,"h":49}, @@ -186,7 +338,7 @@ }, "01_35_21_01.png": { - "frame": {"x":1366,"y":0,"w":1366,"h":768}, + "frame": {"x":0,"y":0,"w":1366,"h":768}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, @@ -194,15 +346,15 @@ }, "01_35_21_04.png": { - "frame": {"x":626,"y":3072,"w":364,"h":156}, - "rotated": false, + "frame": {"x":3672,"y":822,"w":364,"h":156}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":516,"y":612,"w":364,"h":156}, "sourceSize": {"w":1366,"h":768} }, "01_35_21_05.png": { - "frame": {"x":626,"y":3228,"w":280,"h":94}, + "frame": {"x":1163,"y":3042,"w":280,"h":94}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":550,"y":641,"w":280,"h":94}, @@ -210,8 +362,8 @@ }, "01_35_21_06.png": { - "frame": {"x":906,"y":3228,"w":96,"h":52}, - "rotated": true, + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, "sourceSize": {"w":1366,"h":768} @@ -226,7 +378,7 @@ }, "01_35_22_04.png": { - "frame": {"x":1682,"y":3072,"w":336,"h":156}, + "frame": {"x":2584,"y":2421,"w":336,"h":156}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":544,"y":612,"w":336,"h":156}, @@ -234,16 +386,16 @@ }, "01_35_22_05.png": { - "frame": {"x":2586,"y":2859,"w":288,"h":103}, - "rotated": true, + "frame": {"x":875,"y":3042,"w":288,"h":103}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":542,"y":632,"w":288,"h":103}, "sourceSize": {"w":1366,"h":768} }, "01_35_22_06.png": { - "frame": {"x":906,"y":3228,"w":96,"h":52}, - "rotated": true, + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, "sourceSize": {"w":1366,"h":768} @@ -258,7 +410,7 @@ }, "01_35_23_02.png": { - "frame": {"x":2245,"y":2228,"w":292,"h":250}, + "frame": {"x":2230,"y":2580,"w":292,"h":250}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, @@ -266,7 +418,7 @@ }, "01_35_23_04.png": { - "frame": {"x":1336,"y":3072,"w":346,"h":159}, + "frame": {"x":2238,"y":2421,"w":346,"h":159}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, @@ -274,16 +426,16 @@ }, "01_35_23_05.png": { - "frame": {"x":2537,"y":2554,"w":305,"h":124}, - "rotated": true, + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, "sourceSize": {"w":1366,"h":768} }, "01_35_23_06.png": { - "frame": {"x":906,"y":3228,"w":96,"h":52}, - "rotated": true, + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, "sourceSize": {"w":1366,"h":768} @@ -298,7 +450,7 @@ }, "01_35_24_02.png": { - "frame": {"x":2245,"y":2228,"w":292,"h":250}, + "frame": {"x":2230,"y":2580,"w":292,"h":250}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, @@ -306,7 +458,7 @@ }, "01_35_24_03.png": { - "frame": {"x":2245,"y":2728,"w":250,"h":278}, + "frame": {"x":2065,"y":2876,"w":250,"h":278}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":364,"y":484,"w":250,"h":278}, @@ -314,7 +466,7 @@ }, "01_35_24_04.png": { - "frame": {"x":1336,"y":3072,"w":346,"h":159}, + "frame": {"x":2238,"y":2421,"w":346,"h":159}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, @@ -322,16 +474,16 @@ }, "01_35_24_05.png": { - "frame": {"x":2537,"y":2554,"w":305,"h":124}, - "rotated": true, + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, "sourceSize": {"w":1366,"h":768} }, "01_35_24_06.png": { - "frame": {"x":906,"y":3228,"w":96,"h":52}, - "rotated": true, + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, "sourceSize": {"w":1366,"h":768} @@ -346,7 +498,7 @@ }, "01_35_25_02.png": { - "frame": {"x":2245,"y":2228,"w":292,"h":250}, + "frame": {"x":2230,"y":2580,"w":292,"h":250}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, @@ -354,7 +506,7 @@ }, "01_35_25_03.png": { - "frame": {"x":0,"y":3072,"w":252,"h":232}, + "frame": {"x":3747,"y":2566,"w":252,"h":232}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":352,"y":510,"w":252,"h":232}, @@ -362,7 +514,7 @@ }, "01_35_25_04.png": { - "frame": {"x":1336,"y":3072,"w":346,"h":159}, + "frame": {"x":2238,"y":2421,"w":346,"h":159}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, @@ -370,16 +522,16 @@ }, "01_35_25_05.png": { - "frame": {"x":2537,"y":2554,"w":305,"h":124}, - "rotated": true, + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, "sourceSize": {"w":1366,"h":768} }, "01_35_25_06.png": { - "frame": {"x":906,"y":3228,"w":96,"h":52}, - "rotated": true, + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, "sourceSize": {"w":1366,"h":768} @@ -394,7 +546,7 @@ }, "01_35_26_02.png": { - "frame": {"x":2245,"y":2478,"w":292,"h":250}, + "frame": {"x":2519,"y":2876,"w":292,"h":250}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, @@ -402,7 +554,7 @@ }, "01_35_26_03.png": { - "frame": {"x":0,"y":3072,"w":252,"h":232}, + "frame": {"x":3747,"y":2566,"w":252,"h":232}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":352,"y":510,"w":252,"h":232}, @@ -410,7 +562,7 @@ }, "01_35_26_04.png": { - "frame": {"x":1336,"y":3072,"w":346,"h":159}, + "frame": {"x":2238,"y":2421,"w":346,"h":159}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, @@ -418,39 +570,247 @@ }, "01_35_26_05.png": { - "frame": {"x":2537,"y":2554,"w":305,"h":124}, - "rotated": true, + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, "sourceSize": {"w":1366,"h":768} }, "01_35_26_06.png": { - "frame": {"x":906,"y":3228,"w":96,"h":52}, - "rotated": true, + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, "trimmed": true, "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, "sourceSize": {"w":1366,"h":768} }, -"01_35_101_01.png": +"01_35_27_01.png": { - "frame": {"x":0,"y":0,"w":1366,"h":768}, + "frame": {"x":0,"y":768,"w":1366,"h":768}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, "sourceSize": {"w":1366,"h":768} }, +"01_35_27_02.png": +{ + "frame": {"x":2811,"y":2880,"w":292,"h":250}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_27_03.png": +{ + "frame": {"x":3747,"y":2566,"w":252,"h":232}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":352,"y":510,"w":252,"h":232}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_27_04.png": +{ + "frame": {"x":2238,"y":2421,"w":346,"h":159}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_27_05.png": +{ + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_27_06.png": +{ + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_28_01.png": +{ + "frame": {"x":0,"y":768,"w":1366,"h":768}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_28_02.png": +{ + "frame": {"x":3103,"y":2880,"w":292,"h":250}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_28_03.png": +{ + "frame": {"x":3747,"y":2566,"w":252,"h":232}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":352,"y":510,"w":252,"h":232}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_28_04.png": +{ + "frame": {"x":2238,"y":2421,"w":346,"h":159}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_28_05.png": +{ + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_28_06.png": +{ + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_29_01.png": +{ + "frame": {"x":0,"y":768,"w":1366,"h":768}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_29_02.png": +{ + "frame": {"x":3395,"y":2880,"w":292,"h":250}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_29_03.png": +{ + "frame": {"x":3747,"y":2566,"w":252,"h":232}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":352,"y":510,"w":252,"h":232}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_29_04.png": +{ + "frame": {"x":2238,"y":2421,"w":346,"h":159}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_29_05.png": +{ + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_29_06.png": +{ + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_29_07.png": +{ + "frame": {"x":2315,"y":2830,"w":204,"h":234}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":388,"y":524,"w":204,"h":234}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_30_01.png": +{ + "frame": {"x":0,"y":768,"w":1366,"h":768}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_30_02.png": +{ + "frame": {"x":3687,"y":2880,"w":292,"h":250}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":588,"y":182,"w":292,"h":250}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_30_03.png": +{ + "frame": {"x":3747,"y":2566,"w":252,"h":232}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":352,"y":510,"w":252,"h":232}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_30_04.png": +{ + "frame": {"x":2238,"y":2421,"w":346,"h":159}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":534,"y":609,"w":346,"h":159}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_30_05.png": +{ + "frame": {"x":1760,"y":2996,"w":305,"h":124}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":525,"y":611,"w":305,"h":124}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_30_06.png": +{ + "frame": {"x":3828,"y":1134,"w":96,"h":52}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":761,"y":592,"w":96,"h":52}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_30_07.png": +{ + "frame": {"x":2315,"y":2830,"w":204,"h":234}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":388,"y":524,"w":204,"h":234}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_101_01.png": +{ + "frame": {"x":2979,"y":1366,"w":829,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":281,"y":30,"w":829,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, "01_35_101_04.png": { - "frame": {"x":232,"y":3072,"w":394,"h":172}, - "rotated": false, + "frame": {"x":3798,"y":0,"w":394,"h":172}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, "sourceSize": {"w":1366,"h":768} }, "01_35_101_05.png": { - "frame": {"x":2539,"y":1680,"w":394,"h":172}, + "frame": {"x":2058,"y":2448,"w":394,"h":172}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, @@ -458,15 +818,15 @@ }, "01_35_102_01.png": { - "frame": {"x":0,"y":0,"w":1366,"h":768}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, + "frame": {"x":2979,"y":1366,"w":829,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":281,"y":30,"w":829,"h":738}, "sourceSize": {"w":1366,"h":768} }, "01_35_102_02.png": { - "frame": {"x":2241,"y":1680,"w":298,"h":274}, + "frame": {"x":3500,"y":0,"w":298,"h":274}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, @@ -474,15 +834,15 @@ }, "01_35_102_04.png": { - "frame": {"x":232,"y":3072,"w":394,"h":172}, - "rotated": false, + "frame": {"x":3798,"y":0,"w":394,"h":172}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, "sourceSize": {"w":1366,"h":768} }, "01_35_102_05.png": { - "frame": {"x":2539,"y":1680,"w":394,"h":172}, + "frame": {"x":2058,"y":2448,"w":394,"h":172}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, @@ -490,15 +850,15 @@ }, "01_35_103_01.png": { - "frame": {"x":0,"y":0,"w":1366,"h":768}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, + "frame": {"x":2979,"y":1366,"w":829,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":281,"y":30,"w":829,"h":738}, "sourceSize": {"w":1366,"h":768} }, "01_35_103_02.png": { - "frame": {"x":2241,"y":1954,"w":298,"h":274}, + "frame": {"x":1760,"y":2448,"w":298,"h":274}, "rotated": false, "trimmed": true, "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, @@ -506,15 +866,351 @@ }, "01_35_103_04.png": { - "frame": {"x":232,"y":3072,"w":394,"h":172}, - "rotated": false, + "frame": {"x":3798,"y":0,"w":394,"h":172}, + "rotated": true, "trimmed": true, "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, "sourceSize": {"w":1366,"h":768} }, "01_35_103_05.png": { - "frame": {"x":2539,"y":1680,"w":394,"h":172}, + "frame": {"x":2058,"y":2448,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_104_01.png": +{ + "frame": {"x":2979,"y":1366,"w":829,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":281,"y":30,"w":829,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_104_02.png": +{ + "frame": {"x":3500,"y":274,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_104_04.png": +{ + "frame": {"x":3798,"y":0,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_104_05.png": +{ + "frame": {"x":2058,"y":2448,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_105_01.png": +{ + "frame": {"x":2979,"y":1366,"w":829,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":281,"y":30,"w":829,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_105_02.png": +{ + "frame": {"x":1760,"y":2722,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_105_04.png": +{ + "frame": {"x":3798,"y":0,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_105_05.png": +{ + "frame": {"x":2058,"y":2448,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_106_01.png": +{ + "frame": {"x":2979,"y":1366,"w":829,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":281,"y":30,"w":829,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_106_02.png": +{ + "frame": {"x":3500,"y":548,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_106_04.png": +{ + "frame": {"x":3798,"y":0,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_106_05.png": +{ + "frame": {"x":2058,"y":2448,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_111_01.png": +{ + "frame": {"x":875,"y":2304,"w":885,"h":738}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_111_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_111_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_112_01.png": +{ + "frame": {"x":875,"y":2304,"w":885,"h":738}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_112_02.png": +{ + "frame": {"x":3500,"y":0,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_112_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_112_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_113_01.png": +{ + "frame": {"x":875,"y":2304,"w":885,"h":738}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_113_02.png": +{ + "frame": {"x":1760,"y":2448,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_113_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_113_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_114_01.png": +{ + "frame": {"x":875,"y":2304,"w":885,"h":738}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_114_02.png": +{ + "frame": {"x":3500,"y":274,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_114_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_114_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_115_01.png": +{ + "frame": {"x":875,"y":2304,"w":885,"h":738}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_115_02.png": +{ + "frame": {"x":1760,"y":2722,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_115_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_115_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_116_01.png": +{ + "frame": {"x":875,"y":2304,"w":885,"h":738}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_116_02.png": +{ + "frame": {"x":3500,"y":548,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_116_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_116_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_121_01.png": +{ + "frame": {"x":2241,"y":1536,"w":885,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_121_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_121_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_122_01.png": +{ + "frame": {"x":2241,"y":1536,"w":885,"h":738}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":225,"y":30,"w":885,"h":738}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_122_02.png": +{ + "frame": {"x":3500,"y":274,"w":298,"h":274}, + "rotated": false, + "trimmed": true, + "spriteSourceSize": {"x":578,"y":148,"w":298,"h":274}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_122_04.png": +{ + "frame": {"x":3500,"y":822,"w":394,"h":172}, + "rotated": true, + "trimmed": true, + "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_122_05.png": +{ + "frame": {"x":3798,"y":394,"w":394,"h":172}, "rotated": true, "trimmed": true, "spriteSourceSize": {"x":506,"y":594,"w":394,"h":172}, @@ -522,7 +1218,7 @@ }, "01_35_back.png": { - "frame": {"x":1366,"y":768,"w":1366,"h":768}, + "frame": {"x":1366,"y":0,"w":1366,"h":768}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, @@ -535,30 +1231,65 @@ "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, "sourceSize": {"w":1366,"h":768} +}, +"01_35_back3.png": +{ + "frame": {"x":1366,"y":768,"w":1366,"h":768}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, + "sourceSize": {"w":1366,"h":768} +}, +"01_35_back4.png": +{ + "frame": {"x":2732,"y":0,"w":1366,"h":768}, + "rotated": true, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":1366,"h":768}, + "sourceSize": {"w":1366,"h":768} }}, "animations": { "01_35_01": ["01_35_01_01.png","01_35_01_03.png","01_35_01_04.png","01_35_01_05.png","01_35_01_06.png"], - "01_35_02": ["01_35_02_01.png","01_35_02_03.png","01_35_02_04.png","01_35_02_05.png","01_35_02_06.png"], + "01_35_02": ["01_35_02_01.png","01_35_02_02.png","01_35_02_03.png","01_35_02_04.png","01_35_02_05.png","01_35_02_06.png"], + "01_35_03": ["01_35_03_01.png","01_35_03_02.png","01_35_03_03.png","01_35_03_04.png","01_35_03_05.png","01_35_03_06.png"], + "01_35_04": ["01_35_04_01.png","01_35_04_02.png","01_35_04_03.png","01_35_04_04.png","01_35_04_05.png","01_35_04_06.png"], + "01_35_05": ["01_35_05_01.png","01_35_05_02.png","01_35_05_03.png","01_35_05_04.png","01_35_05_05.png","01_35_05_06.png"], "01_35_101": ["01_35_101_01.png","01_35_101_04.png","01_35_101_05.png"], "01_35_102": ["01_35_102_01.png","01_35_102_02.png","01_35_102_04.png","01_35_102_05.png"], "01_35_103": ["01_35_103_01.png","01_35_103_02.png","01_35_103_04.png","01_35_103_05.png"], + "01_35_104": ["01_35_104_01.png","01_35_104_02.png","01_35_104_04.png","01_35_104_05.png"], + "01_35_105": ["01_35_105_01.png","01_35_105_02.png","01_35_105_04.png","01_35_105_05.png"], + "01_35_106": ["01_35_106_01.png","01_35_106_02.png","01_35_106_04.png","01_35_106_05.png"], "01_35_11": ["01_35_11_01.png","01_35_11_04.png","01_35_11_05.png","01_35_11_06.png"], + "01_35_111": ["01_35_111_01.png","01_35_111_04.png","01_35_111_05.png"], + "01_35_112": ["01_35_112_01.png","01_35_112_02.png","01_35_112_04.png","01_35_112_05.png"], + "01_35_113": ["01_35_113_01.png","01_35_113_02.png","01_35_113_04.png","01_35_113_05.png"], + "01_35_114": ["01_35_114_01.png","01_35_114_02.png","01_35_114_04.png","01_35_114_05.png"], + "01_35_115": ["01_35_115_01.png","01_35_115_02.png","01_35_115_04.png","01_35_115_05.png"], + "01_35_116": ["01_35_116_01.png","01_35_116_02.png","01_35_116_04.png","01_35_116_05.png"], "01_35_12": ["01_35_12_01.png","01_35_12_04.png","01_35_12_05.png","01_35_12_06.png"], + "01_35_121": ["01_35_121_01.png","01_35_121_04.png","01_35_121_05.png"], + "01_35_122": ["01_35_122_01.png","01_35_122_02.png","01_35_122_04.png","01_35_122_05.png"], "01_35_13": ["01_35_13_01.png","01_35_13_02.png","01_35_13_04.png","01_35_13_05.png","01_35_13_06.png"], "01_35_21": ["01_35_21_01.png","01_35_21_04.png","01_35_21_05.png","01_35_21_06.png"], "01_35_22": ["01_35_22_01.png","01_35_22_04.png","01_35_22_05.png","01_35_22_06.png"], "01_35_23": ["01_35_23_01.png","01_35_23_02.png","01_35_23_04.png","01_35_23_05.png","01_35_23_06.png"], "01_35_24": ["01_35_24_01.png","01_35_24_02.png","01_35_24_03.png","01_35_24_04.png","01_35_24_05.png","01_35_24_06.png"], "01_35_25": ["01_35_25_01.png","01_35_25_02.png","01_35_25_03.png","01_35_25_04.png","01_35_25_05.png","01_35_25_06.png"], - "01_35_26": ["01_35_26_01.png","01_35_26_02.png","01_35_26_03.png","01_35_26_04.png","01_35_26_05.png","01_35_26_06.png"] + "01_35_26": ["01_35_26_01.png","01_35_26_02.png","01_35_26_03.png","01_35_26_04.png","01_35_26_05.png","01_35_26_06.png"], + "01_35_27": ["01_35_27_01.png","01_35_27_02.png","01_35_27_03.png","01_35_27_04.png","01_35_27_05.png","01_35_27_06.png"], + "01_35_28": ["01_35_28_01.png","01_35_28_02.png","01_35_28_03.png","01_35_28_04.png","01_35_28_05.png","01_35_28_06.png"], + "01_35_29": ["01_35_29_01.png","01_35_29_02.png","01_35_29_03.png","01_35_29_04.png","01_35_29_05.png","01_35_29_06.png","01_35_29_07.png"], + "01_35_30": ["01_35_30_01.png","01_35_30_02.png","01_35_30_03.png","01_35_30_04.png","01_35_30_05.png","01_35_30_06.png","01_35_30_07.png"], + "01_35_back": ["01_35_back2.png","01_35_back3.png","01_35_back4.png"] }, "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "1.0", "image": "ero01_35_1.webp", "format": "RGBA8888", - "size": {"w":2732,"h":3324}, + "size": {"w":3999,"h":3154}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:6b5239b88e1e1dc5599d49bf05c7d642:16a974f4b7d91ea6c78797ec1866079e:f355e91714e466b9f3ff4f4440feeb2d$" + "smartupdate": "$TexturePacker:SmartUpdate:d49a229be279b714589dd7e071f08fe1:c734f9e4a6825ace6a0d0616f5c749ac:f355e91714e466b9f3ff4f4440feeb2d$" } } diff --git a/img/tachie/actor05.json b/img/tachie/actor05.json index e0588fa..fde0d1a 100644 --- a/img/tachie/actor05.json +++ b/img/tachie/actor05.json @@ -186,6 +186,6 @@ "format": "RGBA8888", "size": {"w":1039,"h":945}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:4e27480627b126442d07062c15884845:4e0de24e22bd13523d721662daadcd89:d9f9a0a6ddb7caef8925ed490456bb4b$" + "smartupdate": "$TexturePacker:SmartUpdate:32141c00bcacb88e0554d89e1eb2cc30:328d65dde1d9f005056f686f14d5490c:d9f9a0a6ddb7caef8925ed490456bb4b$" } } diff --git a/js/plugins/Nore_EroImg.js b/js/plugins/Nore_EroImg.js index 83e85a2..d6d2754 100644 --- a/js/plugins/Nore_EroImg.js +++ b/js/plugins/Nore_EroImg.js @@ -226,7 +226,10 @@ var Nore; Sprite_Picture.prototype.drawEro = function (file) { var renderTexture = $gameTemp.getActorBitmapBodyCache(this._pictureId); var s = new PIXI.Sprite(); - if ($gameSwitches.value(250)) { + if ($gameSwitches.value(257)) { + this.drawEro2(s, file.substr(0, 6) + 'back4'); + } + else if ($gameSwitches.value(250)) { this.drawEro2(s, file.substr(0, 6) + 'back3'); } else if ($gameSwitches.value(245)) { diff --git a/js/plugins/Nore_EroStatus.js b/js/plugins/Nore_EroStatus.js index c09a5de..db1f6ad 100644 --- a/js/plugins/Nore_EroStatus.js +++ b/js/plugins/Nore_EroStatus.js @@ -77,9 +77,32 @@ var Nore; this._window.refresh(); } else { + if (acceId == 221) { + this.changeFutanari(acceId); + return; + } SoundManager.playBuzzer(); } }; + Scene_EroStatus.prototype.changeFutanari = function (acceId) { + if (!$gameSwitches.value(240)) { + SoundManager.playBuzzer(); + return; + } + var actor = $gameActors.mainActor(); + if (actor.hasAcce(acceId)) { + actor.removeAcce(acceId); + } + else { + actor.addAcce(acceId); + actor.removeAcce(220); // タイツ + actor.setInnerBottomId('a'); + if (actor.outerBottomId == 'c') { + actor.setOuterBottomId('a'); + } + } + this._window.refresh(); + }; Scene_EroStatus.prototype.createHelpWindow = function () { var rect = this.helpWindowRect(); this._helpWindow = new Window_HelpBig(rect); @@ -105,7 +128,7 @@ var Nore; }(Scene_MenuBase)); Nore.Scene_EroStatus = Scene_EroStatus; function findEroItem(before) { - for (var i = 881; i <= 900; i++) { + for (var i = 880; i <= 900; i++) { var armor = $dataArmors[i]; if (armor && (parseInt(armor.meta['before']) == before)) { return armor; diff --git a/js/plugins/Nore_Ninshin.js b/js/plugins/Nore_Ninshin.js index 23c7a5a..132a432 100644 --- a/js/plugins/Nore_Ninshin.js +++ b/js/plugins/Nore_Ninshin.js @@ -136,6 +136,9 @@ var Nore; case 3: enemyId = 334; break; + case 4: + enemyId = 309; + break; } $gameVariables.setValue(20, $dataEnemies[enemyId].name); //$gameVariables.setValue(79, type); diff --git a/js/plugins/Nore_RogueAction.js b/js/plugins/Nore_RogueAction.js index 4778337..e0e7ab7 100644 --- a/js/plugins/Nore_RogueAction.js +++ b/js/plugins/Nore_RogueAction.js @@ -842,23 +842,6 @@ var Nore; _Game_ActionResult_prototype_clear.call(this); this.mhpPlus = 0; }; - var _Game_Action_prototype_apply = Game_Action.prototype.apply; - Game_Action.prototype.apply = function (target) { - if (this.isHpRecover() && target.hpRate() == 1 && target.isActor()) { - var item = this.item(); - var mhp = parseInt(item.meta['mhp']); - target.addParam(0, mhp); - target.gainHp(mhp); - var result = target.result(); - this.subject().clearResult(); - result.clear(); - result.used = true; - result.mhpPlus = mhp; - result.hpDamage = -mhp; - return; - } - _Game_Action_prototype_apply.call(this, target); - }; var _Sprite_Character_prototype_updatePosition = Sprite_Character.prototype.updatePosition; Sprite_Character.prototype.updatePosition = function () { _Sprite_Character_prototype_updatePosition.call(this); diff --git a/js/plugins/Nore_RogueEnemy.js b/js/plugins/Nore_RogueEnemy.js index 6c6fd03..a0c94e8 100644 --- a/js/plugins/Nore_RogueEnemy.js +++ b/js/plugins/Nore_RogueEnemy.js @@ -219,7 +219,9 @@ var Game_EnemyEvent = /** @class */ (function (_super) { this._room = $gameMap.getRoom(this.x, this.y); }; Game_EnemyEvent.prototype.onTurnStart = function () { - this.enemy().regenerateAll(); + if (!$gamePlayer.isDefeat()) { + this.enemy().regenerateAll(); + } if (this.enemy().isDead()) { this.enemy().performCollapse(); if (!this.event().meta['notErase']) { diff --git a/js/plugins/Nore_Syusan.js b/js/plugins/Nore_Syusan.js index 4578c13..7c7229e 100644 --- a/js/plugins/Nore_Syusan.js +++ b/js/plugins/Nore_Syusan.js @@ -93,8 +93,14 @@ var Nore; _super.prototype.update.call(this); $gameScreen.update(); }; + Scene_Syusan.prototype.fixSyusan = function () { + if (!$dataEnemies[$gameActors.mainActor().sikyu().taneoyaId]) { + $gameActors.mainActor().sikyu().taneoyaId = 53; + } + }; Scene_Syusan.prototype.create = function () { _super.prototype.create.call(this); + this.fixSyusan(); actorId = $gameVariables.value(82); this._params = new SyusanParams(actorId); syusanParams = this._params; @@ -293,6 +299,10 @@ var Nore; case SyusanCommad.TEMAN: this.doTeman(); break; + default: + this._menuWindow.activate(); + this._menuWindow.select(0); + return; } this._menuWindow.makeItemList(); this._menuWindow.refresh(); @@ -321,6 +331,13 @@ var Nore; Scene_Syusan.prototype.isCommandExists = function (type) { this._levelMap[type] = this._levelMap[type] || 0; var nextLevel = this._levelMap[type] + 1; + var total = 0; + for (var i in this._levelMap) { + total += this._levelMap[i]; + } + if (total >= 5) { + nextLevel = 6; + } var scenarioId = '出産' + actorId + '_%3_%1_LV%2'.format(this._taneoyaName, nextLevel, type); p(scenarioId); return $dataScenario[scenarioId] != null; @@ -417,6 +434,9 @@ var Nore; d.push(SyusanCommad.TEMAN); } this.height = this._itemList.length * (this.lineHeight() + 6) + 40; + if (this._itemList.length >= this.index()) { + this.select(this._itemList.length - 1); + } }; Window_ChokyoMenu.prototype.isCommandExists = function (type) { return this._scene.isCommandExists(type); diff --git a/js/plugins/Nore_Temp.js b/js/plugins/Nore_Temp.js index 8569d5b..28861ed 100644 --- a/js/plugins/Nore_Temp.js +++ b/js/plugins/Nore_Temp.js @@ -37,6 +37,7 @@ var Game_RogueTemp = /** @class */ (function (_super) { this.syusanList = []; }; Game_RogueTemp.prototype.pushSyusanList = function (list) { + this.syusanList = this.syusanList || []; this.syusanList.push(list); }; Game_RogueTemp.prototype.addIgnoreFileSet = function (base, index) { diff --git a/scenario/Scenario.json b/scenario/Scenario.json index 0be535e..584add8 100644 --- a/scenario/Scenario.json +++ b/scenario/Scenario.json @@ -1382550,4 +1382550,4 @@ "parameters": [] } ] -} \ No newline at end of file +}