Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Dialogue development #421

Open
pranshu6 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dialogue development #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8f739f
Dialogue Fixes
pranshu-gg Jul 22, 2022
931dccc
Merge branch 'master' of https://www.github.com/moddio/taro into dial…
pranshu-gg Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/ServerNetworkEvents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,8 @@ var ServerNetworkEvents = {
ige.network.send("openDialogue", {
type: selectedOption.followUpDialogue,
extraData: {
playerName: player._stats.name
playerName: player._stats.name,
dialogueTemplate: _.get(ige, "game.data.ui.dialogueview.htmlData", "")
}
}, player._stats.clientId);
}
Expand Down
3 changes: 2 additions & 1 deletion src/gameClasses/components/script/ActionComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,8 @@ var ActionComponent = IgeEntity.extend({
type: action.dialogue,
extraData: {
playerName: player._stats && player._stats.name,
variables: primitiveVariables
variables: primitiveVariables,
dialogueTemplate: _.get(ige, "game.data.ui.dialogueview.htmlData", "")
}
}, player._stats.clientId);
}
Expand Down
138 changes: 47 additions & 91 deletions src/gameClasses/components/ui/PlayerUiComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,18 @@ var PlayerUiComponent = IgeEntity.extend({
},

openDialogueModal: function (dialogueId, extraData) {
let dialogueTemplate = extraData.dialogueTemplate || window.defaultUI.defaultDialogueTemplate

window.handleOptionClick = function (e, index){
e.preventDefault();
e.stopPropagation();
const optionId = index.toString()
$('.dialogue-option').addClass('disabled');
$(this).find('.option-check').removeClass('d-none');
ige.playerUi.submitDialogueModal(dialogueId, optionId);
}

const renderDialogueTemplate = window.renderDialogueTemplate;
var self = this;

function getDialogueInstance (dialogue) {
Expand Down Expand Up @@ -283,123 +295,74 @@ var PlayerUiComponent = IgeEntity.extend({
dialogue.hasOptions = function () {
return Object.keys(dialogue.options).length > 0;
};

dialogue.areOptionsRendered = false;

return dialogue;
}

function initModal () {
$('#modd-dialogue-message').html('');
$('#modd-dialogue-image').attr('src', '');
$('#modd-dialogue-options-container').addClass('d-none');
$('#modd-dialogue-skip-hint').addClass('d-none');
renderDialogueTemplate({
dialogue: {
...dialogue,
message: '',
options: []
}
}, dialogueTemplate);

if (self.dialogue.messagePrinter) {
clearInterval(self.dialogue.messagePrinter);
}

if (dialogue.image) {
$('#modd-dialogue-image-container').removeClass('d-none');
$('#modd-dialogue-message-container').addClass('col-8');
$('#modd-dialogue-message-container').addClass('pl-md-0');
$('#modd-dialogue-message-container').removeClass('col-12');
$('#modd-dialogue-image').attr('src', dialogue.image);
} else {
$('#modd-dialogue-image-container').addClass('d-none');
$('#modd-dialogue-message-container').removeClass('col-8');
$('#modd-dialogue-message-container').addClass('col-12');
$('#modd-dialogue-image').attr('src', '');
}

$(document).on('keydown.modd-dialogue', keyboardListener);
$(document).on('click.modd-dialogue', skipText);
}

function printingCompleted () {
window.isPrintingDialogue = false;

if (dialogue.areAllMessagesPrinted()) {
if (dialogue.hasOptions()) {
if (!dialogue.areOptionsRendered) {
showOptions();
}
} else {
$('#modd-dialogue-skip-hint').removeClass('d-none');
}
} else {
$('#modd-dialogue-skip-hint').removeClass('d-none');
}
}

function showOptions () {
$('#modd-dialogue-options').html('');

for (var key in dialogue.options) {
var optionObject = dialogue.options[key];
var button = $('<button/>', {
id: key,
class: 'btn btn-light border btn-block text-left dialogue-option-button',
click: function () {
var optionId = this.id;
$('.dialogue-option-button').addClass('disabled');
$(this).find('.fa-check').removeClass('d-none');
ige.playerUi.submitDialogueModal(dialogueId, optionId);
}
});

button.append($('<i/>', { class: 'd-none fa fa-check mr-2' }));
button.append($('<span/>', { text: optionObject.name }));

$('#modd-dialogue-options').append(button);
}

$('#modd-dialogue-skip-hint').addClass('d-none');
$('#modd-dialogue-options-container').removeClass('d-none');

dialogue.areOptionsRendered = true;

renderDialogueTemplate({
dialogue: {
...dialogue,
message: self.dialogue.message
},
}, dialogueTemplate)
}

function showNextMessage () {
if (dialogue.areAllMessagesPrinted()) {
if (dialogue.hasOptions()) {
if (!dialogue.areOptionsRendered) {
showOptions();
}
if (dialogue.hasOptions() && !dialogue.areOptionsRendered) {
showOptions();
} else {
self.closeDialogueModal();
}
} else {
self.dialogue.message = dialogue.getNextMessage();
self.dialogue.message = self.dialogue.message.replace(/%nl%/g, '<br/>');
window.isPrintingDialogue = true;
$('#modd-dialogue-message').html('');
$('#modd-dialogue-skip-hint').addClass('d-none');
self.dialogue.messagePrinter = $('#modd-dialogue-message').length && $('#modd-dialogue-message')
.writeText(self.dialogue.message, dialogue.letterPrintSpeed, printingCompleted);

let options = []
if (dialogue.areAllMessagesPrinted() && dialogue.hasOptions() && !dialogue.areOptionsRendered) {
dialogue.areOptionsRendered = true;
options = dialogue.options
}

renderDialogueTemplate({
dialogue: {
...dialogue,
message: self.dialogue.message,
options: options
}
}, dialogueTemplate)
}
}

function skipText () {
if (window.isPrintingDialogue) {
clearInterval(self.dialogue.messagePrinter);
$('#modd-dialogue-message').html(self.dialogue.message);
$('#modd-dialogue-skip-hint').removeClass('d-none');
window.isPrintingDialogue = false;

// if
// 1. user skips text in last fragment and
// 2. dialogue has options and
// 3. those options are still hidden
// then direct render the options dont ask user for one more action

if (dialogue.areAllMessagesPrinted() && dialogue.hasOptions() && !dialogue.areOptionsRendered) {
showOptions();
}
} else {
if(! (dialogue.hasOptions() && dialogue.areOptionsRendered)){
showNextMessage();
}
}

function keyboardListener (e) {
if (e.keyCode === 13 || e.keyCode === 32) {
e.stopPropagation();
Expand All @@ -413,19 +376,13 @@ var PlayerUiComponent = IgeEntity.extend({
dialogue = getDialogueInstance(dialogue);
initModal();
showNextMessage();

$('#modd-dialogue-modal').modal('show');
} else {
console.error('dialogue', dialogueId, 'not found');
}
},

closeDialogueModal: function () {
$('#modd-dialogue-message').html('');
$('#modd-dialogue-options-container').addClass('d-none');
$('#modd-dialogue-image').attr('src', '');
$('#modd-dialogue-modal').modal('hide');

window.closeDialogue && window.closeDialogue();
$("#modd-dialogue-container").html('');
this.clearListeners();
},

Expand All @@ -445,7 +402,6 @@ var PlayerUiComponent = IgeEntity.extend({
break;
}
}

if (willOpenNewDialogue) {
this.clearListeners();
} else {
Expand Down