Split STRTAB further into STRTAB and CONVERSATION

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2974 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/ChangeLog

@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Split STRTAB further into STRTAB and CONVERSATION - Michael
 - INT32, BOOLEAN, and STRING resource types - Michael
 - UNKNOWNRES is now safe to load, and "loads" as its resvalue - Michael
 - CODE is now SHIP, and uses an integer descriptor instead of a one-byte

sc2/content/uqm.rmp

@@ -5,128 +5,128 @@ colortable.ip_sun = BINTAB:ipanims/ip_sun.ct
 colortable.orbplan = BINTAB:ipanims/orbplan.ct
 colortable.scclrtab = BINTAB:lbm/scclrtab.ct
 comm.arilou.colortable = BINTAB:comm/arilou/arilou.ct
-comm.arilou.dialogue = STRTAB:comm/arilou/arilou.txt
+comm.arilou.dialogue = CONVERSATION:comm/arilou/arilou.txt
 comm.arilou.font = FONTRES:comm/arilou/arilou.fon
 comm.arilou.graphics = GFXRES:comm/arilou/arilou.ani
 comm.arilou.music = MUSICRES:comm/arilou/arilou.mod
 comm.chmmr.colortable = BINTAB:comm/chmmr/chmmr.ct
-comm.chmmr.dialogue = STRTAB:comm/chmmr/chmmr.txt
+comm.chmmr.dialogue = CONVERSATION:comm/chmmr/chmmr.txt
 comm.chmmr.font = FONTRES:comm/chmmr/chmmr.fon
 comm.chmmr.graphics = GFXRES:comm/chmmr/chmmr.ani
 comm.chmmr.music = MUSICRES:comm/chmmr/chmmr.mod
 comm.commander.colortable = BINTAB:comm/comandr/comandr.ct
-comm.commander.dialogue = STRTAB:comm/comandr/comandr.txt
+comm.commander.dialogue = CONVERSATION:comm/comandr/comandr.txt
 comm.commander.font = FONTRES:comm/comandr/comandr.fon
 comm.commander.graphics = GFXRES:comm/comandr/comandr.ani
 comm.commander.music = MUSICRES:comm/comandr/comandr.mod
 comm.druuge.colortable = BINTAB:comm/druuge/druuge.ct
-comm.druuge.dialogue = STRTAB:comm/druuge/druuge.txt
+comm.druuge.dialogue = CONVERSATION:comm/druuge/druuge.txt
 comm.druuge.font = FONTRES:comm/druuge/druuge.fon
 comm.druuge.graphics = GFXRES:comm/druuge/druuge.ani
 comm.druuge.music = MUSICRES:comm/druuge/druuge.mod
 comm.ilwrath.colortable = BINTAB:comm/ilwrath/ilwrath.ct
-comm.ilwrath.dialogue = STRTAB:comm/ilwrath/ilwrath.txt
+comm.ilwrath.dialogue = CONVERSATION:comm/ilwrath/ilwrath.txt
 comm.ilwrath.font = FONTRES:comm/ilwrath/ilwrath.fon
 comm.ilwrath.graphics = GFXRES:comm/ilwrath/ilwrath.ani
 comm.ilwrath.music = MUSICRES:comm/ilwrath/ilwrath.mod
 comm.kohrah.colortable = BINTAB:comm/blackur/blackur.ct
-comm.kohrah.dialogue = STRTAB:comm/blackur/blackur.txt
+comm.kohrah.dialogue = CONVERSATION:comm/blackur/blackur.txt
 comm.kohrah.font = FONTRES:comm/blackur/blackur.fon
 comm.kohrah.graphics = GFXRES:comm/blackur/blackur.ani
 comm.kohrah.music = MUSICRES:comm/blackur/blackur.mod
 comm.melnorme.colortable = BINTAB:comm/melnorm/melnorm.ct
-comm.melnorme.dialogue = STRTAB:comm/melnorm/melnorm.txt
+comm.melnorme.dialogue = CONVERSATION:comm/melnorm/melnorm.txt
 comm.melnorme.font = FONTRES:comm/melnorm/melnorm.fon
 comm.melnorme.graphics = GFXRES:comm/melnorm/melnorm.ani
 comm.melnorme.music = MUSICRES:comm/melnorm/melnorm.mod
 comm.mycon.colortable = BINTAB:comm/mycon/mycon.ct
-comm.mycon.dialogue = STRTAB:comm/mycon/mycon.txt
+comm.mycon.dialogue = CONVERSATION:comm/mycon/mycon.txt
 comm.mycon.font = FONTRES:comm/mycon/mycon.fon
 comm.mycon.graphics = GFXRES:comm/mycon/mycon.ani
 comm.mycon.music = MUSICRES:comm/mycon/mycon.mod
 comm.orz.colortable = BINTAB:comm/orz/orz.ct
-comm.orz.dialogue = STRTAB:comm/orz/orz.txt
+comm.orz.dialogue = CONVERSATION:comm/orz/orz.txt
 comm.orz.font = FONTRES:comm/orz/orz.fon
 comm.orz.graphics = GFXRES:comm/orz/orz.ani
 comm.orz.music = MUSICRES:comm/orz/orz.mod
 comm.pkunk.colortable = BINTAB:comm/pkunk/pkunk.ct
-comm.pkunk.dialogue = STRTAB:comm/pkunk/pkunk.txt
+comm.pkunk.dialogue = CONVERSATION:comm/pkunk/pkunk.txt
 comm.pkunk.font = FONTRES:comm/pkunk/pkunk.fon
 comm.pkunk.graphics = GFXRES:comm/pkunk/pkunk.ani
 comm.pkunk.music = MUSICRES:comm/pkunk/pkunk.mod
 comm.shofixti.colortable = BINTAB:comm/shofixt/shofixt.ct
-comm.shofixti.dialogue = STRTAB:comm/shofixt/shofixt.txt
+comm.shofixti.dialogue = CONVERSATION:comm/shofixt/shofixt.txt
 comm.shofixti.font = FONTRES:comm/shofixt/shofixt.fon
 comm.shofixti.graphics = GFXRES:comm/shofixt/shofixt.ani
 comm.shofixti.music = MUSICRES:comm/shofixt/shofixt.mod
 comm.slyhome.colortable = BINTAB:comm/slyhome/slyhome.ct
-comm.slyhome.dialogue = STRTAB:comm/slyhome/slyhome.txt
+comm.slyhome.dialogue = CONVERSATION:comm/slyhome/slyhome.txt
 comm.slyhome.font = FONTRES:comm/slyhome/slyhome.fon
 comm.slyhome.graphics = GFXRES:comm/slyhome/slyhome.ani
 comm.slyhome.music = MUSICRES:comm/slyhome/slyhome.mod
 comm.slylandro.colortable = BINTAB:comm/slyland/slyland.ct
-comm.slylandro.dialogue = STRTAB:comm/slyland/slyland.txt
+comm.slylandro.dialogue = CONVERSATION:comm/slyland/slyland.txt
 comm.slylandro.font = FONTRES:comm/slyland/slyland.fon
 comm.slylandro.graphics = GFXRES:comm/slyland/slyland.ani
 comm.slylandro.music = MUSICRES:comm/slyland/slyland.mod
 comm.spahome.colortable = BINTAB:comm/spahome/spahome.ct
-comm.spahome.dialogue = STRTAB:comm/spahome/spahome.txt
+comm.spahome.dialogue = CONVERSATION:comm/spahome/spahome.txt
 comm.spahome.graphics = GFXRES:comm/spahome/spahome.ani
 comm.spahome.music = MUSICRES:comm/spathi/spathi.mod
 comm.spathi.colortable = BINTAB:comm/spathi/spathi.ct
-comm.spathi.dialogue = STRTAB:comm/spathi/spathi.txt
+comm.spathi.dialogue = CONVERSATION:comm/spathi/spathi.txt
 comm.spathi.font = FONTRES:comm/spathi/spathi.fon
 comm.spathi.graphics = GFXRES:comm/spathi/spathi.ani
 comm.spathi.music = MUSICRES:comm/spathi/spathi.mod
-comm.starbase.dialogue = STRTAB:comm/starbas/starbas.txt
+comm.starbase.dialogue = CONVERSATION:comm/starbas/starbas.txt
 comm.supox.colortable = BINTAB:comm/supox/supox.ct
-comm.supox.dialogue = STRTAB:comm/supox/supox.txt
+comm.supox.dialogue = CONVERSATION:comm/supox/supox.txt
 comm.supox.font = FONTRES:comm/supox/supox.fon
 comm.supox.graphics = GFXRES:comm/supox/supox.ani
 comm.supox.music = MUSICRES:comm/supox/supox.mod
 comm.syreen.colortable = BINTAB:comm/syreen/syreen.ct
-comm.syreen.dialogue = STRTAB:comm/syreen/syreen.txt
+comm.syreen.dialogue = CONVERSATION:comm/syreen/syreen.txt
 comm.syreen.font = FONTRES:comm/syreen/syreen.fon
 comm.syreen.graphics = GFXRES:comm/syreen/syreen.ani
 comm.syreen.music = MUSICRES:comm/syreen/syreen.mod
 comm.talkingpet.colortable = BINTAB:comm/talkpet/talkpet.ct
-comm.talkingpet.dialogue = STRTAB:comm/talkpet/talkpet.txt
+comm.talkingpet.dialogue = CONVERSATION:comm/talkpet/talkpet.txt
 comm.talkingpet.font = FONTRES:comm/talkpet/talkpet.fon
 comm.talkingpet.graphics = GFXRES:comm/talkpet/talkpet.ani
 comm.talkingpet.music = MUSICRES:comm/talkpet/talkpet.mod
 comm.thraddash.colortable = BINTAB:comm/thradd/thradd.ct
-comm.thraddash.dialogue = STRTAB:comm/thradd/thradd.txt
+comm.thraddash.dialogue = CONVERSATION:comm/thradd/thradd.txt
 comm.thraddash.font = FONTRES:comm/thradd/thradd.fon
 comm.thraddash.graphics = GFXRES:comm/thradd/thradd.ani
 comm.thraddash.music = MUSICRES:comm/thradd/thradd.mod
 comm.umgah.colortable = BINTAB:comm/umgah/umgah.ct
-comm.umgah.dialogue = STRTAB:comm/umgah/umgah.txt
+comm.umgah.dialogue = CONVERSATION:comm/umgah/umgah.txt
 comm.umgah.font = FONTRES:comm/umgah/umgah.fon
 comm.umgah.graphics = GFXRES:comm/umgah/umgah.ani
 comm.umgah.music = MUSICRES:comm/umgah/umgah.mod
 comm.urquan.colortable = BINTAB:comm/urquan/urquan.ct
-comm.urquan.dialogue = STRTAB:comm/urquan/urquan.txt
+comm.urquan.dialogue = CONVERSATION:comm/urquan/urquan.txt
 comm.urquan.font = FONTRES:comm/urquan/urquan.fon
 comm.urquan.graphics = GFXRES:comm/urquan/urquan.ani
 comm.urquan.music = MUSICRES:comm/urquan/urquan.mod
 comm.utwig.colortable = BINTAB:comm/utwig/utwig.ct
-comm.utwig.dialogue = STRTAB:comm/utwig/utwig.txt
+comm.utwig.dialogue = CONVERSATION:comm/utwig/utwig.txt
 comm.utwig.font = FONTRES:comm/utwig/utwig.fon
 comm.utwig.graphics = GFXRES:comm/utwig/utwig.ani
 comm.utwig.music = MUSICRES:comm/utwig/utwig.mod
 comm.vux.colortable = BINTAB:comm/vux/vux.ct
-comm.vux.dialogue = STRTAB:comm/vux/vux.txt
+comm.vux.dialogue = CONVERSATION:comm/vux/vux.txt
 comm.vux.font = FONTRES:comm/vux/vux.fon
 comm.vux.graphics = GFXRES:comm/vux/vux.ani
 comm.vux.music = MUSICRES:comm/vux/vux.mod
 comm.yehat.colortable = BINTAB:comm/yehat/yehat.ct
-comm.yehat.dialogue = STRTAB:comm/yehat/yehat.txt
+comm.yehat.dialogue = CONVERSATION:comm/yehat/yehat.txt
 comm.yehat.font = FONTRES:comm/yehat/yehat.fon
 comm.yehat.graphics = GFXRES:comm/yehat/yehat.ani
 comm.yehat.music = MUSICRES:comm/yehat/yehat.mod
-comm.yehat.rebel.dialogue = STRTAB:comm/rebel/rebel.txt
+comm.yehat.rebel.dialogue = CONVERSATION:comm/rebel/rebel.txt
 comm.zoqfotpik.colortable = BINTAB:comm/zoqfot/zoqfot.ct
-comm.zoqfotpik.dialogue = STRTAB:comm/zoqfot/zoqfot.txt
+comm.zoqfotpik.dialogue = CONVERSATION:comm/zoqfot/zoqfot.txt
 comm.zoqfotpik.font = FONTRES:comm/zoqfot/zoqfot.fon
 comm.zoqfotpik.graphics = GFXRES:comm/zoqfot/zoqfot.ani
 comm.zoqfotpik.music = MUSICRES:comm/zoqfot/zoqfot.mod

sc2/src/sc2code/libs/strings/getstr.c

@@ -22,6 +22,8 @@
 #include "libs/reslib.h"
 #include "libs/log.h"
 
+#define MAX_STRINGS 2048
+#define POOL_SIZE 4096
 
 static void
 dword_convert (DWORD *dword_array, COUNT num_dwords)
@@ -57,13 +59,29 @@ set_strtab_entry (STRING_TABLE_DESC *strtab, int index, const char *value, int l
 	}
 }
 
-void *
+void
-_GetStringData (uio_Stream *fp, DWORD length)
+_GetConversationData (const char *path, RESOURCE_DATA *resdata)
 {
+	uio_Stream *fp;
+	long dataLen;
 	void *result;
 
-#define MAX_STRINGS 2048
+	fp = res_OpenResFile (contentDir, path, "rb");
-#define POOL_SIZE 4096
+	if (fp == NULL)
+	{
+		log_add (log_Warning, "Warning: Can't open '%s'", path);
+		resdata->ptr = NULL;
+		return;
+	}
+
+	dataLen = LengthResFile (fp);
+	log_add (log_Info, "\t'%s' -- %lu bytes in Conversation", path, dataLen);
+	
+	if (dataLen == 0)
+	{
+		log_add (log_Warning, "Warning: Trying to load empty file '%s'.", path);
+		goto err;
+	}
 	int n, path_len, num_data_sets;
 	DWORD opos,
 		slen[MAX_STRINGS], StringOffs, tot_string_size,
@@ -74,27 +92,27 @@ _GetStringData (uio_Stream *fp, DWORD length)
 	uio_Stream *timestamp_fp = NULL;
 	
 	if ((strdata = HMalloc (tot_string_size = POOL_SIZE)) == 0)
-		return (0);
+		goto err;
 	
 	if ((clipdata = HMalloc (tot_clip_size = POOL_SIZE)) == 0)
 	{
 		HFree (strdata);
-		return (0);
+		goto err;
 	}
 	ts_data = NULL;
 	
 	{
 		char *s1, *s2;
 
-		if (((s2 = 0), (s1 = strrchr (_cur_resfile_name, '/')) == 0)
+		if (((s2 = 0), (s1 = strrchr (path, '/')) == 0)
-				&& (s2 = strrchr (_cur_resfile_name, '\\')) == 0)
+				&& (s2 = strrchr (path, '\\')) == 0)
 			n = 0;
 		else
 		{
 			if (s2 > s1)
 				s1 = s2;
-			n = s1 - _cur_resfile_name + 1;
+			n = s1 - path + 1;
-			strncpy (clip_path, _cur_resfile_name, n);
+			strncpy (clip_path, path, n);
 		}
 		clip_path[n] = '\0';
 		path_len = strlen (clip_path);
@@ -104,7 +122,7 @@ _GetStringData (uio_Stream *fp, DWORD length)
 		// try to open the timestamp file
 		char ts_file_name[1024];
 		char *s;
-		strcpy (ts_file_name, _cur_resfile_name);
+		strcpy (ts_file_name, path);
 		s = strrchr (ts_file_name, '.');
 		s += 2;
 		*s++ = 's';
@@ -114,7 +132,7 @@ _GetStringData (uio_Stream *fp, DWORD length)
 		{
 			log_add (log_Info, "Found timestamp file: %s", ts_file_name);
 			if ((ts_data = HMalloc (tot_ts_size = POOL_SIZE)) == 0)
-				return (0);
+				goto err;
 		}
 	}
 	
@@ -171,7 +189,7 @@ _GetStringData (uio_Stream *fp, DWORD length)
 										tot_ts_size += POOL_SIZE)) == 0)
 								{
 									HFree (strdata);
-									return (0);
+									goto err;
 								}
 								strcpy (&ts_data[TSOffs], tsptr);
 								TSOffs += l;
@@ -201,7 +219,7 @@ _GetStringData (uio_Stream *fp, DWORD length)
 							tot_clip_size += POOL_SIZE)) == 0)
 					{
 						HFree (strdata);
-						return (0);
+						goto err;
 					}
 
 					strcpy (&clipdata[ClipOffs], clip_path);
@@ -220,7 +238,7 @@ _GetStringData (uio_Stream *fp, DWORD length)
 					tot_string_size += POOL_SIZE)) == 0)
 			{
 				HFree (clipdata);
-				return (0);
+				goto err;
 			}
 
 			if (slen[n])
@@ -235,7 +253,7 @@ _GetStringData (uio_Stream *fp, DWORD length)
 			strcpy (s, CurrentLine);
 		}
 
-		if ((int)uio_ftell (fp) - (int)opos >= (int)length)
+		if ((int)uio_ftell (fp) - (int)opos >= (int)dataLen)
 			break;
 	}
 	if (n >= 0)
@@ -298,6 +316,121 @@ _GetStringData (uio_Stream *fp, DWORD length)
 	if (ts_data)
 		HFree (ts_data);
 
+	resdata->ptr = result;
+	return;
+
+err:
+	res_CloseResFile (fp);
+	resdata->ptr = NULL;
+
+}
+
+void *
+_GetStringData (uio_Stream *fp, DWORD length)
+{
+	void *result;
+
+	int n;
+	DWORD opos, slen[MAX_STRINGS], StringOffs, tot_string_size;
+	char CurrentLine[1024], *strdata;
+
+	if ((strdata = HMalloc (tot_string_size = POOL_SIZE)) == 0)
+		return (0);
+
+	opos = uio_ftell (fp);
+	n = -1;
+	StringOffs = 0;
+	while (uio_fgets (CurrentLine, sizeof (CurrentLine), fp) && n < MAX_STRINGS - 1)
+	{
+		int l;
+
+		if (CurrentLine[0] == '#')
+		{
+			char CopyLine[1024];
+			char *s;
+
+			strcpy (CopyLine, CurrentLine);
+			s = strtok (&CopyLine[1], "()");
+			if (s)
+			{
+				if (n >= 0)
+				{
+					while (slen[n] > 1 && 
+							(strdata[StringOffs - 2] == '\n' ||
+							strdata[StringOffs - 2] == '\r'))
+					{
+						--slen[n];
+						--StringOffs;
+						strdata[StringOffs - 1] = '\0';
+					}
+				}
+
+				slen[++n] = 0;
+			}
+		}
+		else if (n >= 0)
+		{
+			char *s;
+			l = strlen (CurrentLine) + 1;
+			if (StringOffs + l > tot_string_size
+					&& (strdata = HRealloc (strdata,
+					tot_string_size += POOL_SIZE)) == 0)
+			{
+				return (0);
+			}
+
+			if (slen[n])
+			{
+				--slen[n];
+				--StringOffs;
+			}
+			s = &strdata[StringOffs];
+			slen[n] += l;
+			StringOffs += l;
+
+			strcpy (s, CurrentLine);
+		}
+
+		if ((int)uio_ftell (fp) - (int)opos >= (int)length)
+			break;
+	}
+	if (n >= 0)
+	{
+		while (slen[n] > 1 && (strdata[StringOffs - 2] == '\n'
+				|| strdata[StringOffs - 2] == '\r'))
+		{
+			--slen[n];
+			--StringOffs;
+			strdata[StringOffs - 1] = '\0';
+		}
+	}
+
+	result = NULL;
+	if (++n)
+	{
+		int flags = 0;
+		result = AllocStringTable (n, flags);
+		if (result)
+		{
+			int StringIndex;
+			STRING_TABLE_DESC *lpST;
+
+			lpST = (STRING_TABLE) result;
+
+			StringIndex = 0;
+
+			StringOffs = 0;
+
+			for (n = 0; n < (int)lpST->size;
+					++n, ++StringIndex)
+			{
+				set_strtab_entry(lpST, StringIndex, strdata + StringOffs, slen[n]);
+				StringOffs += slen[n];
+			}
+		}
+	}
+	HFree (strdata);
+
 	return (result);
 }
 

sc2/src/sc2code/libs/strings/sresins.c

@@ -35,6 +35,7 @@ InstallStringTableResType (void)
 {
 	InstallResTypeVectors ("STRTAB", GetStringTableFileData, FreeResourceData);
 	InstallResTypeVectors ("BINTAB", GetBinaryTableFileData, FreeResourceData);
+	InstallResTypeVectors ("CONVERSATION", _GetConversationData, FreeResourceData);
 	return TRUE;
 }
 

sc2/src/sc2code/libs/strings/strintrn.h

@@ -47,6 +47,7 @@ void FreeStringTable (STRING_TABLE strtab);
 
 void *_GetStringData (uio_Stream *fp, DWORD length);
 void *_GetBinaryTableData (uio_Stream *fp, DWORD length);
+void _GetConversationData (const char *path, RESOURCE_DATA *resdata);
 
 #endif /* _STRINTRN_H */
 

tools/resmap/resources.csv

@@ -446,53 +446,53 @@ sc2code/igfxres.h,starcon.ls2,FONTGRAD_PMAP_ANIM,31,287,2,graphics.fontgrad,GFXR
 sc2code/igfxres.h,starcon.ls2,LANDER_FONTEFF_PMAP_ANIM,138,288,2,graphics.landfeff,GFXRES,ipanims/landfeff.ani
 sc2code/comm/druuge/imusicre.h,starcon.ls2,DRUUGE_MUSIC,504,0,6,comm.druuge.music,MUSICRES,comm/druuge/druuge.mod
 sc2code/comm/druuge/ifontres.h,starcon.ls2,DRUUGE_FONT,504,1,3,comm.druuge.font,FONTRES,comm/druuge/druuge.fon
-sc2code/comm/druuge/istrtab.h,starcon.ls2,DRUUGE_CONVERSATION_PHRASES,504,2,4,comm.druuge.dialogue,STRTAB,comm/druuge/druuge.txt
+sc2code/comm/druuge/istrtab.h,starcon.ls2,DRUUGE_CONVERSATION_PHRASES,504,2,4,comm.druuge.dialogue,CONVERSATION,comm/druuge/druuge.txt
 sc2code/comm/druuge/istrtab.h,starcon.ls2,DRUUGE_COLOR_MAP,504,3,4,comm.druuge.colortable,BINTAB,comm/druuge/druuge.ct
 sc2code/comm/druuge/igfxres.h,starcon.ls2,DRUUGE_PMAP_ANIM,504,4,2,comm.druuge.graphics,GFXRES,comm/druuge/druuge.ani
 sc2code/comm/slyland/imusicre.h,starcon.ls2,SLYLAND_MUSIC,512,0,6,comm.slylandro.music,MUSICRES,comm/slyland/slyland.mod
 sc2code/comm/slyland/ifontres.h,starcon.ls2,SLYLAND_FONT,512,1,3,comm.slylandro.font,FONTRES,comm/slyland/slyland.fon
-sc2code/comm/slyland/istrtab.h,starcon.ls2,SLYLAND_CONVERSATION_PHRASES,512,2,4,comm.slylandro.dialogue,STRTAB,comm/slyland/slyland.txt
+sc2code/comm/slyland/istrtab.h,starcon.ls2,SLYLAND_CONVERSATION_PHRASES,512,2,4,comm.slylandro.dialogue,CONVERSATION,comm/slyland/slyland.txt
 sc2code/comm/slyland/istrtab.h,starcon.ls2,SLYLAND_COLOR_MAP,512,3,4,comm.slylandro.colortable,BINTAB,comm/slyland/slyland.ct
 sc2code/comm/slyland/igfxres.h,starcon.ls2,SLYLAND_PMAP_ANIM,512,4,2,comm.slylandro.graphics,GFXRES,comm/slyland/slyland.ani
 sc2code/comm/utwig/imusicre.h,starcon.ls2,UTWIG_MUSIC,520,0,6,comm.utwig.music,MUSICRES,comm/utwig/utwig.mod
 sc2code/comm/utwig/imusicre.h,starcon.ls2,UTWIG_ULTRON_MUSIC,520,1,6,comm.utwigult.music,--,--
 sc2code/comm/utwig/ifontres.h,starcon.ls2,UTWIG_FONT,520,2,3,comm.utwig.font,FONTRES,comm/utwig/utwig.fon
-sc2code/comm/utwig/istrtab.h,starcon.ls2,UTWIG_CONVERSATION_PHRASES,520,3,4,comm.utwig.dialogue,STRTAB,comm/utwig/utwig.txt
+sc2code/comm/utwig/istrtab.h,starcon.ls2,UTWIG_CONVERSATION_PHRASES,520,3,4,comm.utwig.dialogue,CONVERSATION,comm/utwig/utwig.txt
 sc2code/comm/utwig/istrtab.h,starcon.ls2,UTWIG_COLOR_MAP,520,4,4,comm.utwig.colortable,BINTAB,comm/utwig/utwig.ct
 sc2code/comm/utwig/igfxres.h,starcon.ls2,UTWIG_PMAP_ANIM,520,5,2,comm.utwig.graphics,GFXRES,comm/utwig/utwig.ani
 sc2code/comm/urquan/imusicre.h,starcon.ls2,URQUAN_MUSIC,519,0,6,comm.urquan.music,MUSICRES,comm/urquan/urquan.mod
 sc2code/comm/urquan/ifontres.h,starcon.ls2,URQUAN_FONT,519,1,3,comm.urquan.font,FONTRES,comm/urquan/urquan.fon
-sc2code/comm/urquan/istrtab.h,starcon.ls2,URQUAN_CONVERSATION_PHRASES,519,2,4,comm.urquan.dialogue,STRTAB,comm/urquan/urquan.txt
+sc2code/comm/urquan/istrtab.h,starcon.ls2,URQUAN_CONVERSATION_PHRASES,519,2,4,comm.urquan.dialogue,CONVERSATION,comm/urquan/urquan.txt
 sc2code/comm/urquan/istrtab.h,starcon.ls2,URQUAN_COLOR_MAP,519,3,4,comm.urquan.colortable,BINTAB,comm/urquan/urquan.ct
 sc2code/comm/urquan/igfxres.h,starcon.ls2,URQUAN_PMAP_ANIM,519,4,2,comm.urquan.graphics,GFXRES,comm/urquan/urquan.ani
 sc2code/comm/chmmr/imusicre.h,starcon.ls2,CHMMR_MUSIC,502,0,6,comm.chmmr.music,MUSICRES,comm/chmmr/chmmr.mod
 sc2code/comm/chmmr/ifontres.h,starcon.ls2,CHMMR_FONT,502,1,3,comm.chmmr.font,FONTRES,comm/chmmr/chmmr.fon
-sc2code/comm/chmmr/istrtab.h,starcon.ls2,CHMMR_CONVERSATION_PHRASES,502,2,4,comm.chmmr.dialogue,STRTAB,comm/chmmr/chmmr.txt
+sc2code/comm/chmmr/istrtab.h,starcon.ls2,CHMMR_CONVERSATION_PHRASES,502,2,4,comm.chmmr.dialogue,CONVERSATION,comm/chmmr/chmmr.txt
 sc2code/comm/chmmr/istrtab.h,starcon.ls2,CHMMR_COLOR_MAP,502,3,4,comm.chmmr.colortable,BINTAB,comm/chmmr/chmmr.ct
 sc2code/comm/chmmr/igfxres.h,starcon.ls2,CHMMR_PMAP_ANIM,502,4,2,comm.chmmr.graphics,GFXRES,comm/chmmr/chmmr.ani
 sc2code/comm/mycon/imusicre.h,starcon.ls2,MYCON_MUSIC,507,0,6,comm.mycon.music,MUSICRES,comm/mycon/mycon.mod
 sc2code/comm/mycon/ifontres.h,starcon.ls2,MYCON_FONT,507,1,3,comm.mycon.font,FONTRES,comm/mycon/mycon.fon
-sc2code/comm/mycon/istrtab.h,starcon.ls2,MYCON_CONVERSATION_PHRASES,507,2,4,comm.mycon.dialogue,STRTAB,comm/mycon/mycon.txt
+sc2code/comm/mycon/istrtab.h,starcon.ls2,MYCON_CONVERSATION_PHRASES,507,2,4,comm.mycon.dialogue,CONVERSATION,comm/mycon/mycon.txt
 sc2code/comm/mycon/istrtab.h,starcon.ls2,MYCON_COLOR_MAP,507,3,4,comm.mycon.colortable,BINTAB,comm/mycon/mycon.ct
 sc2code/comm/mycon/igfxres.h,starcon.ls2,MYCON_PMAP_ANIM,507,4,2,comm.mycon.graphics,GFXRES,comm/mycon/mycon.ani
 sc2code/comm/slyhome/imusicre.h,starcon.ls2,SLYLANDRO_MUSIC,511,0,6,comm.slyhome.music,MUSICRES,comm/slyhome/slyhome.mod
 sc2code/comm/slyhome/ifontres.h,starcon.ls2,SLYLANDRO_FONT,511,1,3,comm.slyhome.font,FONTRES,comm/slyhome/slyhome.fon
-sc2code/comm/slyhome/istrtab.h,starcon.ls2,SLYLANDRO_CONVERSATION_PHRASES,511,2,4,comm.slyhome.dialogue,STRTAB,comm/slyhome/slyhome.txt
+sc2code/comm/slyhome/istrtab.h,starcon.ls2,SLYLANDRO_CONVERSATION_PHRASES,511,2,4,comm.slyhome.dialogue,CONVERSATION,comm/slyhome/slyhome.txt
 sc2code/comm/slyhome/istrtab.h,starcon.ls2,SLYLANDRO_COLOR_MAP,511,3,4,comm.slyhome.colortable,BINTAB,comm/slyhome/slyhome.ct
 sc2code/comm/slyhome/igfxres.h,starcon.ls2,SLYLANDRO_PMAP_ANIM,511,4,2,comm.slyhome.graphics,GFXRES,comm/slyhome/slyhome.ani
 sc2code/comm/zoqfot/imusicre.h,starcon.ls2,ZOQFOTPIK_MUSIC,523,0,6,comm.zoqfotpik.music,MUSICRES,comm/zoqfot/zoqfot.mod
 sc2code/comm/zoqfot/ifontres.h,starcon.ls2,ZOQFOTPIK_FONT,523,1,3,comm.zoqfotpik.font,FONTRES,comm/zoqfot/zoqfot.fon
-sc2code/comm/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_CONVERSATION_PHRASES,523,2,4,comm.zoqfotpik.dialogue,STRTAB,comm/zoqfot/zoqfot.txt
+sc2code/comm/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_CONVERSATION_PHRASES,523,2,4,comm.zoqfotpik.dialogue,CONVERSATION,comm/zoqfot/zoqfot.txt
 sc2code/comm/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_COLOR_MAP,523,3,4,comm.zoqfotpik.colortable,BINTAB,comm/zoqfot/zoqfot.ct
 sc2code/comm/zoqfot/igfxres.h,starcon.ls2,ZOQFOTPIK_PMAP_ANIM,523,4,2,comm.zoqfotpik.graphics,GFXRES,comm/zoqfot/zoqfot.ani
 sc2code/comm/vux/imusicre.h,starcon.ls2,VUX_MUSIC,521,0,6,comm.vux.music,MUSICRES,comm/vux/vux.mod
 sc2code/comm/vux/ifontres.h,starcon.ls2,VUX_FONT,521,1,3,comm.vux.font,FONTRES,comm/vux/vux.fon
-sc2code/comm/vux/istrtab.h,starcon.ls2,VUX_CONVERSATION_PHRASES,521,2,4,comm.vux.dialogue,STRTAB,comm/vux/vux.txt
+sc2code/comm/vux/istrtab.h,starcon.ls2,VUX_CONVERSATION_PHRASES,521,2,4,comm.vux.dialogue,CONVERSATION,comm/vux/vux.txt
 sc2code/comm/vux/istrtab.h,starcon.ls2,VUX_COLOR_MAP,521,3,4,comm.vux.colortable,BINTAB,comm/vux/vux.ct
 sc2code/comm/vux/igfxres.h,starcon.ls2,VUX_PMAP_ANIM,521,4,2,comm.vux.graphics,GFXRES,comm/vux/vux.ani
 sc2code/comm/arilou/imusicre.h,starcon.ls2,ARILOU_MUSIC,500,0,6,comm.arilou.music,MUSICRES,comm/arilou/arilou.mod
 sc2code/comm/arilou/ifontres.h,starcon.ls2,ARILOU_FONT,500,1,3,comm.arilou.font,FONTRES,comm/arilou/arilou.fon
-sc2code/comm/arilou/istrtab.h,starcon.ls2,ARILOU_CONVERSATION_PHRASES,500,2,4,comm.arilou.dialogue,STRTAB,comm/arilou/arilou.txt
+sc2code/comm/arilou/istrtab.h,starcon.ls2,ARILOU_CONVERSATION_PHRASES,500,2,4,comm.arilou.dialogue,CONVERSATION,comm/arilou/arilou.txt
 sc2code/comm/arilou/igfxres.h,starcon.ls2,ARILOU_PMAP_ANIM,500,3,2,comm.arilou.graphics,GFXRES,comm/arilou/arilou.ani
 sc2code/comm/arilou/igfxres.h,starcon.ls2,ARILOU_COLOR_MAP,500,4,4,comm.arilou.colortable,BINTAB,comm/arilou/arilou.ct
 sc2code/comm/comandr/imusicre.h,starcon.ls2,COMMANDER_MUSIC,503,0,6,comm.commander.music,MUSICRES,comm/comandr/comandr.mod
@@ -500,79 +500,79 @@ sc2code/comm/comandr/imusicre.h,starcon.ls2,STARBASE_ALT_MUSIC,503,1,6,comm.star
 sc2code/comm/comandr/imusicre.h,starcon.ls2,COMMANDER_LOWPOW_MUSIC,503,2,6,comm.comlowpw.music,--,--
 sc2code/comm/comandr/ifontres.h,starcon.ls2,COMMANDER_FONT,503,3,3,comm.commander.font,FONTRES,comm/comandr/comandr.fon
 sc2code/comm/comandr/istrtab.h,starcon.ls2,COMMANDER_COLOR_MAP,503,4,4,comm.commander.colortable,BINTAB,comm/comandr/comandr.ct
-sc2code/comm/comandr/istrtab.h,starcon.ls2,COMMANDER_CONVERSATION_PHRASES,503,5,4,comm.commander.dialogue,STRTAB,comm/comandr/comandr.txt
+sc2code/comm/comandr/istrtab.h,starcon.ls2,COMMANDER_CONVERSATION_PHRASES,503,5,4,comm.commander.dialogue,CONVERSATION,comm/comandr/comandr.txt
-sc2code/comm/comandr/istrtab.h,starcon.ls2,STARBASE_CONVERSATION_PHRASES,503,6,4,comm.starbase.dialogue,STRTAB,comm/starbas/starbas.txt
+sc2code/comm/comandr/istrtab.h,starcon.ls2,STARBASE_CONVERSATION_PHRASES,503,6,4,comm.starbase.dialogue,CONVERSATION,comm/starbas/starbas.txt
 sc2code/comm/comandr/igfxres.h,starcon.ls2,COMMANDER_PMAP_ANIM,503,7,2,comm.commander.graphics,GFXRES,comm/comandr/comandr.ani
 sc2code/comm/spathi/imusicre.h,starcon.ls2,SPATHI_MUSIC,513,0,6,comm.spathi.music,MUSICRES,comm/spathi/spathi.mod
 sc2code/comm/spathi/imusicre.h,starcon.ls2,SPAHOME_MUSIC,513,1,6,comm.spahome.music,MUSICRES,comm/spathi/spathi.mod
 sc2code/comm/spathi/imusicre.h,starcon.ls2,FWIFFO_MUSIC,513,2,6,comm.spafwiff.music,--,--
 sc2code/comm/spathi/ifontres.h,starcon.ls2,SPATHI_FONT,513,3,3,comm.spathi.font,FONTRES,comm/spathi/spathi.fon
-sc2code/comm/spathi/istrtab.h,starcon.ls2,SPATHI_CONVERSATION_PHRASES,513,4,4,comm.spathi.dialogue,STRTAB,comm/spathi/spathi.txt
+sc2code/comm/spathi/istrtab.h,starcon.ls2,SPATHI_CONVERSATION_PHRASES,513,4,4,comm.spathi.dialogue,CONVERSATION,comm/spathi/spathi.txt
 sc2code/comm/spathi/istrtab.h,starcon.ls2,SPATHI_HOME_COLOR_MAP,513,5,4,comm.spahome.colortable,BINTAB,comm/spahome/spahome.ct
-sc2code/comm/spathi/istrtab.h,starcon.ls2,SPATHI_HOME_CONVERSATION_PHRASES,513,6,4,comm.spahome.dialogue,STRTAB,comm/spahome/spahome.txt
+sc2code/comm/spathi/istrtab.h,starcon.ls2,SPATHI_HOME_CONVERSATION_PHRASES,513,6,4,comm.spahome.dialogue,CONVERSATION,comm/spahome/spahome.txt
 sc2code/comm/spathi/istrtab.h,starcon.ls2,SPATHI_COLOR_MAP,513,7,4,comm.spathi.colortable,BINTAB,comm/spathi/spathi.ct
 sc2code/comm/spathi/igfxres.h,starcon.ls2,SPATHI_PMAP_ANIM,513,8,2,comm.spathi.graphics,GFXRES,comm/spathi/spathi.ani
 sc2code/comm/spathi/igfxres.h,starcon.ls2,SPATHI_HOME_PMAP_ANIM,513,9,2,comm.spahome.graphics,GFXRES,comm/spahome/spahome.ani
 sc2code/comm/pkunk/imusicre.h,starcon.ls2,PKUNK_MUSIC,509,0,6,comm.pkunk.music,MUSICRES,comm/pkunk/pkunk.mod
 sc2code/comm/pkunk/ifontres.h,starcon.ls2,PKUNK_FONT,509,1,3,comm.pkunk.font,FONTRES,comm/pkunk/pkunk.fon
-sc2code/comm/pkunk/istrtab.h,starcon.ls2,PKUNK_CONVERSATION_PHRASES,509,2,4,comm.pkunk.dialogue,STRTAB,comm/pkunk/pkunk.txt
+sc2code/comm/pkunk/istrtab.h,starcon.ls2,PKUNK_CONVERSATION_PHRASES,509,2,4,comm.pkunk.dialogue,CONVERSATION,comm/pkunk/pkunk.txt
 sc2code/comm/pkunk/istrtab.h,starcon.ls2,PKUNK_COLOR_MAP,509,3,4,comm.pkunk.colortable,BINTAB,comm/pkunk/pkunk.ct
 sc2code/comm/pkunk/igfxres.h,starcon.ls2,PKUNK_PMAP_ANIM,509,4,2,comm.pkunk.graphics,GFXRES,comm/pkunk/pkunk.ani
 sc2code/comm/shofixt/imusicre.h,starcon.ls2,SHOFIXTI_MUSIC,510,0,6,comm.shofixti.music,MUSICRES,comm/shofixt/shofixt.mod
 sc2code/comm/shofixt/ifontres.h,starcon.ls2,SHOFIXTI_FONT,510,1,3,comm.shofixti.font,FONTRES,comm/shofixt/shofixt.fon
-sc2code/comm/shofixt/istrtab.h,starcon.ls2,SHOFIXTI_CONVERSATION_PHRASES,510,2,4,comm.shofixti.dialogue,STRTAB,comm/shofixt/shofixt.txt
+sc2code/comm/shofixt/istrtab.h,starcon.ls2,SHOFIXTI_CONVERSATION_PHRASES,510,2,4,comm.shofixti.dialogue,CONVERSATION,comm/shofixt/shofixt.txt
 sc2code/comm/shofixt/istrtab.h,starcon.ls2,SHOFIXTI_COLOR_MAP,510,3,4,comm.shofixti.colortable,BINTAB,comm/shofixt/shofixt.ct
 sc2code/comm/shofixt/igfxres.h,starcon.ls2,SHOFIXTI_PMAP_ANIM,510,4,2,comm.shofixti.graphics,GFXRES,comm/shofixt/shofixt.ani
 sc2code/comm/umgah/imusicre.h,starcon.ls2,UMGAH_MUSIC,518,0,6,comm.umgah.music,MUSICRES,comm/umgah/umgah.mod
 sc2code/comm/umgah/ifontres.h,starcon.ls2,UMGAH_FONT,518,1,3,comm.umgah.font,FONTRES,comm/umgah/umgah.fon
-sc2code/comm/umgah/istrtab.h,starcon.ls2,UMGAH_CONVERSATION_PHRASES,518,2,4,comm.umgah.dialogue,STRTAB,comm/umgah/umgah.txt
+sc2code/comm/umgah/istrtab.h,starcon.ls2,UMGAH_CONVERSATION_PHRASES,518,2,4,comm.umgah.dialogue,CONVERSATION,comm/umgah/umgah.txt
 sc2code/comm/umgah/istrtab.h,starcon.ls2,UMGAH_COLOR_MAP,518,3,4,comm.umgah.colortable,BINTAB,comm/umgah/umgah.ct
 sc2code/comm/umgah/igfxres.h,starcon.ls2,UMGAH_PMAP_ANIM,518,4,2,comm.umgah.graphics,GFXRES,comm/umgah/umgah.ani
 sc2code/comm/ilwrath/imusicre.h,starcon.ls2,ILWRATH_MUSIC,505,0,6,comm.ilwrath.music,MUSICRES,comm/ilwrath/ilwrath.mod
 sc2code/comm/ilwrath/ifontres.h,starcon.ls2,ILWRATH_FONT,505,1,3,comm.ilwrath.font,FONTRES,comm/ilwrath/ilwrath.fon
-sc2code/comm/ilwrath/istrtab.h,starcon.ls2,ILWRATH_CONVERSATION_PHRASES,505,2,4,comm.ilwrath.dialogue,STRTAB,comm/ilwrath/ilwrath.txt
+sc2code/comm/ilwrath/istrtab.h,starcon.ls2,ILWRATH_CONVERSATION_PHRASES,505,2,4,comm.ilwrath.dialogue,CONVERSATION,comm/ilwrath/ilwrath.txt
 sc2code/comm/ilwrath/istrtab.h,starcon.ls2,ILWRATH_COLOR_MAP,505,3,4,comm.ilwrath.colortable,BINTAB,comm/ilwrath/ilwrath.ct
 sc2code/comm/ilwrath/igfxres.h,starcon.ls2,ILWRATH_PMAP_ANIM,505,4,2,comm.ilwrath.graphics,GFXRES,comm/ilwrath/ilwrath.ani
 sc2code/comm/syreen/imusicre.h,starcon.ls2,SYREEN_MUSIC,515,0,6,comm.syreen.music,MUSICRES,comm/syreen/syreen.mod
 sc2code/comm/syreen/ifontres.h,starcon.ls2,SYREEN_FONT,515,1,3,comm.syreen.font,FONTRES,comm/syreen/syreen.fon
-sc2code/comm/syreen/istrtab.h,starcon.ls2,SYREEN_CONVERSATION_PHRASES,515,2,4,comm.syreen.dialogue,STRTAB,comm/syreen/syreen.txt
+sc2code/comm/syreen/istrtab.h,starcon.ls2,SYREEN_CONVERSATION_PHRASES,515,2,4,comm.syreen.dialogue,CONVERSATION,comm/syreen/syreen.txt
 sc2code/comm/syreen/istrtab.h,starcon.ls2,SYREEN_COLOR_MAP,515,3,4,comm.syreen.colortable,BINTAB,comm/syreen/syreen.ct
 sc2code/comm/syreen/igfxres.h,starcon.ls2,SYREEN_PMAP_ANIM,515,4,2,comm.syreen.graphics,GFXRES,comm/syreen/syreen.ani
 sc2code/comm/melnorm/imusicre.h,starcon.ls2,MELNORME_MUSIC,506,0,6,comm.melnorme.music,MUSICRES,comm/melnorm/melnorm.mod
 sc2code/comm/melnorm/ifontres.h,starcon.ls2,MELNORME_FONT,506,1,3,comm.melnorme.font,FONTRES,comm/melnorm/melnorm.fon
-sc2code/comm/melnorm/istrtab.h,starcon.ls2,MELNORME_CONVERSATION_PHRASES,506,2,4,comm.melnorme.dialogue,STRTAB,comm/melnorm/melnorm.txt
+sc2code/comm/melnorm/istrtab.h,starcon.ls2,MELNORME_CONVERSATION_PHRASES,506,2,4,comm.melnorme.dialogue,CONVERSATION,comm/melnorm/melnorm.txt
 sc2code/comm/melnorm/istrtab.h,starcon.ls2,MELNORME_COLOR_MAP,506,3,4,comm.melnorme.colortable,BINTAB,comm/melnorm/melnorm.ct
 sc2code/comm/melnorm/igfxres.h,starcon.ls2,MELNORME_PMAP_ANIM,506,4,2,comm.melnorme.graphics,GFXRES,comm/melnorm/melnorm.ani
 sc2code/comm/blackur/imusicre.h,starcon.ls2,BLACKURQ_MUSIC,501,0,6,comm.kohrah.music,MUSICRES,comm/blackur/blackur.mod
 sc2code/comm/blackur/ifontres.h,starcon.ls2,BLACKURQ_FONT,501,1,3,comm.kohrah.font,FONTRES,comm/blackur/blackur.fon
-sc2code/comm/blackur/istrtab.h,starcon.ls2,BLACKURQ_CONVERSATION_PHRASES,501,2,4,comm.kohrah.dialogue,STRTAB,comm/blackur/blackur.txt
+sc2code/comm/blackur/istrtab.h,starcon.ls2,BLACKURQ_CONVERSATION_PHRASES,501,2,4,comm.kohrah.dialogue,CONVERSATION,comm/blackur/blackur.txt
 sc2code/comm/blackur/istrtab.h,starcon.ls2,BLACKURQ_COLOR_MAP,501,3,4,comm.kohrah.colortable,BINTAB,comm/blackur/blackur.ct
 sc2code/comm/blackur/igfxres.h,starcon.ls2,BLACKURQ_PMAP_ANIM,501,4,2,comm.kohrah.graphics,GFXRES,comm/blackur/blackur.ani
 sc2code/comm/talkpet/imusicre.h,starcon.ls2,TALKING_PET_MUSIC,516,0,6,comm.talkingpet.music,MUSICRES,comm/talkpet/talkpet.mod
 sc2code/comm/talkpet/ifontres.h,starcon.ls2,TALKING_PET_FONT,516,1,3,comm.talkingpet.font,FONTRES,comm/talkpet/talkpet.fon
-sc2code/comm/talkpet/istrtab.h,starcon.ls2,TALKING_PET_CONVERSATION_PHRASES,516,2,4,comm.talkingpet.dialogue,STRTAB,comm/talkpet/talkpet.txt
+sc2code/comm/talkpet/istrtab.h,starcon.ls2,TALKING_PET_CONVERSATION_PHRASES,516,2,4,comm.talkingpet.dialogue,CONVERSATION,comm/talkpet/talkpet.txt
 sc2code/comm/talkpet/istrtab.h,starcon.ls2,TALKING_PET_COLOR_MAP,516,3,4,comm.talkingpet.colortable,BINTAB,comm/talkpet/talkpet.ct
 sc2code/comm/talkpet/igfxres.h,starcon.ls2,TALKING_PET_PMAP_ANIM,516,4,2,comm.talkingpet.graphics,GFXRES,comm/talkpet/talkpet.ani
 sc2code/comm/yehat/imusicre.h,starcon.ls2,YEHAT_MUSIC,522,0,6,comm.yehat.music,MUSICRES,comm/yehat/yehat.mod
 sc2code/comm/yehat/imusicre.h,starcon.ls2,REBEL_MUSIC,522,1,6,comm.yehat.rebel.music,--,--
 sc2code/comm/yehat/ifontres.h,starcon.ls2,YEHAT_FONT,522,2,3,comm.yehat.font,FONTRES,comm/yehat/yehat.fon
-sc2code/comm/yehat/istrtab.h,starcon.ls2,YEHAT_CONVERSATION_PHRASES,522,3,4,comm.yehat.dialogue,STRTAB,comm/yehat/yehat.txt
+sc2code/comm/yehat/istrtab.h,starcon.ls2,YEHAT_CONVERSATION_PHRASES,522,3,4,comm.yehat.dialogue,CONVERSATION,comm/yehat/yehat.txt
-sc2code/comm/yehat/istrtab.h,starcon.ls2,REBEL_CONVERSATION_PHRASES,522,4,4,comm.yehat.rebel.dialogue,STRTAB,comm/rebel/rebel.txt
+sc2code/comm/yehat/istrtab.h,starcon.ls2,REBEL_CONVERSATION_PHRASES,522,4,4,comm.yehat.rebel.dialogue,CONVERSATION,comm/rebel/rebel.txt
 sc2code/comm/yehat/istrtab.h,starcon.ls2,YEHAT_COLOR_MAP,522,5,4,comm.yehat.colortable,BINTAB,comm/yehat/yehat.ct
 sc2code/comm/yehat/igfxres.h,starcon.ls2,YEHAT_PMAP_ANIM,522,6,2,comm.yehat.graphics,GFXRES,comm/yehat/yehat.ani
 sc2code/comm/supox/imusicre.h,starcon.ls2,SUPOX_MUSIC,514,0,6,comm.supox.music,MUSICRES,comm/supox/supox.mod
 sc2code/comm/supox/ifontres.h,starcon.ls2,SUPOX_FONT,514,1,3,comm.supox.font,FONTRES,comm/supox/supox.fon
-sc2code/comm/supox/istrtab.h,starcon.ls2,SUPOX_CONVERSATION_PHRASES,514,2,4,comm.supox.dialogue,STRTAB,comm/supox/supox.txt
+sc2code/comm/supox/istrtab.h,starcon.ls2,SUPOX_CONVERSATION_PHRASES,514,2,4,comm.supox.dialogue,CONVERSATION,comm/supox/supox.txt
 sc2code/comm/supox/istrtab.h,starcon.ls2,SUPOX_COLOR_MAP,514,3,4,comm.supox.colortable,BINTAB,comm/supox/supox.ct
 sc2code/comm/supox/igfxres.h,starcon.ls2,SUPOX_PMAP_ANIM,514,4,2,comm.supox.graphics,GFXRES,comm/supox/supox.ani
 sc2code/comm/thradd/imusicre.h,starcon.ls2,THRADD_MUSIC,517,0,6,comm.thraddash.music,MUSICRES,comm/thradd/thradd.mod
 sc2code/comm/thradd/ifontres.h,starcon.ls2,THRADD_FONT,517,1,3,comm.thraddash.font,FONTRES,comm/thradd/thradd.fon
-sc2code/comm/thradd/istrtab.h,starcon.ls2,THRADD_CONVERSATION_PHRASES,517,2,4,comm.thraddash.dialogue,STRTAB,comm/thradd/thradd.txt
+sc2code/comm/thradd/istrtab.h,starcon.ls2,THRADD_CONVERSATION_PHRASES,517,2,4,comm.thraddash.dialogue,CONVERSATION,comm/thradd/thradd.txt
 sc2code/comm/thradd/istrtab.h,starcon.ls2,THRADD_COLOR_MAP,517,3,4,comm.thraddash.colortable,BINTAB,comm/thradd/thradd.ct
 sc2code/comm/thradd/igfxres.h,starcon.ls2,THRADD_PMAP_ANIM,517,4,2,comm.thraddash.graphics,GFXRES,comm/thradd/thradd.ani
 sc2code/comm/orz/imusicre.h,starcon.ls2,ORZ_MUSIC,508,0,6,comm.orz.music,MUSICRES,comm/orz/orz.mod
 sc2code/comm/orz/ifontres.h,starcon.ls2,ORZ_FONT,508,1,3,comm.orz.font,FONTRES,comm/orz/orz.fon
-sc2code/comm/orz/istrtab.h,starcon.ls2,ORZ_CONVERSATION_PHRASES,508,2,4,comm.orz.dialogue,STRTAB,comm/orz/orz.txt
+sc2code/comm/orz/istrtab.h,starcon.ls2,ORZ_CONVERSATION_PHRASES,508,2,4,comm.orz.dialogue,CONVERSATION,comm/orz/orz.txt
 sc2code/comm/orz/istrtab.h,starcon.ls2,ORZ_COLOR_MAP,508,3,4,comm.orz.colortable,BINTAB,comm/orz/orz.ct
 sc2code/comm/orz/igfxres.h,starcon.ls2,ORZ_PMAP_ANIM,508,4,2,comm.orz.graphics,GFXRES,comm/orz/orz.ani
 sc2code/ships/druuge/icode.h,starcon.ls2,DRUUGE_CODE,705,0,8,ship.druuge.code,SHIP,5