Compare commits

...

4 commits

Author SHA1 Message Date
5e24371438 1.20 2024-01-19 05:06:53 -06:00
792b9b8488 1.19 2024-01-19 01:32:12 -06:00
79cefeee21 Reformat 2024-01-19 01:28:28 -06:00
b664e5faad Format scenario 2024-01-06 15:04:52 -06:00
26 changed files with 6325119 additions and 9619 deletions

17
.gitignore vendored
View file

@ -17,4 +17,19 @@
!README.md
!ENCG/*
# Images
# Images
!Battle.png_
!calendar_item.png_
!eroStatus.png_
!menu2.png_
!ninshin.png_
!result.png_
!status_item.png_
!d_02.png_
!d_03.png_
!f10.png_
!f2.png_
!f3.png_
!f4.png_
!f5.png_
!opening_1.png_

File diff suppressed because it is too large Load diff

View file

@ -111146,8 +111146,8 @@
"コスチューム保存",
{
"actorId": "1",
"faceId": "8",
"hoppeId": ""
"faceId": "4",
"hoppeId": "1"
}
]
},
@ -111162,14 +111162,14 @@
"code": 657,
"indent": 0,
"parameters": [
"faceId = 8"
"faceId = 4"
]
},
{
"code": 657,
"indent": 0,
"parameters": [
"hoppeId = "
"hoppeId = 1"
]
},
{
@ -111347,7 +111347,7 @@
"code": 355,
"indent": 0,
"parameters": [
"upEroParam(2, 921, 30)"
"upEroParam(2, 921)"
]
},
{
@ -119671,6 +119671,16 @@
897
]
},
{
"code": 357,
"indent": 0,
"parameters": [
"Nore_History",
"NextDayByEroEvent",
"次の日へ(エロイベント用)",
{}
]
},
{
"code": 355,
"indent": 0,
@ -124682,6 +124692,16 @@
894
]
},
{
"code": 357,
"indent": 0,
"parameters": [
"Nore_History",
"NextDayByEroEvent",
"次の日へ(エロイベント用)",
{}
]
},
{
"code": 0,
"indent": 0,
@ -138375,6 +138395,16 @@
894
]
},
{
"code": 357,
"indent": 0,
"parameters": [
"Nore_History",
"NextDayByEroEvent",
"次の日へ(エロイベント用)",
{}
]
},
{
"code": 117,
"indent": 0,
@ -144757,16 +144787,6 @@
897
]
},
{
"code": 357,
"indent": 0,
"parameters": [
"Nore_History",
"nextDayByEroEvent",
"次の日へ(エロイベント用)",
{}
]
},
{
"code": 117,
"indent": 0,
@ -144781,6 +144801,16 @@
894
]
},
{
"code": 357,
"indent": 0,
"parameters": [
"Nore_History",
"NextDayByEroEvent",
"次の日へ(エロイベント用)",
{}
]
},
{
"code": 0,
"indent": 0,
@ -149765,7 +149795,7 @@
{
"actorId": "1",
"faceId": "8",
"hoppeId": ""
"hoppeId": "1"
}
]
},
@ -149787,7 +149817,7 @@
"code": 657,
"indent": 0,
"parameters": [
"hoppeId = "
"hoppeId = 1"
]
},
{
@ -154769,6 +154799,16 @@
894
]
},
{
"code": 357,
"indent": 0,
"parameters": [
"Nore_History",
"NextDayByEroEvent",
"次の日へ(エロイベント用)",
{}
]
},
{
"code": 0,
"indent": 0,
@ -174119,6 +174159,17 @@
899
]
},
{
"code": 122,
"indent": 0,
"parameters": [
980,
980,
0,
4,
"$gameActors.actor(1).boteId"
]
},
{
"code": 122,
"indent": 0,
@ -190532,7 +190583,7 @@
27,
0,
4,
"$gameActors.actor(3).getActorHistory().countSyusanMinister()"
"$gameActors.actor(3).getActorHistory().countSyusanMinister() + 1"
]
},
{
@ -191512,7 +191563,7 @@
27,
0,
4,
"$gameActors.actor(3).getActorHistory().countSyusanCharles()"
"$gameActors.actor(3).getActorHistory().countSyusanCharles() + 1"
]
},
{
@ -192610,7 +192661,7 @@
27,
0,
4,
"$gameActors.actor(4).getActorHistory().countSyusanBanzoku()"
"$gameActors.actor(4).getActorHistory().countSyusanBanzoku() + 1"
]
},
{
@ -193702,7 +193753,7 @@
27,
0,
4,
"$gameActors.actor(4).getActorHistory().countSyusanVagrant()"
"$gameActors.actor(4).getActorHistory().countSyusanVagrant() + 1"
]
},
{
@ -194889,7 +194940,7 @@
27,
0,
4,
"$gameActors.actor(4).getActorHistory().countSyusanGoblin()"
"$gameActors.actor(4).getActorHistory().countSyusanGoblin() + 1"
]
},
{
@ -195967,7 +196018,7 @@
27,
0,
4,
"$gameActors.actor(2).getActorHistory().countSyusanBanzoku()"
"$gameActors.actor(2).getActorHistory().countSyusanBanzoku() + 1"
]
},
{
@ -197026,7 +197077,7 @@
27,
0,
4,
"$gameActors.actor(2).getActorHistory().countSyusanGray()"
"$gameActors.actor(2).getActorHistory().countSyusanGray() + 1"
]
},
{
@ -198077,7 +198128,7 @@
27,
0,
4,
"$gameActors.actor(2).getActorHistory().countSyusanVagrant()"
"$gameActors.actor(2).getActorHistory().countSyusanVagrant() + 1"
]
},
{
@ -199080,7 +199131,7 @@
27,
0,
4,
"$gameActors.actor(6).getActorHistory().countSyusanBanzoku()"
"$gameActors.actor(6).getActorHistory().countSyusanBanzoku() + 1"
]
},
{
@ -201724,7 +201775,7 @@
27,
0,
4,
"$gameActors.actor(6).getActorHistory().countSyusanVagrant()"
"$gameActors.actor(6).getActorHistory().countSyusanVagrant() + 1"
]
},
{
@ -203199,7 +203250,7 @@
27,
0,
4,
"$gameActors.actor(5).getActorHistory().countSyusanBanzoku()"
"$gameActors.actor(5).getActorHistory().countSyusanBanzoku() + 1"
]
},
{
@ -204216,7 +204267,7 @@
27,
0,
4,
"$gameActors.actor(5).getActorHistory().countSyusanVagrant()"
"$gameActors.actor(5).getActorHistory().countSyusanVagrant() + 1"
]
},
{
@ -205476,7 +205527,7 @@
27,
0,
4,
"$gameActors.actor(5).getActorHistory().countSyusanGray()"
"$gameActors.actor(5).getActorHistory().countSyusanGray() + 1"
]
},
{
@ -206511,7 +206562,7 @@
27,
0,
4,
"$gameActors.actor(10).getActorHistory().countSyusanBanzoku()"
"$gameActors.actor(10).getActorHistory().countSyusanBanzoku() + 1"
]
},
{
@ -207531,7 +207582,7 @@
27,
0,
4,
"$gameActors.actor(10).getActorHistory().countSyusanGoblin()"
"$gameActors.actor(10).getActorHistory().countSyusanGoblin() + 1"
]
},
{
@ -208479,7 +208530,7 @@
27,
0,
4,
"$gameActors.actor(10).getActorHistory().countSyusanVagrant()"
"$gameActors.actor(10).getActorHistory().countSyusanVagrant() + 1"
]
},
{
@ -209529,7 +209580,7 @@
27,
0,
4,
"$gameActors.actor(12).getActorHistory().countSyusan()"
"$gameActors.actor(12).getActorHistory().countSyusan() + 1"
]
},
{
@ -210517,7 +210568,7 @@
27,
0,
4,
"$gameActors.actor(12).getActorHistory().countSyusanGoblin()"
"$gameActors.actor(12).getActorHistory().countSyusanGoblin() + 1"
]
},
{
@ -211523,7 +211574,7 @@
27,
0,
4,
"$gameActors.actor(12).getActorHistory().countSyusanVagrant()"
"$gameActors.actor(12).getActorHistory().countSyusanVagrant() + 1"
]
},
{
@ -216639,7 +216690,7 @@
27,
0,
4,
"$gameActors.actor(1).getActorHistory().countSyusanGoblin()"
"$gameActors.actor(1).getActorHistory().countSyusanGoblin() + 1"
]
},
{
@ -221615,7 +221666,7 @@
27,
0,
4,
"$gameActors.actor(5).getActorHistory().countSyusanGoblin()"
"$gameActors.actor(5).getActorHistory().countSyusanGoblin() + 1"
]
},
{
@ -222668,7 +222719,7 @@
27,
0,
4,
"$gameActors.actor(6).getActorHistory().countSyusanGoblin()"
"$gameActors.actor(6).getActorHistory().countSyusanGoblin() + 1"
]
},
{
@ -224149,7 +224200,7 @@
27,
0,
4,
"$gameActors.actor(2).getActorHistory().countSyusanGoblin()"
"$gameActors.actor(2).getActorHistory().countSyusanGoblin() + 1"
]
},
{

View file

@ -305,8 +305,8 @@
3248,
3248,
3248,
3252,
3276,
3248,
3248,
3248,
3248,
3248,
@ -333,8 +333,8 @@
3276,
3260,
3276,
3276,
3276,
3248,
3248,
3276,
3276,
3276,
@ -748,13 +748,13 @@
3188,
0,
0,
0,
3186,
3172,
3172,
3172,
3172,
3172,
3172,
0,
0,
0,
@ -1581,8 +1581,8 @@
0,
0,
0,
340,
819,
0,
0,
330,
803,
621,

View file

@ -6099,6 +6099,16 @@
40
]
},
{
"code": 357,
"indent": 0,
"parameters": [
"Nore_History",
"NextDayByEroEvent",
"次の日へ(エロイベント用)",
{}
]
},
{
"code": 122,
"indent": 0,

View file

@ -4277,17 +4277,6 @@
336
]
},
{
"code": 122,
"indent": 1,
"parameters": [
980,
980,
0,
4,
"$gameActors.actor(1).boteId"
]
},
{
"code": 357,
"indent": 1,
@ -4319,6 +4308,17 @@
899
]
},
{
"code": 122,
"indent": 1,
"parameters": [
980,
980,
0,
4,
"$gameActors.actor(1).boteId"
]
},
{
"code": 357,
"indent": 1,
@ -5640,6 +5640,17 @@
899
]
},
{
"code": 122,
"indent": 1,
"parameters": [
980,
980,
0,
4,
"$gameActors.actor(1).boteId"
]
},
{
"code": 357,
"indent": 1,
@ -5956,6 +5967,17 @@
899
]
},
{
"code": 122,
"indent": 1,
"parameters": [
980,
980,
0,
4,
"$gameActors.actor(1).boteId"
]
},
{
"code": 357,
"indent": 1,
@ -6272,6 +6294,17 @@
899
]
},
{
"code": 122,
"indent": 1,
"parameters": [
980,
980,
0,
4,
"$gameActors.actor(1).boteId"
]
},
{
"code": 357,
"indent": 1,

File diff suppressed because one or more lines are too long

View file

@ -105,7 +105,7 @@
"name": "ボスの部屋",
"order": 16,
"parentId": 19,
"scrollX": 1131,
"scrollX": 1130,
"scrollY": 641.5
},
{
@ -164,7 +164,7 @@
},
{
"id": 19,
"expanded": false,
"expanded": true,
"name": "部屋",
"order": 6,
"parentId": 15,
@ -308,7 +308,7 @@
},
{
"id": 35,
"expanded": false,
"expanded": true,
"name": "監禁場所 レイラ",
"order": 157,
"parentId": 151,
@ -389,12 +389,12 @@
},
{
"id": 44,
"expanded": false,
"expanded": true,
"name": "2面",
"order": 19,
"parentId": 2,
"scrollX": 1131,
"scrollY": 641.5
"scrollX": 1122,
"scrollY": 628.5
},
{
"id": 45,
@ -654,7 +654,7 @@
"name": "ボスの部屋",
"order": 33,
"parentId": 44,
"scrollX": 1131,
"scrollX": 1130,
"scrollY": 781.5
},
{

View file

@ -143,7 +143,7 @@
"pitch": 100,
"volume": 90
},
"editMapId": 178,
"editMapId": 73,
"elements": [
"",
"物理",
@ -3557,7 +3557,7 @@
"",
""
],
"versionId": 73292185,
"versionId": 22491578,
"victoryMe": {
"name": "03 February Fair-maid",
"pan": 0,
@ -3586,6 +3586,7 @@
0
],
"tileSize": 48,
"optSplashScreen": false,
"hasEncryptedImages": true,
"hasEncryptedAudio": true,
"encryptionKey": "47bce5c74f589f4867dbd57e9ca9f808"

View file

@ -130,6 +130,6 @@
"size": {"w":3840,"h":4000},
"scale": "1",
"related_multi_packs": [ "ero01_14_2.json", "ero01_14_3.json", "ero01_14_4.json" ],
"smartupdate": "$TexturePacker:SmartUpdate:dc9f648e27c97bb832c1dfadd91c7379:3b24840b3cdcceb8c523233a76030989:a2b22c9d94c8248fbac7aa30273dd461$"
"smartupdate": "$TexturePacker:SmartUpdate:f3d053326ae07aeebb7f4a7a6bf5eb4c:51d64907da3e495fcccd8e7e7a86487b:a2b22c9d94c8248fbac7aa30273dd461$"
}
}

View file

@ -418,6 +418,6 @@
"size": {"w":3840,"h":3116},
"scale": "1",
"related_multi_packs": [ "ero01_14_1.json", "ero01_14_3.json", "ero01_14_4.json" ],
"smartupdate": "$TexturePacker:SmartUpdate:dc9f648e27c97bb832c1dfadd91c7379:3b24840b3cdcceb8c523233a76030989:a2b22c9d94c8248fbac7aa30273dd461$"
"smartupdate": "$TexturePacker:SmartUpdate:f3d053326ae07aeebb7f4a7a6bf5eb4c:51d64907da3e495fcccd8e7e7a86487b:a2b22c9d94c8248fbac7aa30273dd461$"
}
}

View file

@ -402,6 +402,6 @@
"size": {"w":3840,"h":3116},
"scale": "1",
"related_multi_packs": [ "ero01_14_1.json", "ero01_14_2.json", "ero01_14_4.json" ],
"smartupdate": "$TexturePacker:SmartUpdate:dc9f648e27c97bb832c1dfadd91c7379:3b24840b3cdcceb8c523233a76030989:a2b22c9d94c8248fbac7aa30273dd461$"
"smartupdate": "$TexturePacker:SmartUpdate:f3d053326ae07aeebb7f4a7a6bf5eb4c:51d64907da3e495fcccd8e7e7a86487b:a2b22c9d94c8248fbac7aa30273dd461$"
}
}

View file

@ -474,6 +474,6 @@
"size": {"w":3864,"h":3088},
"scale": "1",
"related_multi_packs": [ "ero01_14_1.json", "ero01_14_2.json", "ero01_14_3.json" ],
"smartupdate": "$TexturePacker:SmartUpdate:dc9f648e27c97bb832c1dfadd91c7379:3b24840b3cdcceb8c523233a76030989:a2b22c9d94c8248fbac7aa30273dd461$"
"smartupdate": "$TexturePacker:SmartUpdate:f3d053326ae07aeebb7f4a7a6bf5eb4c:51d64907da3e495fcccd8e7e7a86487b:a2b22c9d94c8248fbac7aa30273dd461$"
}
}

View file

@ -8484,6 +8484,6 @@
"format": "RGBA8888",
"size": {"w":4091,"h":2062},
"scale": "1",
"smartupdate": "$TexturePacker:SmartUpdate:1ea6600228dc37dd61fcba428331faf4:56400b4629b6e0860702eb2dba552713:0f9857816d44980ac70e9ab5d8cdac64$"
"smartupdate": "$TexturePacker:SmartUpdate:cf3af5eeeecbe6b678303065b489569f:80587b5c60a49b451bdbd38917c99694:0f9857816d44980ac70e9ab5d8cdac64$"
}
}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -9,27 +9,6 @@ var Nore;
}
Nore.isFreeTaikenban = isFreeTaikenban;
function isRecoShow(swId) {
switch (swId) {
case 971:
case 902:
case 903:
case 907:
case 905:
case 1102:
case 931:
case 928:
case 1221:
// case 921:
// case 942:
// case 1222:
case 972:
case 914:
//case 992:
case 900:
case 985:
//case 972:
return true;
}
return Nore.SHOW_ALL;
}
Nore.isRecoShow = isRecoShow;

View file

@ -430,6 +430,7 @@ var Nore;
this.addChild(this._back);
this._actorLayer = new Sprite();
this.addChild(this._actorLayer);
this.update();
};
Sprite_RightTachie2.prototype.setActorId = function (actorId) {
this._actorId = actorId;

View file

@ -285,7 +285,7 @@ var Nore;
var _DataManager_makeSavefileInfo = DataManager.makeSavefileInfo;
DataManager.makeSavefileInfo = function () {
var info = _DataManager_makeSavefileInfo.call(this);
info.days = $gameSystem.day();
info.days = $gameSystem.realDay();
info.stage = $gameSystem.stageId();
if (info.days == 1) {
info.stage = 0;

View file

@ -12,6 +12,8 @@ var Nore;
var pluginName = "Nore_Switch";
var EXPOSER_SW = 1500;
PluginManager.registerCommand(pluginName, "InitExposer", function (args) {
return;
for (var i = EXPOSER_SW + 1; i <= EXPOSER_SW + 100; i++) {
$gameSwitches.setValue(i, false);
}
@ -25,10 +27,10 @@ var Nore;
var base = (actorId - 1) * 10 + EXPOSER_SW;
if (actorId == 10) {
// アイリスとリンが桁のactorIdのため
base = 8 * 10;
base = 8 * 10 + EXPOSER_SW;
}
if (actorId == 12) {
base = 9 * 10;
base = 9 * 10 + EXPOSER_SW;
}
var cosId = 0;
switch (outerId) {

View file

@ -1 +1 @@
var VERSION = "1.0.17";
var VERSION = "1.0.20";

View file

@ -354,7 +354,7 @@ var rngd_recollection_mode_settings = {
pictures: ["01", "02", "03"],
common_event_id: 911,
switch_id: 911,
hint: "レイラとターニャを蛮族で孕ませ、\nターニャレイラを肉便器当番にする",
hint: "レイラとターニャを蛮族で孕ませ、\nターニャを蛮族の部屋、レイラを肉便器当番にする",
},
{
title: "レイラ×ミオリ",
@ -523,7 +523,7 @@ var rngd_recollection_mode_settings = {
pictures: ["01", "02", "03"],
common_event_id: 1349,
switch_id: 1349,
hint: "ミオリが大臣の部屋に行く",
hint: "ミオリが大臣の子を妊娠した\n状態で大臣の部屋に行く",
},
{
title: "ミオリ乳搾り(大臣)",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long