X-Git-Url: http://git.megabrutal.com/?p=wgj58.git;a=blobdiff_plain;f=wgj58.js;h=f14b63701cb75c1c2a2d4ca52771e23f77edb6ac;hp=dec883db915cf0f88c86d978626deac56f1b7fc1;hb=81bb6540ae4d78f6a77f803d4a287c87bd1ac7e1;hpb=69d387036efbf36522919bcdb3b3bd5c33d5b147

diff --git a/wgj58.js b/wgj58.js
index dec883d..f14b637 100644
--- a/wgj58.js
+++ b/wgj58.js
@@ -159,6 +159,7 @@ class Player extends Phaser.Sprite {
 	takeMe(npc) {
 		this.loadTexture(npc.key);
 		npc.kill();
+		this.disguise = npc;
 	}
 }
 
@@ -222,7 +223,8 @@ class NPC_Clara extends GameNPC {
 					{ actor: logic.player, text: "Well, maybe if we dare to joke about it, it won't happen to us..." },
 					{ actor: this, text: "Wish it worked like that... Is it some superstition like the belief that having an umbrella with you prevents rain?" },
 					{ actor: logic.player, text: "Nah, that actually works; it's not a superstition, but Murphy's Law!" },
-					{ actor: this, text: "If you say so..." } ] ));
+					{ actor: this, text: "If you say so..." },
+					{ actor: this, text: "Anyway, I logged you in and opened the door for you." } ] ));
 				logic.openDoor("cutedoor");
 				break;
 			case 1:
@@ -311,7 +313,7 @@ class NPC_Carlos extends GameNPC {
 					logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "You know, generally, I think it sucks being a child. One thing I miss though, if you're a child, you're allowed to be silly." },
 						{ actor: this, text: "..." },
 						{ actor: this, text: "For example, when my Dad told me that semen is the seed of animals, I theoretized, if I'd bury some pig semen in the garden, a pig would grow out of it..." },
-						{ actor: this, text: "I was totally fascinated by the thought, because I really wanted to have a pet pig, but Dad wouldn't let me to have one." },
+						{ actor: this, text: "I was totally fascinated by the thought, because I really wanted to have a pet pig, but Dad wouldn't let me have one." },
 						{ actor: this, text: "So I thought I could grow my own pig in the garden from pig seeds!" },
 						{ actor: logic.player, text: "Interesting. Where are you going with this?" },
 						{ actor: this, text: "I don't know... sometimes I feel like I'd rather sell pig semen to our clients, heh!" },
@@ -537,9 +539,14 @@ class GameInterface extends Phaser.Group {
 		this.back_talk.lineTo(this.back_talk.width - 10, 35);
 		this.add(this.back_talk);
 		style = { align: 'left', fill: 'yellow', font: 'Ubuntu Mono', fontSize: 22, fontWeight: 'bold' };
-		this.text_talktitle = new Phaser.Text(game, this.back_talk.x, this.back_talk.y, null, style);
-		this.text_talktitle.anchor.setTo(-0.2, -0.2);
+		this.text_talktitle = new Phaser.Text(game, this.back_talk.x + 15, this.back_talk.y + 6, null, style);
+		//this.text_talktitle.anchor.setTo(-0.2, -0.2);
 		this.add(this.text_talktitle);
+		this.strikethrough_talktitle = new Phaser.Graphics(game, this.back_talk.x, this.back_talk.y);
+		this.strikethrough_talktitle.lineStyle(3, Phaser.Color.RED, 1);
+		this.strikethrough_talktitle.moveTo(12, 20);
+		this.strikethrough_talktitle.lineTo(67, 20);
+		this.add(this.strikethrough_talktitle);
 		style = { align: 'left', fill: 'white', font: 'Ubuntu Mono', fontSize: 18, fontWeight: 'bold' };
 		this.text_talk = new Phaser.Text(game, this.back_talk.x + 35, this.back_talk.y + 40, null, style);
 		this.text_talk.wordWrap = true;
@@ -602,6 +609,7 @@ class GameInterface extends Phaser.Group {
 		this.dialogue = null;
 		this.back_talk.visible = false;
 		this.text_talktitle.visible = false;
+		this.strikethrough_talktitle.visible = false;
 		this.text_talk.visible = false;
 	}
 
@@ -610,7 +618,14 @@ class GameInterface extends Phaser.Group {
 		console.log(this.dialogue.actual());
 		var actualdialogue = this.dialogue.actual();
 		if (actualdialogue) {
-			this.text_talktitle.text = actualdialogue.actor.shortname;
+			if (actualdialogue.actor.disguise) {
+				this.text_talktitle.text = actualdialogue.actor.shortname + " " + actualdialogue.actor.disguise.shortname;
+				this.strikethrough_talktitle.visible = true;
+			}
+			else {
+				this.text_talktitle.text = actualdialogue.actor.shortname;
+				this.strikethrough_talktitle.visible = false;
+			}
 			this.text_talk.text = actualdialogue.text;
 			this.dialogue.advance();
 		}