Working option selection 🎉
This commit is contained in:
parent
610d107e60
commit
e1bdd74100
@ -66,11 +66,11 @@ dialogue-box {
|
|||||||
/* background-tile-pos: 1 1; */
|
/* background-tile-pos: 1 1; */
|
||||||
background: blue;
|
background: blue;
|
||||||
padding: 10;
|
padding: 10;
|
||||||
|
alpha: 0.9;
|
||||||
}
|
}
|
||||||
|
|
||||||
dialogue-options {
|
dialogue-options {
|
||||||
fill-width: true;
|
fill-width: true;
|
||||||
background: red;
|
|
||||||
layout: vertical;
|
layout: vertical;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,4 +78,9 @@ dialogue-option {
|
|||||||
fill-width: true;
|
fill-width: true;
|
||||||
background: green;
|
background: green;
|
||||||
padding: 10;
|
padding: 10;
|
||||||
|
alpha: 0.9;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialogue-option.disabled {
|
||||||
|
alpha: 0.5;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package components;
|
package components;
|
||||||
|
|
||||||
import dialogue.event.NextLine;
|
import dialogue.event.NextLine;
|
||||||
|
import dialogue.event.OptionSelected;
|
||||||
import dialogue.event.OptionsShown.OptionChoice;
|
import dialogue.event.OptionsShown.OptionChoice;
|
||||||
|
|
||||||
@:uiComp("dialogue-option")
|
@:uiComp("dialogue-option")
|
||||||
@ -19,9 +20,16 @@ class DialogueOptionComponent extends h2d.Flow implements h2d.domkit.Object {
|
|||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function new(label:String, ?parent) {
|
var choice:OptionChoice;
|
||||||
|
|
||||||
|
public function new(choice:OptionChoice, ?parent) {
|
||||||
super(parent);
|
super(parent);
|
||||||
initComponent();
|
initComponent();
|
||||||
|
this.choice = choice;
|
||||||
|
this.label = choice.text;
|
||||||
|
if (!choice.enabled) {
|
||||||
|
this.dom.addClass('disabled');
|
||||||
|
}
|
||||||
enableInteractive = true;
|
enableInteractive = true;
|
||||||
interactive.onClick = function(_) onClick();
|
interactive.onClick = function(_) onClick();
|
||||||
interactive.onOver = function(_) {
|
interactive.onOver = function(_) {
|
||||||
@ -38,7 +46,10 @@ class DialogueOptionComponent extends h2d.Flow implements h2d.domkit.Object {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public dynamic function onClick() {}
|
public dynamic function onClick() {
|
||||||
|
if (this.choice.enabled)
|
||||||
|
Game.current.globalEventBus.publishEvent(new OptionSelected(this.choice.index));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@:uiComp("dialogue-options")
|
@:uiComp("dialogue-options")
|
||||||
@ -54,7 +65,7 @@ class DialogueOptionsComponent extends h2d.Flow implements h2d.domkit.Object {
|
|||||||
initComponent();
|
initComponent();
|
||||||
for (option in options) {
|
for (option in options) {
|
||||||
this.options.push(
|
this.options.push(
|
||||||
new DialogueOptionComponent(option.text, this)
|
new DialogueOptionComponent(option, this)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,8 @@ import dialogue.event.NextLine;
|
|||||||
import components.DialogueBoxComponent;
|
import components.DialogueBoxComponent;
|
||||||
|
|
||||||
class DialogueBoxController {
|
class DialogueBoxController {
|
||||||
public var curDialogue:DialogueBoxComponent;
|
public var dialogueBox:DialogueBoxComponent;
|
||||||
|
public var dialogueOptions:DialogueOptionsComponent;
|
||||||
|
|
||||||
var game:Game;
|
var game:Game;
|
||||||
var bg:h2d.ScaleGrid;
|
var bg:h2d.ScaleGrid;
|
||||||
@ -28,25 +29,10 @@ class DialogueBoxController {
|
|||||||
public function new(eventBus:EventBus, parent:h2d.Object, style:h2d.domkit.Style) {
|
public function new(eventBus:EventBus, parent:h2d.Object, style:h2d.domkit.Style) {
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
this.style = style;
|
this.style = style;
|
||||||
// game = Game.current;
|
|
||||||
// parent.getScene().add(this, 1);
|
|
||||||
// bg = new h2d.ScaleGrid(Res.ui.toTile(), 5, 5, this);
|
|
||||||
// bg.colorKey = 0xFF00FF;
|
|
||||||
// tf = new h2d.Text(game.font, this);
|
|
||||||
// tf.y = 5;
|
|
||||||
// tf.x = 7;
|
|
||||||
// tf.dropShadow = {
|
|
||||||
// dx: 0,
|
|
||||||
// dy: 1,
|
|
||||||
// color: 0,
|
|
||||||
// alpha: 0.3
|
|
||||||
// };
|
|
||||||
// int = new h2d.Interactive(0, 0, this);
|
|
||||||
// int.onClick = function(_) click();
|
|
||||||
|
|
||||||
eventBus.subscribe(LineShown, dialogue);
|
eventBus.subscribe(LineShown, onLineShown);
|
||||||
eventBus.subscribe(OptionsShown, renderOptions);
|
eventBus.subscribe(OptionsShown, onOptionsShown);
|
||||||
// eventBus.subscribe(OptionSelected, onOptionSelected);
|
eventBus.subscribe(OptionSelected, onOptionSelected);
|
||||||
eventBus.subscribe(DialogueComplete, onDialogueComplete);
|
eventBus.subscribe(DialogueComplete, onDialogueComplete);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,59 +47,28 @@ class DialogueBoxController {
|
|||||||
|
|
||||||
public dynamic function onReady() {}
|
public dynamic function onReady() {}
|
||||||
|
|
||||||
function dialogue(event:LineShown) {
|
function onLineShown(event:LineShown) {
|
||||||
if (curDialogue != null) {
|
if (dialogueBox != null) {
|
||||||
curDialogue.remove();
|
dialogueBox.remove();
|
||||||
}
|
}
|
||||||
var d = new DialogueBoxComponent(event.line(), this.parent);
|
var d = new DialogueBoxComponent(event.line(), this.parent);
|
||||||
style.addObject(d);
|
style.addObject(d);
|
||||||
|
|
||||||
curDialogue = d;
|
dialogueBox = d;
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderOptions(event:OptionsShown) {
|
function onOptionsShown(event:OptionsShown) {
|
||||||
new DialogueOptionsComponent(event.options, this.parent);
|
dialogueOptions = new DialogueOptionsComponent(event.options, this.parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onOptionSelected(event:OptionSelected) {
|
||||||
|
dialogueOptions.remove();
|
||||||
}
|
}
|
||||||
//
|
|
||||||
// function newPanel(w, h) {
|
|
||||||
// var g = new h2d.ScaleGrid(Res.ui.toTile(), 5, 5);
|
|
||||||
// g.width = w;
|
|
||||||
// g.height = h;
|
|
||||||
// g.colorKey = 0xFF00FF;
|
|
||||||
// root.scene.getH2dObject().getScene().add(g, 1);
|
|
||||||
// return g;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// function addOption(o:String, enabled:Bool, callback:() -> Void) {
|
|
||||||
// var spr = newPanel(Const.W, 60);
|
|
||||||
// curDialogue.addChild(spr);
|
|
||||||
// var tf = new h2d.Text(font, spr);
|
|
||||||
// if (!enabled) {
|
|
||||||
// tf.color = new Vector4(0.5, 0.5, 0.5, 1);
|
|
||||||
// }
|
|
||||||
// tf.text = o;
|
|
||||||
// tf.x = 10;
|
|
||||||
// tf.y = 10;
|
|
||||||
// spr.x = 0;
|
|
||||||
// spr.y = 100 + options.length * 60;
|
|
||||||
// var int = new h2d.Interactive(spr.width, spr.height, spr);
|
|
||||||
// int.onClick = function(_) {
|
|
||||||
// callback();
|
|
||||||
// }
|
|
||||||
// int.cursor = Button;
|
|
||||||
// options.push(spr);
|
|
||||||
// return spr;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// function onOptionSelected(event:OptionSelected) {
|
|
||||||
// for (o in options) {
|
|
||||||
// o.remove();
|
|
||||||
// }
|
|
||||||
// options.splice(0, options.length);
|
|
||||||
// }
|
|
||||||
|
|
||||||
function onDialogueComplete(event:DialogueComplete) {
|
function onDialogueComplete(event:DialogueComplete) {
|
||||||
curDialogue.remove();
|
dialogueBox.remove();
|
||||||
|
if (dialogueOptions != null)
|
||||||
|
dialogueOptions.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user