X-Git-Url: http://git.megabrutal.com/?p=wgj58.git;a=blobdiff_plain;f=wgj58.js;h=ad6bbf82b9f1a34333cfada27581fb0d3c6ad444;hp=645ec529dc975380f69741b8c148b733ace1ac8b;hb=cf792c3120fd82f3d5c39b1638b2b6b4bb8ae241;hpb=06d4672b7c48de81f881e4452ce08c185bfb0f38

diff --git a/wgj58.js b/wgj58.js
index 645ec52..ad6bbf8 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;
 	}
 }
 
@@ -429,6 +430,7 @@ class NPC_Saiki extends GameNPC {
 							{ actor: this, text: "Hmm..." },
 							{ actor: this, text: "I guess it didn't work." },
 							{ actor: this, text: "So do you want to know what I think about this?" },
+							{ actor: this, text: "..." },
 							{ actor: this, text: "IT'S BRILLIANT!!!" },
 							{ actor: this, text: "You know, it really sparkled my artistic vision! Now I must draw a pig with its legs rooted into the ground!" },
 							{ actor: logic.player, text: "That's gross. Poor pig." },
@@ -438,7 +440,12 @@ class NPC_Saiki extends GameNPC {
 						//this.offscreenTeleportation(new Phaser.Point(logic.carlos.x + 128, logic.carlos.y), this.tpdone);
 					}
 					else {
-						logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "I've found an orchestrated rendition of „Potential for Anything”. You'll have to check it out, it's breathtaking!" } ] ));
+						if (Phaser.Math.random() < 0.5) {
+							logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "I've found an orchestrated rendition of „Potential for Anything”. You'll have to check it out, it's breathtaking!" } ] ));
+						}
+						else {
+							logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "I don't like that our department is green. The blue one, where Carlos works, looks much better." } ] ));
+						}
 					}
 			}
 		}
@@ -467,7 +474,7 @@ class NPC_Saiki extends GameNPC {
 						{ actor: this, text: "..." } ] ));
 					break;
 				default:
-					logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "Don't you have anything better to do?" } ] ));
+					logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "Don't you have anything better to do, Carlos?" } ] ));
 			}
 		}
 		super.actionTalk();
@@ -538,9 +545,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;
@@ -603,6 +615,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;
 	}
 
@@ -611,7 +624,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();
 		}
@@ -687,7 +707,7 @@ class GameLogic {
 				this.carlos = newChar;
 				break;
 			case 'saiki':
-				newChar = new NPC_Saiki(object.x, object.y, 'saiki', "Saiki", "Saiki Ytpme", 200);
+				newChar = new NPC_Saiki(object.x, object.y, 'saiki', "Saiki", "Saiki Ytpme", 150);
 				this.saiki = newChar;
 				break;
 			default: