Commit changes

Author: nzeroxed

Driver2CutsceneTool/Driver2CutsceneTool.args.json

@@ -0,0 +1,10 @@
+{
+  "FileVersion": 2,
+  "Id": "7b62800d-e7c3-5d1b-7031-a4cddc9194da",
+  "Items": [
+    {
+      "Id": "c4274155-c11b-4ad9-900a-db8a1715e2be",
+      "Command": "-pack CUT3"
+    }
+  ]
+}

Driver2CutsceneTool/cutscene_tool.cpp

@@ -260,13 +260,14 @@ void PackCutsceneFile(const char* foldername)
 
 	int numCutsceneReplays = 0;
 	int numChaseReplays = 0;
-
+	bool hasChases = false;
 	for (int i = 0; i < MAX_FILE_CUTSCENES; i++)
 	{
 		String folderPath = String::fromPrintf("%s/%s_%d.D2RP", foldername, foldername, i);
 		FILE* fp = fopen(String::fromPrintf("%s/%s_%d.D2RP", foldername, foldername, i), "rb");
 		if (fp)
 		{
+			if (i > 1) hasChases = true;
 			if (i == 0)
 			{
 				MsgAccept("Got intro cutscene\n");
@@ -367,7 +368,7 @@ void PackCutsceneFile(const char* foldername)
 		MsgWarning("No chase replays\n");
 	}
 
-	String folderPath = String::fromPrintf("%s_N.R", foldername);
+	String folderPath = String::fromPrintf("%s.R", foldername);
 
 	FILE* wp = fopen(folderPath, "wb");
 
@@ -386,7 +387,7 @@ void PackCutsceneFile(const char* foldername)
 	char* bufptr = buffer;
 	offset = 2048;
 
-	for (int i = 0; i < MAX_FILE_CUTSCENES; i++)
+	for (int i = 0; i < (hasChases ? MAX_FILE_CUTSCENES : 2); i++)
 	{
 		int replayId = i;
 
@@ -398,7 +399,7 @@ void PackCutsceneFile(const char* foldername)
 		{
 			if (i == 0 || i == 1)
 				continue;
-
+			
 			if (numChaseReplays > 0)
 			{
 				do

Driver2MissionTool/Driver2MissionTool.args.json

@@ -0,0 +1,10 @@
+{
+  "FileVersion": 2,
+  "Id": "63d5b066-4fb9-71bc-b819-6c0fa41c5c3e",
+  "Items": [
+    {
+      "Id": "71148420-6089-4632-80ad-4137c85455cc",
+      "Command": "-make test.d2ms"
+    }
+  ]
+}

Driver2MissionTool/mission.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstring>
+
 #include "core/dktypes.h"
 #include "math/psx_math_types.h"
 
@@ -60,7 +62,33 @@ enum MR_COMMAND_FLAGS
 
 };
 
-int COMMANDS[22][2]
+const char* COMMANDS_STR[22]
+{
+	"PlayCutscene",
+	"CompleteAllActiveTargets",
+	"SetVariable",
+	"Jump",
+	"BranchIf",
+	"MultiCarEvent",
+	"SetPlayerFelony",
+	"ShowPlayerMessage",
+	"TriggerEvent",
+	"SetDoorsLocked",
+	"SetStealMessage",
+	"ShowOutOfTimeMessage",
+	"StopThread",
+	"StarThreadForPlayer",
+	"StartThread2",
+	"SetCameraEvent",
+	"AwardPlayerCheat",
+	"SetRaining",
+	"SetMissionComplete",
+	"SetTimerFlagCounter",
+	"SetBombTimerFlag",
+	"UnSetTimerFlagCount"
+};
+
+const uint COMMANDS[22][2]
 {
 	{CMD_PlayCutscene, 1},
 	{CMD_CompleteAllActiveTargets, 0},