FIx for menu

This commit is contained in:
dazedanon 2025-11-02 13:26:08 -06:00
parent d2d0f1828b
commit df92c76c57
14 changed files with 728 additions and 728 deletions

File diff suppressed because it is too large Load diff

View file

@ -94,7 +94,7 @@ function Window_Message_Battle() {
if (this._actor) {
if (ConfigManager.commandRemember) {
if (this.currentSymbol() === "kigae") {
var idx = this._actor._name == "白雪" ? 1150 : 1151;
var idx = this._actor._name == "Shirayuki" ? 1150 : 1151;
BattleManager._inputting = false;
const commonEvent = $dataCommonEvents[idx];
@ -227,7 +227,7 @@ function Window_Message_Battle() {
this.addItemCommand();
//this._actor._stateSteps.findIndex(e => e.);
if (this._actor.name() == "白雪") {
if (this._actor.name() == "Shirayuki") {
//裸だと強制的に出現
if ($gameVariables.value(204) == 1 || $gameSwitches.value(121)) {
this.addCommand("更衣", "kigae", true);
@ -1001,7 +1001,7 @@ function Window_Message_Battle() {
this.resetFontSettings();
};
Window_BattleStatus.prototype.drawActorFace = function (actor, x, y, width, height) {
if (actor._name == "白雪") {
if (actor._name == "Shirayuki") {
this.drawFace("battle_face_sira", actor.faceIndex(), x, y, width, height, actor);
} else {
this.drawFace("battle_face_yozu", actor.faceIndex(), x, y, width, height, actor);
@ -1249,7 +1249,7 @@ function Window_Message_Battle() {
this._actorCommandWindow.setup(BattleManager.actor());
this.CBR_changeLive2d(BattleManager.actor()._name);
if (BattleManager.actor()._name === "白雪") {
if (BattleManager.actor()._name === "Shirayuki") {
var commonEventId = 1137;
} else {
var commonEventId = 1138;
@ -1273,7 +1273,7 @@ function Window_Message_Battle() {
});
//白雪を表示させたい時
if (show == "白雪") {
if (show == "Shirayuki") {
$gameLive2d.CBR_fadeMode[9] = "show";
$gameLive2d.CBR_fadeDuration[9] = $gameLive2d.visible[9] ? 0 : $gameLive2d.CBR_getDuration();
} else {
@ -1296,7 +1296,7 @@ function Window_Message_Battle() {
sira: 9,
yozu: 5
};
var keyName = name == "白雪" ? "sira" : "yozu";
var keyName = name == "Shirayuki" ? "sira" : "yozu";
Object.keys($gameLive2d._name).forEach(function (key) {
var delName = keyName == "sira" ? "y" : "s";
//表示されてるのが削除したいキャラ名だったら
@ -1337,11 +1337,11 @@ function Window_Message_Battle() {
};
if (subject.constructor.name == "Game_Actor") {
if (subject._name == "白雪" || subject._name == "夜鶴") {
if (subject._name == "Shirayuki" || subject._name == "Yotsuru") {
liveChange(subject._name);
}
} else if (subject.constructor.name == "Game_Enemy") {
if (targets[0]._name == "白雪" || targets[0]._name == "夜鶴") {
if (targets[0]._name == "Shirayuki" || targets[0]._name == "Yotsuru") {
liveChange(targets[0]._name);
}
}
@ -1696,7 +1696,7 @@ Window_CBR_BattleResult.prototype.initialize = function (rect) {
this._chara_1.y = 260;
this.contents.fontSize = 32;
if ($gameParty.members()[0].name() === "白雪") {
if ($gameParty.members()[0].name() === "Shirayuki") {
this._chara_1.bitmap = ImageManager.loadSystem("battle_result_sira");
this.drawTextS("白雪・Lindblum", 134, 255, 400);
} else {
@ -1711,7 +1711,7 @@ Window_CBR_BattleResult.prototype.initialize = function (rect) {
this._chara_2 = new Sprite();
this._chara_2.x = 0;
this._chara_2.y = 370;
if ($gameParty.members()[1].name() === "白雪") {
if ($gameParty.members()[1].name() === "Shirayuki") {
this._chara_2.bitmap = ImageManager.loadSystem("battle_result_sira");
this.drawTextS("白雪・Lindblum", 134, 365, 400);
} else {
@ -1828,7 +1828,7 @@ Window_CBR_BattleResult.prototype.updateResult = function () {
}
if (!this._chara_3.bitmap) {
var name = $gameParty.allMembers()[0].name() === "白雪" ? "sira" : "yozu";
var name = $gameParty.allMembers()[0].name() === "Shirayuki" ? "sira" : "yozu";
var fuku_var = name == "sira" ? 204 : 205;
var fuku = $gameVariables.value(fuku_var) ? "nude" : "tyaku";
var bukka_sw = name == "sira" ? 234 : 235;
@ -1977,7 +1977,7 @@ Scene_Battle.prototype.createStatusWindow = function () {
var SDN_ShowRestraintImg = function (name) {
//ベース設定
if (name == "白雪") {
if (name == "Shirayuki") {
var evChara = "eva_d";
var cosChara = $gameVariables.value(204);
var kousokuState = $gameVariables.value(136);
@ -2028,7 +2028,7 @@ var SDN_ShowRestraintImg = function (name) {
};
var SDN_HideRestraintImg = function (name) {
var idx = name === "白雪" ? 9 : 5;
var idx = name === "Shirayuki" ? 9 : 5;
if (SceneManager._scene.live2dSprite[idx]) {
SceneManager._scene.live2dSprite[idx].hideImg();
}

View file

@ -1006,7 +1006,7 @@ var SDN_EstrousCycle = function (val) {
//----------------------------------------------------
var SDN_BattleStartVoice = function () {
// 先頭キャラのHPレートで判断
if ($gameParty.allMembers()[0].name() == "白雪") {
if ($gameParty.allMembers()[0].name() == "Shirayuki") {
var chaData = ["sir", 204];
} else {
var chaData = ["yoz", 205];
@ -1052,7 +1052,7 @@ var SDN_CommandVoiceFile = function (name, actorId, cosId) {
//服装の状態を取得する
var cosState = $gameVariables.value(cosId);
//キャラIDを取得
if (name == "白雪") {
if (name == "Shirayuki") {
var hpRate = $gameActors.actor(1).hpRate();
var chaId = "sir";
var roshutsuId = 267;
@ -1162,7 +1162,7 @@ var SDN_CommandVoiceFile = function (name, actorId, cosId) {
};
//コマンドボイス再生
var CBR_CommandVoice = function (name) {
if (name == "白雪") {
if (name == "Shirayuki") {
voiceFile = SDN_CommandVoiceFile(name, 0, 204);
} else {
voiceFile = SDN_CommandVoiceFile(name, 1, 205);
@ -1674,7 +1674,7 @@ var SDN_HactSetHatk = function (val) {
//■拘束時画像の表示
var SDN_ShowKousokuImg = function (name) {
//ベース設定
if (name == "白雪") {
if (name == "Shirayuki") {
var evChara = "eva_d";
var cosChara = $gameVariables.value(204);
var kousokuState = $gameVariables.value(136);
@ -1758,7 +1758,7 @@ var SDN_SetAdvHanime = function (file, animeId, loop) {
var SDN_SetFreeEro = function (name, type) {
//配列取得の数値
if (name == "白雪") {
if (name == "Shirayuki") {
var num = 0;
} else {
var num = 1;
@ -2185,7 +2185,7 @@ var SDN_CreateErosteData = function (name) {
var GetErosteData = [];
var GetEroSkillData = [];
//白雪変数545番/夜鶴変数546番
if (name == "白雪") {
if (name == "Shirayuki") {
for (let i = 245; i < 309; i++) {
GetErosteData.push($gameVariables.value(i));
}
@ -2274,7 +2274,7 @@ var SDN_SetGameDataEx = function () {
var SDN_SetErosteData = function (name) {
var setNum = 0;
var GetPregnancyData = [];
if (name == "白雪") {
if (name == "Shirayuki") {
for (let i = 245; i < 298; i++) {
$gameVariables.setValue(i, $gameVariables.value(393)[setNum]);
setNum = setNum + 1;
@ -2328,7 +2328,7 @@ var SDN_SetErosteData = function (name) {
//■出産データ引き継ぎ
var SDN_SetBirthData = function (name) {
var setNum = 0;
if (name == "白雪") {
if (name == "Shirayuki") {
for (let i = 298; i < 308; i++) {
$gameVariables.setValue(i, $gameVariables.value(391)[setNum]);
setNum = setNum + 1;

View file

@ -203,7 +203,7 @@ function Window_EroStatus_kaihatu_view() {
Window_EroStatus_kaihatu_select.prototype.do_ok = function () {
var actor = $gameParty.menuActor();
var chara = actor.name() == "白雪" ? "sira" : "yozu";
var chara = actor.name() == "Shirayuki" ? "sira" : "yozu";
// D→0 A→3
const info = this._list[this.index()];
var rank_num = $gameVariables.value(info[chara].rank);
@ -314,7 +314,7 @@ function Window_EroStatus_kaihatu_view() {
this.drawTextM(info.text, 15, rect.y - 27, 400, "left");
var actor = $gameParty.menuActor();
var chara = actor.name() == "白雪" ? "sira" : "yozu";
var chara = actor.name() == "Shirayuki" ? "sira" : "yozu";
this.changeTextColor("#FFFFFF");
this.contents.fontSize = 16;
@ -510,7 +510,7 @@ function Window_EroStatus_kaihatu_view() {
this.contents.clear();
var actor = $gameParty.menuActor();
var chara = actor.name() == "白雪" ? "sira" : "yozu";
var chara = actor.name() == "Shirayuki" ? "sira" : "yozu";
var list_1 = ["kou", "man", "hou", "tibu", "ana", "rosyu"];
var list_2 = ["a", "b", "c", "d"];

View file

@ -36,7 +36,7 @@ function Window_EroStatus_kiroku() {
Window_EroStatus_kiroku.prototype.refresh = function () {
this.contents.clear();
var actor = $gameParty.menuActor();
var chara = actor.name() == "白雪" ? "sira" : "yozu";
var chara = actor.name() == "Shirayuki" ? "sira" : "yozu";
var bitmap = ImageManager.loadSystem("erost_kiroku_frame");
this.contents.blt(bitmap, 0, 0, 1280, 720, 0, -65);

View file

@ -252,8 +252,8 @@ function Scene_eroStatus() {
$gameParty.setMenuActor(actor);
SoundManager.playOk();
var chara_show = actor.name() == "白雪" ? "sira" : "yozu";
var chara_hide = actor.name() == "白雪" ? "yozu" : "sira";
var chara_show = actor.name() == "Shirayuki" ? "sira" : "yozu";
var chara_hide = actor.name() == "Shirayuki" ? "yozu" : "sira";
if (this._categoryWindow._category == "prof") {
this._profWindow.refresh();
@ -409,7 +409,7 @@ function Scene_eroStatus() {
const model_sp = SceneManager._scene.live2dSprite[SceneManager._scene.nin_flag];
if (SceneManager._scene.nin_flag && model_sp._model && model_sp._model.internalModel) {
var actor = $gameParty.menuActor();
var chara = actor.name() == "白雪" ? "sira" : "yozu";
var chara = actor.name() == "Shirayuki" ? "sira" : "yozu";
if (chara == "sira") {
model_sp._model.internalModel.coreModel._parameterValues[43] = 1;
model_sp._model.internalModel.coreModel._parameterValues[44] = 1;
@ -424,7 +424,7 @@ function Scene_eroStatus() {
Window_EroCategory.prototype.show_kaihatu = function () {
var actor = $gameParty.menuActor();
var chara = actor.name() == "白雪" ? "sira" : "yozu";
var chara = actor.name() == "Shirayuki" ? "sira" : "yozu";
//loadModelのロードが終わった後に実行されないとバグる
// live2d処理
@ -525,7 +525,7 @@ function Scene_eroStatus() {
this._category = category;
var actor = $gameParty.menuActor();
var chara = actor.name() == "白雪" ? "sira" : "yozu";
var chara = actor.name() == "Shirayuki" ? "sira" : "yozu";
if (this.parent) {
this.parent.parent._backgroundSprite_rireki[chara][0].visible = false;
@ -773,7 +773,7 @@ function Scene_eroStatus() {
var actor = $gameParty.menuActor();
var chara = "sira";
//一応画像のチラ付き抑える為にロードだけはやる
if (actor.name() == "白雪") {
if (actor.name() == "Shirayuki") {
var bitmap = ImageManager.loadSystem("erost_prof_sira");
ImageManager.loadSystem("erost_prof_yozu");
} else {

View file

@ -34,9 +34,9 @@ DataManager._databaseFiles.push({ name: "CBR_eroRireki", src: "CBR_h_event_data.
Window_EroStatus_rireki_syu_select.prototype.makeList = function () {
var name = $gameParty.menuActor().name();
if (name == "白雪") {
if (name == "Shirayuki") {
var idx_rec = 144;
} else if (name == "夜鶴") {
} else if (name == "Yotsuru") {
var idx_rec = 145;
}
var ary = $gameVariables.value(idx_rec) || [];
@ -102,9 +102,9 @@ DataManager._databaseFiles.push({ name: "CBR_eroRireki", src: "CBR_h_event_data.
if (this._index != index && this._list[this.index()]) {
if (this._list[this.index()].type == 0) {
var name = $gameParty.menuActor().name();
if (name == "白雪") {
if (name == "Shirayuki") {
var idx_rec = 144;
} else if (name == "夜鶴") {
} else if (name == "Yotsuru") {
var idx_rec = 145;
}
var data_ary = $gameVariables.value(idx_rec) || [];
@ -241,10 +241,10 @@ DataManager._databaseFiles.push({ name: "CBR_eroRireki", src: "CBR_h_event_data.
})();
var CBR_add_syussan = function (name) {
if (name == "白雪") {
if (name == "Shirayuki") {
var idx = 189;
var idx_rec = 144;
} else if (name == "夜鶴") {
} else if (name == "Yotsuru") {
var idx = 190;
var idx_rec = 145;
}

View file

@ -50,7 +50,7 @@ DataManager._databaseFiles.push({ name: "CBR_syougou", src: "CBR_h_syougou.json"
Window_EroStatus_syougou.prototype.drawContents = function (info, rect, index) {
const bottom = rect.y + rect.height;
var switch_chara = "白雪" == $gameParty.menuActor().name() ? "switch_sira" : "switch_yozu";
var switch_chara = "Shirayuki" == $gameParty.menuActor().name() ? "switch_sira" : "switch_yozu";
this.contents.fontFace = "serif";
this.contents.fontSize = 24;

View file

@ -8,11 +8,11 @@
var party = $gameParty.allMembers();
var sira = party.find(function (e) {
return e._name == "白雪";
return e._name == "Shirayuki";
});
var yozu = party.find(function (e) {
return e._name == "夜鶴";
return e._name == "Yotsuru";
});
if (sira) {
@ -1158,7 +1158,7 @@
var party = $gameParty.allMembers();
for (ac of party) {
this._backgroundTextSprite = new Sprite(new Bitmap(200, 26));
if (ac.name() == "白雪") {
if (ac.name() == "Shirayuki") {
this._backgroundTextSprite.x = 50;
this._backgroundTextSprite.y = 412 + 30;
} else {
@ -1204,7 +1204,7 @@
var party = $gameParty.allMembers();
//夜鶴が戦闘の時
var flag = index;
if (party[0]._name == "夜鶴") {
if (party[0]._name == "Yotsuru") {
var flag = index ? 0 : 1;
}
@ -1237,7 +1237,7 @@
var x = 50;
var y = 390 + 30;
if (party[i]._name == "夜鶴") {
if (party[i]._name == "Yotsuru") {
x += 950 + 23;
}
@ -1266,7 +1266,7 @@
[102, 65, 184],
[103, 66, 185]
];
var a = ac.name() == "白雪" ? 0 : 1;
var a = ac.name() == "Shirayuki" ? 0 : 1;
if ($gameVariables.value(ac_var[a][0]) < 3) {
if (ac.isStateAffected(4)) {
@ -1321,7 +1321,7 @@
//this._cursorSprite.x += 750 * this.index();
// 夜鶴が戦闘の時;
if (party[0]._name == "夜鶴") {
if (party[0]._name == "Yotsuru") {
var temp = 84;
this._cursorSprite.x -= temp + 2 * temp * this.index() * -1;
}

View file

@ -13,9 +13,9 @@
var name = $gameParty.menuActor()._name;
this._backgroundSprite_sira.bitmap = ImageManager.loadSystem("menu_equip_back_sira");
this._backgroundSprite_yozu.bitmap = ImageManager.loadSystem("menu_equip_back_yozu");
if (name == "白雪") {
if (name == "Shirayuki") {
this._backgroundSprite_yozu.hide();
} else if (name == "夜鶴") {
} else if (name == "Yotsuru") {
this._backgroundSprite_sira.hide();
}
@ -43,10 +43,10 @@
this._slotWindow.setActor(actor);
this._itemWindow.setActor(actor);
if (actor._name == "白雪") {
if (actor._name == "Shirayuki") {
this._backgroundSprite_sira.show();
this._backgroundSprite_yozu.hide();
} else if (actor._name == "夜鶴") {
} else if (actor._name == "Yotsuru") {
this._backgroundSprite_sira.hide();
this._backgroundSprite_yozu.show();
}
@ -448,7 +448,7 @@
if (this.CBR_ban) {
this.drawTextS("更衣条件:露出開発度がB以上", 224, 505, 300, "left");
} else {
const fuku_id = $gameParty.menuActor()._name == "白雪" ? 204 : 205;
const fuku_id = $gameParty.menuActor()._name == "Shirayuki" ? 204 : 205;
this.drawText(["制服", "裸", "制服", "裸"][$gameVariables.value(fuku_id)], 224, 505, 300, "left");
}
};

View file

@ -350,7 +350,7 @@
//faceName, faceIndex, x, y, width, height
w = 236;
if (actor._name == "白雪") {
if (actor._name == "Shirayuki") {
var bitmap = ImageManager.loadSystem("menu_item_sira");
} else {
var bitmap = ImageManager.loadSystem("menu_item_yozu");

View file

@ -384,7 +384,7 @@ Scene_Map.prototype.updateMain = function () {
$gameSwitches.setValue(188, true);
$gameMap._events[10].setTransparent(false);
var pic_name = $gameParty.members()[0].name() == "白雪" ? `sira_${$gameVariables.value(204)}` : `yozu_${$gameVariables.value(205)}`;
var pic_name = $gameParty.members()[0].name() == "Shirayuki" ? `sira_${$gameVariables.value(204)}` : `yozu_${$gameVariables.value(205)}`;
$gameScreen.showPicture(14, `turi_cutin_${pic_name}`, 0, 0, 0, 100, 100, 255, 0);
$gameScreen.showPicture(12, "dummy", 0, 0, 0, 100, 100, 255, 0);

View file

@ -11,9 +11,9 @@
Scene_Equip.prototype.createBackground = function () {
this._backgroundSprite = new Sprite();
var name = $gameParty.menuActor()._name;
if (name == "白雪") {
if (name == "Shirayuki") {
this._backgroundSprite.bitmap = ImageManager.loadSystem("menu_equip_back_sira");
} else if (name == "夜鶴") {
} else if (name == "Yotsuru") {
this._backgroundSprite.bitmap = ImageManager.loadSystem("menu_equip_back_yozu");
}

View file

@ -8167,10 +8167,10 @@ const getControlValiable = function (
var number = 0;
var nameKey = "";
if (param.chara == "sir" || param.chara == "白雪") {
if (param.chara == "sir" || param.chara == "Shirayuki") {
number = 901;
nameKey = "sir";
} else if (param.chara == "yoz" || param.chara == "夜鶴") {
} else if (param.chara == "yoz" || param.chara == "Yotsuru") {
number = 902;
nameKey = "yoz";
} else if (param.chara == "rei" || param.chara == "麗菜") {
@ -8260,10 +8260,10 @@ const getControlValiable = function (
var number = 0;
var nameKey = "";
console.log(param);
if (param.chara == "sir" || param.chara == "白雪") {
if (param.chara == "sir" || param.chara == "Shirayuki") {
number = 204;
nameKey = "sir";
} else if (param.chara == "yoz" || param.chara == "夜鶴") {
} else if (param.chara == "yoz" || param.chara == "Yotsuru") {
number = 205;
nameKey = "yoz";
} else if (param.chara == "rei" || param.chara == "麗菜") {