build working

nwn/nwnprc/DocGen/trunk/prc/utils/AMSSpellbookMaker.java

@@ -94,7 +94,7 @@ public final class AMSSpellbookMaker {
         spells2da = Data_2da.load2da("2das" + File.separator + "spells.2da", true);
         feat2da = Data_2da.load2da("2das" + File.separator + "feat.2da", true);
         iprp_feats2da = Data_2da.load2da("2das" + File.separator + "iprp_feats.2da", true);
-        customtlk = new Data_TLK("tlk" + File.separator + "prc_consortium.tlk");
+        customtlk = new Data_TLK("tlk" + File.separator + "prc8_consortium.tlk");
         dialogtlk = new Data_TLK("tlk" + File.separator + "dialog.tlk");
         spellLabels = spells2da.getLabels();
 
@@ -319,7 +319,7 @@ public final class AMSSpellbookMaker {
         spells2da.save2da("2das", true, true);
         feat2da.save2da("2das", true, true);
         iprp_feats2da.save2da("2das", true, true);
-        customtlk.saveAsXML("prc_consortium", "tlk", true);
+        customtlk.saveAsXML("prc8_consortium", "tlk", true);
     }
 
     private static void addNewSpellbookData(int spellID,
@@ -647,7 +647,7 @@ public final class AMSSpellbookMaker {
     }
 
     private static void getFirstTlkRow() {
-        System.out.print("Finding start of prc_consortium.tlk ");
+        System.out.print("Finding start of prc8_consortium.tlk ");
         while (!customtlk.getEntry(tlkRow).equals(start_label)) {
             tlkRow++;
             spinner.spin();

nwn/nwnprc/DocGen/trunk/prc/utils/BuildScrollHack.java

@@ -56,7 +56,7 @@ public class BuildScrollHack {
 
         // Load data
         TwoDAStore twoDA = new TwoDAStore(twoDAPath);
-        TLKStore tlks = new TLKStore("dialog.tlk", "prc_consortium.tlk", tlkPath);
+        TLKStore tlks = new TLKStore("dialog.tlk", "prc8_consortium.tlk", tlkPath);
 
         ScrollGen.doScrollGen(twoDA, twoDAPath, outPath);
         UpdateDes.doUpdateDes(twoDA, twoDAPath);
@@ -73,7 +73,7 @@ public class BuildScrollHack {
                 "  java -jar prc.jar buildscrhack 2dadir tlkdir outpath| [--help]\n" +
                 "\n" +
                 "2dadir   Path to a directory containing 2da files\n" +
-                "tlkdir   Path to a directory containing dialog.tlk and prc_consortium.tlk\n" +
+                "tlkdir   Path to a directory containing dialog.tlk and prc8_consortium.tlk\n" +
                 "outdir   Path to the directory to save the new scroll xml files in\n" +
                 "\n" +
                 "--help      prints this info you are reading\n" +

nwn/nwnprc/DocGen/trunk/prc/utils/ScrollMerchantGen.java

@@ -69,7 +69,7 @@ public class ScrollMerchantGen {
 
         // Load data
         TwoDAStore twoDA = new TwoDAStore(twoDAPath);
-        TLKStore tlks = new TLKStore("dialog.tlk", "prc_consortium.tlk", tlkPath);
+        TLKStore tlks = new TLKStore("dialog.tlk", "prc8_consortium.tlk", tlkPath);
 
         doScrollMerchantGen(twoDA, tlks, "scrolltemp");
     }
@@ -371,7 +371,7 @@ public class ScrollMerchantGen {
                 "  java -jar prc.jar scrmrchgen 2dadir tlkdir | [--help]\n" +
                 "\n" +
                 "2dadir   Path to a directory containing des_crft_scroll.2da and spells.2da.\n" +
-                "tlkdir   Path to a directory containing dialog.tlk and prc_consortium.tlk\n" +
+                "tlkdir   Path to a directory containing dialog.tlk and prc8_consortium.tlk\n" +
                 "\n" +
                 "--help      prints this info you are reading\n" +
                 "\n" +

nwn/nwnprc/DocGen/trunk/prc/utils/SpellbookMaker.java

@@ -68,7 +68,7 @@ public final class SpellbookMaker {
         spells2da = Data_2da.load2da("2das" + File.separator + "spells.2da", true);
         feat2da = Data_2da.load2da("2das" + File.separator + "feat.2da", true);
         iprp_feats2da = Data_2da.load2da("2das" + File.separator + "iprp_feats.2da", true);
-        customtlk = new Data_TLK("tlk" + File.separator + "prc_consortium.tlk");
+        customtlk = new Data_TLK("tlk" + File.separator + "prc8_consortium.tlk");
         dialogtlk = new Data_TLK("tlk" + File.separator + "dialog.tlk");
         spellLabels = spells2da.getLabels();
 
@@ -291,7 +291,7 @@ public final class SpellbookMaker {
         spells2da.save2da("2das", true, true);
         feat2da.save2da("2das", true, true);
         iprp_feats2da.save2da("2das", true, true);
-        customtlk.saveAsXML("prc_consortium", "tlk", true);
+        customtlk.saveAsXML("prc8_consortium", "tlk", true);
     }
 
     private static void addNewSpellbookData(int spellID,
@@ -619,7 +619,7 @@ public final class SpellbookMaker {
     }
 
     private static void getFirstTlkRow() {
-        System.out.print("Finding start of prc_consortium.tlk ");
+        System.out.print("Finding start of prc8_consortium.tlk ");
         while (!customtlk.getEntry(tlkRow).equals("####START_OF_NEW_SPELLBOOK_RESERVE")) {
             tlkRow++;
             spinner.spin();

nwn/nwnprc/DocGen/trunk/prc/utils/UpdateDes.java

@@ -176,7 +176,7 @@ public class UpdateDes {
                         "  java -jar prc.jar updatedescrft 2dadir | [--help]\n" +
                         "\n" +
                         "2dadir   Path to a directory containing 2da files\n" +
-//		                   "tlkdir   Path to a directory containing dialog.tlk and prc_consortium.tlk\n" +
+//		                   "tlkdir   Path to a directory containing dialog.tlk and prc8_consortium.tlk\n" +
                         "\n" +
                         "--help      prints this info you are reading\n" +
                         "\n" +

nwn/nwnprc/DocGen/trunk/prc/utils/Validator.java

@@ -300,7 +300,7 @@ public class Validator {
                 "  java -jar prc.jar validate 2dadir tlkdir | [--help]\n" +
                 "\n" +
                 "2dadir   Path to a directory containing 2da files\n" +
-                "tlkdir   Path to a directory containing dialog.tlk and prc_consortium.tlk\n" +
+                "tlkdir   Path to a directory containing dialog.tlk and prc8_consortium.tlk\n" +
                 "\n" +
                 "-p       pedantic mode. Makes extra checks\n" +
                 "\n" +