MUTATIONOFJB: Basic conversation support.

3 files changed, 134 insertions, 1 deletions

diff --git a/engines/mutationofjb/commands/ifitemcommand.h b/engines/mutationofjb/commands/ifitemcommand.h
index f11ba7cbfb..df073b9fa4 100644
--- a/engines/mutationofjb/commands/ifitemcommand.h
+++ b/engines/mutationofjb/commands/ifitemcommand.h
@@ -33,7 +33,7 @@ class ScriptParseContext;
 
 class IfItemCommandParser : public ConditionalCommandParser {
 public:
-	virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command);
+	virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override;
 };
 
 class IfItemCommand : public ConditionalCommand {
diff --git a/engines/mutationofjb/commands/talkcommand.cpp b/engines/mutationofjb/commands/talkcommand.cpp
new file mode 100644
index 0000000000..d0775e481f
--- /dev/null
+++ b/engines/mutationofjb/commands/talkcommand.cpp
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mutationofjb/commands/talkcommand.h"
+#include "mutationofjb/tasks/conversationtask.h"
+#include "mutationofjb/script.h"
+#include "mutationofjb/game.h"
+#include "common/str.h"
+
+namespace MutationOfJB {
+
+bool TalkCommandParser::parse(const Common::String &line, ScriptParseContext &, Command *&command) {
+	if (line.size() < 11 || !line.hasPrefix("TALK TO HIM")) {
+		return false;
+	}
+
+	int modeInt = 0;
+
+	if (line.size() >= 13) {
+		modeInt = atoi(line.c_str() + 12);
+	}
+
+	TalkCommand::Mode mode = TalkCommand::NORMAL_MODE;
+
+	if (modeInt == 1) {
+		mode = TalkCommand::RAY_AND_BUTTLEG_MODE;
+	} else if (modeInt == 3) {
+		mode = TalkCommand::CARNIVAL_TICKET_SELLER_MODE;
+	}
+
+	command = new TalkCommand(mode);
+	return true;
+}
+
+Command::ExecuteResult TalkCommand::execute(ScriptExecutionContext &scriptExeCtx) {
+	if (!_task) {
+		_task = new ConversationTask(scriptExeCtx.getGame().getGameData()._conversationInfo);
+		scriptExeCtx.getGame().getTaskManager().addTask(_task);
+	}
+
+	if (_task->getState() == Task::FINISHED) {
+		scriptExeCtx.getGame().getTaskManager().removeTask(_task);
+		delete _task;
+		_task = nullptr;
+
+		return Command::Finished;
+	}
+
+	return Command::InProgress;
+}
+
+Common::String TalkCommand::debugString() const {
+	const char * modes[] = {"NORMAL", "RAY_AND_BUTTLEG", "CARNIVAL_TICKET_SELLER"};
+	return Common::String::format("TALK %s", modes[(int) _mode]);
+}
+
+}
diff --git a/engines/mutationofjb/commands/talkcommand.h b/engines/mutationofjb/commands/talkcommand.h
new file mode 100644
index 0000000000..09424b2f06
--- /dev/null
+++ b/engines/mutationofjb/commands/talkcommand.h
@@ -0,0 +1,57 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef MUTATIONOFJB_TALKCOMMAND_H
+#define MUTATIONOFJB_TALKCOMMAND_H
+
+#include "mutationofjb/commands/seqcommand.h"
+#include "common/scummsys.h"
+
+namespace MutationOfJB {
+
+class ConversationTask;
+
+class TalkCommandParser : public SeqCommandParser {
+public:
+	virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override;
+};
+
+class TalkCommand : public SeqCommand {
+public:
+	enum Mode {
+		NORMAL_MODE,
+		RAY_AND_BUTTLEG_MODE,
+		CARNIVAL_TICKET_SELLER_MODE
+	};
+
+	TalkCommand(Mode mode) : _mode(mode), _task(nullptr) {}
+	virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
+	virtual Common::String debugString() const;
+
+private:
+	Mode _mode;
+	ConversationTask *_task;
+};
+
+}
+
+#endif