mirror of
https://github.com/cliffe/BreakEscape.git
synced 2026-02-23 12:18:06 +00:00
fix(chat-helpers): Correctly handle NPC hostility event in game action tags
This commit is contained in:
@@ -236,6 +236,8 @@ export function processGameActionTags(tags, ui) {
|
||||
if (window.eventDispatcher) {
|
||||
window.eventDispatcher.emit('npc_became_hostile', { npcId });
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'clone_keycard':
|
||||
// Parameter is the card_id to clone
|
||||
// Look up card data from NPC's rfidCard property
|
||||
|
||||
@@ -71,13 +71,11 @@ import { PasswordMinigame } from './password/password-minigame.js';
|
||||
// Import the text file minigame
|
||||
import { TextFileMinigame, returnToTextFileAfterNotes } from './text-file/text-file-minigame.js';
|
||||
|
||||
<<<<<<< HEAD
|
||||
// Import the title screen minigame
|
||||
import { TitleScreenMinigame, startTitleScreenMinigame } from './title-screen/title-screen-minigame.js';
|
||||
=======
|
||||
|
||||
// Import the RFID minigame
|
||||
import { RFIDMinigame, startRFIDMinigame, returnToConversationAfterRFID } from './rfid/rfid-minigame.js';
|
||||
>>>>>>> a4e2561 (feat(rfid): Implement core RFID minigame system)
|
||||
|
||||
// Register minigames
|
||||
MinigameFramework.registerScene('lockpicking', LockpickingMinigamePhaser); // Use Phaser version as default
|
||||
@@ -92,11 +90,8 @@ MinigameFramework.registerScene('person-chat', PersonChatMinigame);
|
||||
MinigameFramework.registerScene('pin', PinMinigame);
|
||||
MinigameFramework.registerScene('password', PasswordMinigame);
|
||||
MinigameFramework.registerScene('text-file', TextFileMinigame);
|
||||
<<<<<<< HEAD
|
||||
MinigameFramework.registerScene('title-screen', TitleScreenMinigame);
|
||||
=======
|
||||
MinigameFramework.registerScene('rfid', RFIDMinigame);
|
||||
>>>>>>> a4e2561 (feat(rfid): Implement core RFID minigame system)
|
||||
|
||||
// Make minigame functions available globally
|
||||
window.startNotesMinigame = startNotesMinigame;
|
||||
@@ -109,9 +104,6 @@ window.returnToConversationAfterNPCInventory = returnToConversationAfterNPCInven
|
||||
window.returnToPhoneAfterNotes = returnToPhoneAfterNotes;
|
||||
window.returnToTextFileAfterNotes = returnToTextFileAfterNotes;
|
||||
window.startPinMinigame = startPinMinigame;
|
||||
<<<<<<< HEAD
|
||||
window.startTitleScreenMinigame = startTitleScreenMinigame;
|
||||
=======
|
||||
window.startTitleScreenMinigame = startTitleScreenMinigame;
|
||||
window.startRFIDMinigame = startRFIDMinigame;
|
||||
window.returnToConversationAfterRFID = returnToConversationAfterRFID;
|
||||
>>>>>>> a4e2561 (feat(rfid): Implement core RFID minigame system)
|
||||
window.returnToConversationAfterRFID = returnToConversationAfterRFID;
|
||||
|
||||
Reference in New Issue
Block a user