diff --git a/nwn/nwnprc/DocGen/trunk/README b/nwn/nwnprc/DocGen/trunk/README.md similarity index 94% rename from nwn/nwnprc/DocGen/trunk/README rename to nwn/nwnprc/DocGen/trunk/README.md index b08780cb..52595550 100644 --- a/nwn/nwnprc/DocGen/trunk/README +++ b/nwn/nwnprc/DocGen/trunk/README.md @@ -81,11 +81,13 @@ As it currently goes, this seems to run best on windows (`xcopy` is required). are not cooperating with each other, so here are the commands to build the docs. ```commandline +make xcopy "Main Manual Files" manual /iey -java -Xmx300m -Xms300m -cp "imageio_tga_1.1.0.jar;." prc/autodoc/Main -java -jar DocGen.jar manual +java -Xmx1024m -Xms300m -cp "imageio_tga_1.1.0.jar;." prc/autodoc/Main ``` +This has been conveniently placed in a batch file called `autodoc.bat` for Windows users. + ## Testing the Site You'll want to use a server to host the docs so you can load them correctly. I like python for this diff --git a/nwn/nwnprc/DocGen/trunk/autodoc.bat b/nwn/nwnprc/DocGen/trunk/autodoc.bat index 4eb600d1..4c33aa10 100644 --- a/nwn/nwnprc/DocGen/trunk/autodoc.bat +++ b/nwn/nwnprc/DocGen/trunk/autodoc.bat @@ -1,2 +1,3 @@ -xcopy /iey "Main Manual Files" manual -java -jar DocGen.jar manual \ No newline at end of file +make +xcopy "Main Manual Files" manual /iey +java -Xmx1024m -Xms300m -cp "imageio_tga_1.1.0.jar;." prc/autodoc/Main diff --git a/nwn/nwnprc/DocGen/trunk/prc/Main.class b/nwn/nwnprc/DocGen/trunk/prc/Main.class deleted file mode 100644 index 49702b5a..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/Main.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/ClassEntry.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/ClassEntry.class deleted file mode 100644 index 10b12a26..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/ClassEntry.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_2da.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_2da.class deleted file mode 100644 index 14e9efee..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_2da.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_2da.java b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_2da.java index 269688e7..e305d016 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_2da.java +++ b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_2da.java @@ -381,7 +381,8 @@ public class Data_2da implements Cloneable { } else line = Integer.parseInt(matcher.group()); } catch (NumberFormatException e) { - throw new TwoDAReadException("Numberless 2da line: " + (line + 1)); + return; + // throw new TwoDAReadException("Numberless 2da line: " + (line + 1)); } // Start parsing the row @@ -399,7 +400,8 @@ public class Data_2da implements Cloneable { // Check for too long rows if (matcher.find()) - throw new TwoDAReadException("Too long 2da line: " + line); + return; + // throw new TwoDAReadException("Too long 2da line: " + line); // Increment the entry counter //entries++; diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_TLK.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_TLK.class deleted file mode 100644 index 8c0e4ad1..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_TLK.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_TLK.java b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_TLK.java index 8933cb5a..1b2137f5 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_TLK.java +++ b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Data_TLK.java @@ -1,9 +1,6 @@ package prc.autodoc; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.RandomAccessFile; +import java.io.*; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.util.stream.IntStream; @@ -32,7 +29,6 @@ public class Data_TLK { // Some paranoia checking for bad parameters if (!filePath.toLowerCase().endsWith("tlk")) throw new IllegalArgumentException("Non-tlk filename passed to Data_TLK: " + filePath); - File baseFile = new File(filePath); if (!baseFile.exists()) throw new IllegalArgumentException("Nonexistent file passed to Data_TLK: " + filePath); diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/DomainEntry.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/DomainEntry.class deleted file mode 100644 index f59b042e..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/DomainEntry.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$1.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$1.class deleted file mode 100644 index 7bca93f4..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$1.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$2.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$2.class deleted file mode 100644 index 35316c24..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$2.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$3.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$3.class deleted file mode 100644 index f16788fb..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$3.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$4.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$4.class deleted file mode 100644 index 07fea4e7..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$4.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$5.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$5.class deleted file mode 100644 index 25e625eb..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$5.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$6.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$6.class deleted file mode 100644 index 87efd483..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration$6.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration.class deleted file mode 100644 index 2f632ea0..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration.java b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration.java index 4723f262..7a81f054 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration.java +++ b/nwn/nwnprc/DocGen/trunk/prc/autodoc/EntryGeneration.java @@ -366,7 +366,7 @@ public class EntryGeneration { psiPowMap = new HashMap(); // Load cls_psipw_*.2da - String[] fileNames = new File("2da").list(new FilenameFilter() { + String[] fileNames = new File("../../trunk/2das").list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.toLowerCase().startsWith("cls_psipw_") && name.toLowerCase().endsWith(".2da"); @@ -384,7 +384,7 @@ public class EntryGeneration { utterMap = new HashMap(); // Load cls_*_utter.2da - String[] fileNames = new File("2da").list(new FilenameFilter() { + String[] fileNames = new File("../../trunk/2das").list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.toLowerCase().startsWith("cls_") && name.toLowerCase().endsWith("_utter.2da"); @@ -402,7 +402,7 @@ public class EntryGeneration { invMap = new HashMap(); // Load cls_*_utter.2da - String[] fileNames = new File("2da").list(new FilenameFilter() { + String[] fileNames = new File("../../trunk/2das").list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.toLowerCase().startsWith("cls_inv_") && name.toLowerCase().endsWith(".2da"); @@ -420,7 +420,7 @@ public class EntryGeneration { maneuverMap = new HashMap(); // Load cls_*_utter.2da - String[] fileNames = new File("2da").list(new FilenameFilter() { + String[] fileNames = new File("../../trunk/2das").list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.toLowerCase().startsWith("cls_move_") && name.toLowerCase().endsWith(".2da"); diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/ErrorPrinter.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/ErrorPrinter.class deleted file mode 100644 index b510b7d7..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/ErrorPrinter.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/FeatEntry.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/FeatEntry.class deleted file mode 100644 index 8025e5e2..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/FeatEntry.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/GenericEntry.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/GenericEntry.class deleted file mode 100644 index bce56b6c..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/GenericEntry.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$1.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$1.class deleted file mode 100644 index 1cbf2342..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$1.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$Check.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$Check.class deleted file mode 100644 index 125542af..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$Check.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$Convert.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$Convert.class deleted file mode 100644 index e4756d0a..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons$Convert.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons.class deleted file mode 100644 index 361baf90..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Icons.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$Settings$Modes.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$Settings$Modes.class deleted file mode 100644 index 82709ddd..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$Settings$Modes.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$Settings.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$Settings.class deleted file mode 100644 index 96dc6741..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$Settings.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$SpellType.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$SpellType.class deleted file mode 100644 index 36911b22..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$SpellType.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TLKStore.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TLKStore.class deleted file mode 100644 index ac61c938..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TLKStore.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TwoDAStore$Loader.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TwoDAStore$Loader.class deleted file mode 100644 index b4eafcc1..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TwoDAStore$Loader.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TwoDAStore.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TwoDAStore.class deleted file mode 100644 index 652e816c..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main$TwoDAStore.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main.class deleted file mode 100644 index 304d06c2..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main.java b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main.java index 935a2566..29465eb0 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main.java +++ b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Main.java @@ -3,6 +3,7 @@ package prc.autodoc; import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.nio.file.Paths; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -20,6 +21,33 @@ import static prc.autodoc.PageGeneration.*; * many errors present in the 2das. */ public class Main { + public static ArrayList getFoldersInFolder(String path) { + var result = new ArrayList(); + + var folder = new File(path); + for (var fileEntry : folder.listFiles()) { + if (fileEntry.isDirectory()) { + result.add(fileEntry.getAbsolutePath().toString()); + } + } + + return result; + } + + public static ArrayList getFilesInFolder(String path) { + var result = new ArrayList(); + + var folder = new File(path); + for (var fileEntry : folder.listFiles()) { + if (!fileEntry.isDirectory()) { + result.add(fileEntry.getAbsolutePath().toString()); + } + } + + return result; + } + + /** * A small data structure class that gives access to both normal and custom * TLK with the same method @@ -33,25 +61,27 @@ public class Main { * TLKStore(normalName, customName, "tlk"). * * @param normalName dialog.tlk or equivalent for the given language - * @param customName prc_consortium.tlk or equivalent for the given languag + * @param customName prc8_consortium.tlk or equivalent for the given languag * @throws TLKReadException if there are any problems reading either TLK */ public TLKStore(String normalName, String customName) { - this.normal = new Data_TLK("tlk" + fileSeparator + normalName); - this.custom = new Data_TLK("tlk" + fileSeparator + customName); + var baseDirectory = "../../trunk"; // @TODO: Move to a Configuration File + this.normal = new Data_TLK(Paths.get(baseDirectory, "tlk", normalName).toAbsolutePath().toString()); + this.custom = new Data_TLK(Paths.get(baseDirectory, "tlk", customName).toAbsolutePath().toString()); } /** * Creates a new TLKStore around the given two filenames. * * @param normalName dialog.tlk or equivalent for the given language - * @param customName prc_consortium.tlk or equivalent for the given languag + * @param customName prc8_consortium.tlk or equivalent for the given languag * @param tlkDir Directory containing the two .tlk files * @throws TLKReadException if there are any problems reading either TLK */ public TLKStore(String normalName, String customName, String tlkDir) { - this.normal = new Data_TLK(tlkDir + fileSeparator + normalName); - this.custom = new Data_TLK(tlkDir + fileSeparator + customName); + var baseDirectory = "../../trunk"; // @TODO: Move to a Configuration File + this.normal = new Data_TLK(Paths.get(baseDirectory, tlkDir, normalName).toAbsolutePath().toString()); + this.custom = new Data_TLK(Paths.get(baseDirectory, tlkDir, customName).toAbsolutePath().toString()); } /** @@ -138,25 +168,43 @@ public class Main { * that could be done anyway. */ public TwoDAStore() { - this("2da"); + this("../../trunk/2das"); //long start = System.currentTimeMillis(); if (verbose) System.out.print("Loading main 2da files "); + CountDownLatch latch = new CountDownLatch(7); + List list = Collections.synchronizedList(new ArrayList()); + ArrayList threads = new ArrayList<>(); + + var baseDirectory = "../../trunk"; // @TODO: Move to a Configuration File + var folders = getFoldersInFolder(baseDirectory); + for (var folder : folders) { + if (folder.endsWith("2das")) { + var files = getFilesInFolder(folder); + for (var file : files) { + var thread = new Thread(new Loader(file, list, latch)); + threads.add(thread); + thread.start(); + } + } + } + boolean oldVerbose = verbose; verbose = false; - CountDownLatch latch = new CountDownLatch(7); - List list = Collections.synchronizedList(new ArrayList()); - // Read the main 2das - new Thread(new Loader("2da" + fileSeparator + "classes.2da", list, latch)).start(); - new Thread(new Loader("2da" + fileSeparator + "domains.2da", list, latch)).start(); - new Thread(new Loader("2da" + fileSeparator + "feat.2da", list, latch)).start(); - new Thread(new Loader("2da" + fileSeparator + "masterfeats.2da", list, latch)).start(); - new Thread(new Loader("2da" + fileSeparator + "racialtypes.2da", list, latch)).start(); - new Thread(new Loader("2da" + fileSeparator + "skills.2da", list, latch)).start(); - new Thread(new Loader("2da" + fileSeparator + "spells.2da", list, latch)).start(); + +// // Read the main 2das +// new Thread(new Loader("2da" + fileSeparator + "classes.2da", list, latch)).start(); +// new Thread(new Loader("2da" + fileSeparator + "domains.2da", list, latch)).start(); +// new Thread(new Loader("2da" + fileSeparator + "feat.2da", list, latch)).start(); +// new Thread(new Loader("2da" + fileSeparator + "masterfeats.2da", list, latch)).start(); +// new Thread(new Loader("2da" + fileSeparator + "racialtypes.2da", list, latch)).start(); +// new Thread(new Loader("2da" + fileSeparator + "skills.2da", list, latch)).start(); +// new Thread(new Loader("2da" + fileSeparator + "spells.2da", list, latch)).start(); try { - latch.await(); + for (Thread thread : threads) { + thread.join(); + } } catch (InterruptedException e) { err_pr.println("Error: Interrupted while reading main 2das. Exception data:\n"); err_pr.printException(e); @@ -199,7 +247,19 @@ public class Main { else { Data_2da temp = null; try { - temp = Data_2da.load2da(twoDAPath + fileSeparator + name + ".2da", true); + var basePath = "../../trunk"; + var potentialPaths = getFoldersInFolder(basePath); + for (var folder : potentialPaths) { + var file = new File(Paths.get(folder, name + ".2da").toAbsolutePath().toString()); + if (file.exists()) { + temp = Data_2da.load2da(file.getAbsolutePath().toString(), true); + break; + } + } + if (temp == null) { + throw new TwoDAReadException("File not found\n" + name); + } + } catch (IllegalArgumentException e) { throw new TwoDAReadException("Problem with filename when trying to read from 2da:\n" + e); } @@ -485,7 +545,7 @@ public class Main { */ public static final int LANGDATA_BASETLK = 1; /** - * curLanguageData index of the name of the prc_consortium.tlk equivalent for this language + * curLanguageData index of the name of the prc8_consortium.tlk equivalent for this language */ public static final int LANGDATA_PRCTLK = 2; /** @@ -763,38 +823,38 @@ public class Main { * @return true if all the reads succeeded, false otherwise */ private static boolean readTemplates() { - String templatePath = "templates" + fileSeparator + curLanguage + fileSeparator; + String templatePath = Paths.get("templates", curLanguage).toAbsolutePath().toString(); try { - babAndSavthrTableHeaderTemplate = readTemplate(templatePath + "babNsavthrtableheader.html"); - classTablesEntryTemplate = readTemplate(templatePath + "classtablesentry.html"); - classTemplate = readTemplate(templatePath + "class.html"); - domainTemplate = readTemplate(templatePath + "domain.html"); - featTemplate = readTemplate(templatePath + "feat.html"); - mFeatTemplate = readTemplate(templatePath + "masterfeat.html"); - menuTemplate = readTemplate(templatePath + "menu.html"); - menuItemTemplate = readTemplate(templatePath + "menuitem.html"); - prereqANDFeatHeaderTemplate = readTemplate(templatePath + "prerequisiteandfeatheader.html"); - prereqORFeatHeaderTemplate = readTemplate(templatePath + "prerequisiteorfeatheader.html"); - raceTemplate = readTemplate(templatePath + "race.html"); - spellTemplate = readTemplate(templatePath + "spell.html"); - skillTableHeaderTemplate = readTemplate(templatePath + "skilltableheader.html"); - skillTemplate = readTemplate(templatePath + "skill.html"); - successorFeatHeaderTemplate = readTemplate(templatePath + "successorfeatheader.html"); - iconTemplate = readTemplate(templatePath + "icon.html"); - listEntrySetTemplate = readTemplate(templatePath + "listpageentryset.html"); - listEntryTemplate = readTemplate(templatePath + "listpageentry.html"); - alphaSortedListTemplate = readTemplate(templatePath + "alphasorted_listpage.html"); - requiredForFeatHeaderTemplate = readTemplate(templatePath + "reqforfeatheader.html"); - pageLinkTemplate = readTemplate(templatePath + "pagelink.html"); - featMenuTemplate = readTemplate(templatePath + "featmenu.html"); - spellSubradialListTemplate = readTemplate(templatePath + "spellsubradials.html"); - spellSubradialListEntryTemplate = readTemplate(templatePath + "spellsubradialsentry.html"); - classFeatTableTemplate = readTemplate(templatePath + "classfeattable.html"); - classFeatTableEntryTemplate = readTemplate(templatePath + "classfeattableentry.html"); - classMagicTableTemplate = readTemplate(templatePath + "classmagictable.html"); - classMagicTableEntryTemplate = readTemplate(templatePath + "classmagictableentry.html"); - craftTemplate = readTemplate(templatePath + "craftprop.html"); + babAndSavthrTableHeaderTemplate = readTemplate(Paths.get(templatePath, "babNsavthrtableheader.html").toAbsolutePath().toString()); + classTablesEntryTemplate = readTemplate(Paths.get(templatePath, "classtablesentry.html").toAbsolutePath().toString()); + classTemplate = readTemplate(Paths.get(templatePath, "class.html").toAbsolutePath().toString()); + domainTemplate = readTemplate(Paths.get(templatePath, "domain.html").toAbsolutePath().toString()); + featTemplate = readTemplate(Paths.get(templatePath, "feat.html").toAbsolutePath().toString()); + mFeatTemplate = readTemplate(Paths.get(templatePath, "masterfeat.html").toAbsolutePath().toString()); + menuTemplate = readTemplate(Paths.get(templatePath, "menu.html").toAbsolutePath().toString()); + menuItemTemplate = readTemplate(Paths.get(templatePath, "menuitem.html").toAbsolutePath().toString()); + prereqANDFeatHeaderTemplate = readTemplate(Paths.get(templatePath, "prerequisiteandfeatheader.html").toAbsolutePath().toString()); + prereqORFeatHeaderTemplate = readTemplate(Paths.get(templatePath, "prerequisiteorfeatheader.html").toAbsolutePath().toString()); + raceTemplate = readTemplate(Paths.get(templatePath, "race.html").toAbsolutePath().toString()); + spellTemplate = readTemplate(Paths.get(templatePath, "spell.html").toAbsolutePath().toString()); + skillTableHeaderTemplate = readTemplate(Paths.get(templatePath, "skilltableheader.html").toAbsolutePath().toString()); + skillTemplate = readTemplate(Paths.get(templatePath, "skill.html").toAbsolutePath().toString()); + successorFeatHeaderTemplate = readTemplate(Paths.get(templatePath, "successorfeatheader.html").toAbsolutePath().toString()); + iconTemplate = readTemplate(Paths.get(templatePath, "icon.html").toAbsolutePath().toString()); + listEntrySetTemplate = readTemplate(Paths.get(templatePath, "listpageentryset.html").toAbsolutePath().toString()); + listEntryTemplate = readTemplate(Paths.get(templatePath, "listpageentry.html").toAbsolutePath().toString()); + alphaSortedListTemplate = readTemplate(Paths.get(templatePath, "alphasorted_listpage.html").toAbsolutePath().toString()); + requiredForFeatHeaderTemplate = readTemplate(Paths.get(templatePath, "reqforfeatheader.html").toAbsolutePath().toString()); + pageLinkTemplate = readTemplate(Paths.get(templatePath, "pagelink.html").toAbsolutePath().toString()); + featMenuTemplate = readTemplate(Paths.get(templatePath, "featmenu.html").toAbsolutePath().toString()); + spellSubradialListTemplate = readTemplate(Paths.get(templatePath, "spellsubradials.html").toAbsolutePath().toString()); + spellSubradialListEntryTemplate = readTemplate(Paths.get(templatePath, "spellsubradialsentry.html").toAbsolutePath().toString()); + classFeatTableTemplate = readTemplate(Paths.get(templatePath, "classfeattable.html").toAbsolutePath().toString()); + classFeatTableEntryTemplate = readTemplate(Paths.get(templatePath, "classfeattableentry.html").toAbsolutePath().toString()); + classMagicTableTemplate = readTemplate(Paths.get(templatePath, "classmagictable.html").toAbsolutePath().toString()); + classMagicTableEntryTemplate = readTemplate(Paths.get(templatePath, "classmagictableentry.html").toAbsolutePath().toString()); + craftTemplate = readTemplate(Paths.get(templatePath, "craftprop.html").toAbsolutePath().toString()); } catch (IOException e) { return false; } diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/MenuGeneration$1.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/MenuGeneration$1.class deleted file mode 100644 index 5a03e317..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/MenuGeneration$1.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/MenuGeneration.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/MenuGeneration.class deleted file mode 100644 index 1bc9d083..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/MenuGeneration.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/PageGeneration.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/PageGeneration.class deleted file mode 100644 index e41ccc42..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/PageGeneration.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/PageGenerationException.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/PageGenerationException.class deleted file mode 100644 index e88c62a9..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/PageGenerationException.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/RaceEntry.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/RaceEntry.class deleted file mode 100644 index 1e2769ff..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/RaceEntry.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/SpellEntry.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/SpellEntry.class deleted file mode 100644 index a2adfed9..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/SpellEntry.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Spinner.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Spinner.class deleted file mode 100644 index 3fd06d31..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Spinner.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/TLKReadException.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/TLKReadException.class deleted file mode 100644 index d03aa8c8..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/TLKReadException.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Tuple.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/Tuple.class deleted file mode 100644 index b1b1850f..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/Tuple.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/autodoc/TwoDAReadException.class b/nwn/nwnprc/DocGen/trunk/prc/autodoc/TwoDAReadException.class deleted file mode 100644 index 5573c81d..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/autodoc/TwoDAReadException.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/Main$1.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/Main$1.class deleted file mode 100644 index 583dff3f..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/Main$1.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/Main.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/Main.class deleted file mode 100644 index db4c8f31..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/Main.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/MakedepChecker$Node.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/MakedepChecker$Node.class deleted file mode 100644 index 38df1fd4..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/MakedepChecker$Node.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/MakedepChecker.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/MakedepChecker.class deleted file mode 100644 index 9f44fa51..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/MakedepChecker.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/NSSNode$STATES.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/NSSNode$STATES.class deleted file mode 100644 index 9d02354a..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/NSSNode$STATES.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/NSSNode.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/NSSNode.class deleted file mode 100644 index 1d25deb7..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/NSSNode.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript$1.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript$1.class deleted file mode 100644 index aeb2ed38..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript$1.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript$STATES.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript$STATES.class deleted file mode 100644 index d78853d0..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript$STATES.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript.class b/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript.class deleted file mode 100644 index 0c09db35..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/makedep/NWScript.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/AMSSpellbookMaker.class b/nwn/nwnprc/DocGen/trunk/prc/utils/AMSSpellbookMaker.class deleted file mode 100644 index f142996a..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/AMSSpellbookMaker.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/AMSSpellbookMaker.java b/nwn/nwnprc/DocGen/trunk/prc/utils/AMSSpellbookMaker.java index 9e9c1962..3a5599ed 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/utils/AMSSpellbookMaker.java +++ b/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(); diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/AllClassFeatUpdater$1.class b/nwn/nwnprc/DocGen/trunk/prc/utils/AllClassFeatUpdater$1.class deleted file mode 100644 index c4986b31..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/AllClassFeatUpdater$1.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/AllClassFeatUpdater.class b/nwn/nwnprc/DocGen/trunk/prc/utils/AllClassFeatUpdater.class deleted file mode 100644 index 1d378666..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/AllClassFeatUpdater.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Blank2daRows.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Blank2daRows.class deleted file mode 100644 index 3fa19af0..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Blank2daRows.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/BuildScrollHack.class b/nwn/nwnprc/DocGen/trunk/prc/utils/BuildScrollHack.class deleted file mode 100644 index 4856bd64..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/BuildScrollHack.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/BuildScrollHack.java b/nwn/nwnprc/DocGen/trunk/prc/utils/BuildScrollHack.java index 8a6974e5..a7449ab7 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/utils/BuildScrollHack.java +++ b/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" + diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/CodeGen$Script.class b/nwn/nwnprc/DocGen/trunk/prc/utils/CodeGen$Script.class deleted file mode 100644 index 67d30810..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/CodeGen$Script.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/CodeGen.class b/nwn/nwnprc/DocGen/trunk/prc/utils/CodeGen.class deleted file mode 100644 index 1d37192a..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/CodeGen.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Data2daMerge.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Data2daMerge.class deleted file mode 100644 index e5f93626..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Data2daMerge.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Duplicate2daEntryDetector.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Duplicate2daEntryDetector.class deleted file mode 100644 index a629db5e..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Duplicate2daEntryDetector.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/DuplicateSubradials$DuplicateData.class b/nwn/nwnprc/DocGen/trunk/prc/utils/DuplicateSubradials$DuplicateData.class deleted file mode 100644 index a1c0f8b2..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/DuplicateSubradials$DuplicateData.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/DuplicateSubradials.class b/nwn/nwnprc/DocGen/trunk/prc/utils/DuplicateSubradials.class deleted file mode 100644 index d8c6c1f9..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/DuplicateSubradials.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/ItempropMaker.class b/nwn/nwnprc/DocGen/trunk/prc/utils/ItempropMaker.class deleted file mode 100644 index bc29bb84..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/ItempropMaker.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/LetoListsGenerator.class b/nwn/nwnprc/DocGen/trunk/prc/utils/LetoListsGenerator.class deleted file mode 100644 index 3fc7f5c1..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/LetoListsGenerator.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/List2daEntries.class b/nwn/nwnprc/DocGen/trunk/prc/utils/List2daEntries.class deleted file mode 100644 index 7ac31836..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/List2daEntries.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/ListSubradials.class b/nwn/nwnprc/DocGen/trunk/prc/utils/ListSubradials.class deleted file mode 100644 index aaa2a323..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/ListSubradials.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/NPCEvolve.class b/nwn/nwnprc/DocGen/trunk/prc/utils/NPCEvolve.class deleted file mode 100644 index 1b5d4eb9..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/NPCEvolve.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$1.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$1.class deleted file mode 100644 index 2e676808..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$1.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$2.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$2.class deleted file mode 100644 index 1f9aa7a6..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$2.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$3.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$3.class deleted file mode 100644 index 8e4675bf..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$3.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$4.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$4.class deleted file mode 100644 index 7065f1bf..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen$4.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen.class deleted file mode 100644 index c25441a0..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Precache2daGen.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Radials.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Radials.class deleted file mode 100644 index 959e9022..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Radials.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/SQLMaker.class b/nwn/nwnprc/DocGen/trunk/prc/utils/SQLMaker.class deleted file mode 100644 index 110da052..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/SQLMaker.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollGen.class b/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollGen.class deleted file mode 100644 index 33e165e8..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollGen.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollMerchantGen.class b/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollMerchantGen.class deleted file mode 100644 index e84d8c51..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollMerchantGen.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollMerchantGen.java b/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollMerchantGen.java index 87e562cf..6c9ea6f3 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/utils/ScrollMerchantGen.java +++ b/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" + diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/SpellbookMaker.class b/nwn/nwnprc/DocGen/trunk/prc/utils/SpellbookMaker.class deleted file mode 100644 index eb18e6b2..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/SpellbookMaker.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/SpellbookMaker.java b/nwn/nwnprc/DocGen/trunk/prc/utils/SpellbookMaker.java index f5eecf58..08013f28 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/utils/SpellbookMaker.java +++ b/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(); diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/UpdateDes.class b/nwn/nwnprc/DocGen/trunk/prc/utils/UpdateDes.class deleted file mode 100644 index 05f7495e..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/UpdateDes.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/UpdateDes.java b/nwn/nwnprc/DocGen/trunk/prc/utils/UpdateDes.java index a7c69b07..d3661737 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/utils/UpdateDes.java +++ b/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" + diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Validator.class b/nwn/nwnprc/DocGen/trunk/prc/utils/Validator.class deleted file mode 100644 index 6881fdf2..00000000 Binary files a/nwn/nwnprc/DocGen/trunk/prc/utils/Validator.class and /dev/null differ diff --git a/nwn/nwnprc/DocGen/trunk/prc/utils/Validator.java b/nwn/nwnprc/DocGen/trunk/prc/utils/Validator.java index 4d80f5f8..0d11d682 100644 --- a/nwn/nwnprc/DocGen/trunk/prc/utils/Validator.java +++ b/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" +