crash fixes

This commit is contained in:
dazedanon 2026-03-18 01:18:02 -05:00
parent fa9e86bd99
commit 9b4e2d1f7d
2 changed files with 23 additions and 17 deletions

View file

@ -85,7 +85,7 @@
function gainItemWithNotify(item) {
Torigoya.NotifyMessage.Manager.notify(
new Torigoya.NotifyMessage.NotifyItem({
message: item.name + "取得!",
message: "Obtained " + item.name + "!",
icon: item.iconIndex
})
);
@ -96,7 +96,7 @@
function gainGoldWithNotify(amount) {
Torigoya.NotifyMessage.Manager.notify(
new Torigoya.NotifyMessage.NotifyItem({
message: `${amount}G を手に入れた!`
message: `Obtained ${amount}G!`
})
);
$gameParty.gainGold(amount);
@ -160,20 +160,20 @@
// 赤箱(消費アイテム)
PluginManagerEx.registerCommand(script, "REGISTER_ITEMS_RED", args => {
const floor = getCurrentFloor();
_items = filterItems('アイテム', floor);
_items = filterItems('Item', floor);
});
// 銀箱スキル偶数ID=強化前のみ)
PluginManagerEx.registerCommand(script, "REGISTER_ITEMS_SILVER", args => {
const floor = getCurrentFloor();
const candidates = filterItems('スキル', floor, item => item.id % 2 === 0);
const candidates = filterItems('Skill', floor, item => item.id % 2 === 0);
_items = selectAvailable(candidates);
});
// 金箱(遺物)
PluginManagerEx.registerCommand(script, "REGISTER_ITEMS_GOLD", args => {
const floor = getCurrentFloor();
const candidates = filterItems('遺物', floor);
const candidates = filterItems('Relic', floor);
_items = selectAvailable(candidates);
});

View file

@ -35,8 +35,9 @@
const eventName = event.event()?.name;
if (!eventName) return false;
// 同名の敵データを検索
const enemy = $dataEnemies.find(e => e && e.name === eventName);
// 同名の敵データを検索Troops.jsonはJP名のままなのでブリッジ
const troop = $dataTroops.find(t => t && t.name === eventName);
const enemy = troop ? $dataEnemies[troop.id] : $dataEnemies.find(e => e && e.name === eventName);
if (!enemy) return false;
// DefeatEventタグの有無をチェック
@ -53,8 +54,9 @@
const eventName = event.event().name;
if (!eventName) return false;
// 敵データを名前一致で検索
const enemy = $dataEnemies.find(e => e && e.name === eventName);
// 敵データを名前一致で検索Troops.jsonはJP名のままなのでブリッジ
const troop = $dataTroops.find(t => t && t.name === eventName);
const enemy = troop ? $dataEnemies[troop.id] : $dataEnemies.find(e => e && e.name === eventName);
if (!enemy) return false;
// タグからIDを取得
@ -79,8 +81,9 @@
const eventName = event.event().name;
if (!eventName) return false;
// 敵データから同名のものを探す
const enemy = $dataEnemies.find(e => e && e.name === eventName);
// 敵データから同名のものを探すTroops.jsonはJP名のままなのでブリッジ
const troop = $dataTroops.find(t => t && t.name === eventName);
const enemy = troop ? $dataEnemies[troop.id] : $dataEnemies.find(e => e && e.name === eventName);
if (!enemy) return false;
// DefeatEventタグを抽出
@ -102,7 +105,9 @@
const eventName = event.event()?.name;
if (!eventName) return false;
const enemy = $dataEnemies.find(e => e && e.name === eventName);
// 敵データから同名のものを探すTroops.jsonはJP名のままなのでブリッジ
const troop = $dataTroops.find(t => t && t.name === eventName);
const enemy = troop ? $dataEnemies[troop.id] : $dataEnemies.find(e => e && e.name === eventName);
if (!enemy) return false;
// DefeatEventタグを抽出
@ -131,7 +136,7 @@
// 通知表示
if (notify) {
const msg = `${item.name}を獲得した!`;
const msg = `Obtained ${item.name}!`;
Torigoya.NotifyMessage.Manager.notify(new Torigoya.NotifyMessage.NotifyItem({ message: msg, icon: item.iconIndex }));
}
@ -140,9 +145,9 @@
// 汎用敗北記憶付与
static addCommonMemory = function() {
const item = $dataItems.find(i => i && i.name === "敗北の記憶");
const item = $dataItems.find(i => i && i.name === "Memory of Defeat");
if (!item) {
console.warn(`[EventHelper] アイテムが見つかりません: ${itemName}`);
console.warn(`[EventHelper] Item not found: Memory of Defeat`);
return false;
}
@ -179,8 +184,9 @@
const eventName = event.event()?.name;
if (!eventName) return "";
// 同名の敵データを検索
const enemy = $dataEnemies.find(e => e && e.name === eventName);
// 同名の敵データを検索Troops.jsonはJP名のままなのでブリッジ
const troop2 = $dataTroops.find(t => t && t.name === eventName);
const enemy = troop2 ? $dataEnemies[troop2.id] : $dataEnemies.find(e => e && e.name === eventName);
if (!enemy) return "";
// EndingEventタグからIDを抽出