Commit 2.9

GneHeHe · Oct 24, 2021 · 88030e4 · 88030e4
1 parent 88ceade
commit 88030e4
Show file tree

Hide file tree

Showing 28 changed files with 10,519 additions and 8,527 deletions.
diff --git a/README.md b/README.md
@@ -123,7 +123,7 @@ However, **I guarantee SRBG is virus/trojan-free**.
 
 # How to download and run SRBG ?
 
-1) Download the last **pre-compiled JAR/EXE files** [here](https://github.com/GneHeHe/SmartRandomBuildGeneratorDbD/releases/download/2.8/SRBG.zip) (also available in '**releases**' tab)
+1) Download the last **pre-compiled JAR/EXE files** [here](https://github.com/GneHeHe/SmartRandomBuildGeneratorDbD/releases/download/2.9/SRBG.zip) (also available in '**releases**' tab)
 
 2) Unzip the downloaded **ZIP file**
 

diff --git a/dbd/SRBG.java b/dbd/SRBG.java
@@ -148,7 +148,7 @@ public class SRBG {
     private final String s_cons = "data/perk_cons.txt";
     private final String s_cons_custom = "perk_cons_custom.txt";
     // Version
-    public final double VERSION = 2.8;
+    public final double VERSION = 2.9;
     // Title
     public final String TITLE = "Smart Random Build Generator for Dead by Daylight ( SRBG " + VERSION + " )";
     // GitHub Data
@@ -1264,44 +1264,46 @@ public void readWeights(String input) {
             String line = "";
             line = br.readLine();
             while (line != null) {
-                // Split Line according to Spacer
-                String tab[] = line.split(spacer);
-                if (tab.length == 5) {
-                    // Get Data (5 Fields are required)
-                    String myname = tab[0];
-                    String myside = tab[1];
-                    if (!((myside.equals(s_side_surv)) || (myside.equals(s_side_killer)))) {
-                        System.err.println("\n# ERROR: wrong side ('" + myside + "') => Exit [ wrong line : >" + line + "< from input file ]\n");
-                        System.exit(0);
-                    }
-                    String myicon = tab[2];
-                    int myweight = Integer.parseInt(tab[3]);
-                    String myparent = tab[4];
-                    // Check Weight Value
-                    if (myweight > weight_perk_max) {
-                        myweight = weight_perk_max;
-                    } else if (myweight < weight_perk_min) {
-                        myweight = weight_perk_min;
-                    }
-                    // Check Parent
-                    if (!l_char_all_string.contains(myparent)) {
-                        System.err.println("\n# ERROR: wrong parent ('" + myparent + "') for perk '" + myname + "' => Exit [ wrong line : >" + line + "< from input file ]\n");
-                        System.exit(0);
-                    }
-                    // Create Perk Object
-                    p = new Perk(myname, myweight, myside, myicon, myparent, retrieveCharacter(myparent).getIconString());
-                    // Add Perk to the List
-                    l_perks_all.add(p);
-                    // Add Perk Name to Perk List
-                    l_perks_all_string.add(myname);
-                    if (myside.equals(s_side_surv)) {
-                        l_perks_survivor.add(myname);
+                if ((!line.startsWith("#")) && (line.length() > 0)) {
+                    // Split Line according to Spacer
+                    String tab[] = line.split(spacer);
+                    if (tab.length == 5) {
+                        // Get Data (5 Fields are required)
+                        String myname = tab[0];
+                        String myside = tab[1];
+                        if (!((myside.equals(s_side_surv)) || (myside.equals(s_side_killer)))) {
+                            System.err.println("\n# ERROR: wrong side ('" + myside + "') => Exit [ wrong line : >" + line + "< from input file ]\n");
+                            System.exit(0);
+                        }
+                        String myicon = tab[2];
+                        int myweight = Integer.parseInt(tab[3]);
+                        String myparent = tab[4];
+                        // Check Weight Value
+                        if (myweight > weight_perk_max) {
+                            myweight = weight_perk_max;
+                        } else if (myweight < weight_perk_min) {
+                            myweight = weight_perk_min;
+                        }
+                        // Check Parent
+                        if (!l_char_all_string.contains(myparent)) {
+                            System.err.println("\n# ERROR: wrong parent ('" + myparent + "') for perk '" + myname + "' => Exit [ wrong line : >" + line + "< from input file ]\n");
+                            System.exit(0);
+                        }
+                        // Create Perk Object
+                        p = new Perk(myname, myweight, myside, myicon, myparent, retrieveCharacter(myparent).getIconString());
+                        // Add Perk to the List
+                        l_perks_all.add(p);
+                        // Add Perk Name to Perk List
+                        l_perks_all_string.add(myname);
+                        if (myside.equals(s_side_surv)) {
+                            l_perks_survivor.add(myname);
+                        } else {
+                            l_perks_killer.add(myname);
+                        }
                     } else {
-                        l_perks_killer.add(myname);
+                        System.err.println("\n# ERROR: corrupted weight file => Exit [ wrong line : >" + line + "< from input file ]\n");
+                        System.exit(0);
                     }
-                } else {
-                    System.err.println("\n# ERROR: corrupted weight file => Exit [ wrong line : >" + line + "< from input file ]\n");
-                    System.exit(0);
                 }
                 line = br.readLine();
             }