Merge pull request #3 from ZhilkinSerg/bugfix2

Project files rearrange 2
ZhilkinSerg · Mar 26, 2017 · c6fe3b6 · c6fe3b6
2 parents 89d53c6 + d0b9097
commit c6fe3b6
Show file tree

Hide file tree

Showing 62 changed files with 451 additions and 769 deletions.
diff --git a/data/img/aboutbg.png b/data/img/aboutbg.png
diff --git a/data/jschema/skill.jschema b/data/jschema/skill.jschema
@@ -0,0 +1,28 @@
+{
+  "properties": {
+    "description": {
+      "type": "string",
+      "required": true
+    },
+    "ident": {
+      "type": "string",
+      "required": true
+    },
+    "name": {
+      "type": "string",
+      "required": true
+    },
+    "tags": {
+      "items": {
+        "type": "string"
+      },
+      "type": "array",
+      "required": false
+    },
+    "type": {
+      "pattern": "skill",
+      "type": "string",
+      "required": true
+    }
+  }
+}
diff --git a/data/jsonschema/jsonschema_itemgroup.txt → data/schema/schema_itemgroup.txt b/data/jsonschema/jsonschema_itemgroup.txt → data/schema/schema_itemgroup.txt
diff --git a/data/jsonschema/jsonschema_items.txt → data/schema/schema_items.txt b/data/jsonschema/jsonschema_items.txt → data/schema/schema_items.txt
diff --git a/data/jsonschema/jsonschema_professions.txt → data/schema/schema_professions.txt b/data/jsonschema/jsonschema_professions.txt → data/schema/schema_professions.txt
diff --git a/data/jsonschema/jsonschema_recipes.txt → data/schema/schema_recipes.txt b/data/jsonschema/jsonschema_recipes.txt → data/schema/schema_recipes.txt
diff --git a/data/jsonschema/jsonschema_vehicleparts.txt → data/schema/schema_vehicleparts.txt b/data/jsonschema/jsonschema_vehicleparts.txt → data/schema/schema_vehicleparts.txt
diff --git a/src/CataclysmHelper/Storage.cs b/src/CataclysmHelper/Storage.cs
@@ -322,21 +322,21 @@ public static void InitializeFileDefs()
 
             fileDef[(int)FileType.ITEMS] = new CataFile(
                 "id",
-                new JsonSchema("jsonschema_items.txt"));
+                new JsonSchema("schema_items.txt"));
             fileDef[(int)FileType.BIONICS] = new CataFile("id");
             fileDef[(int)FileType.ITEM_GROUPS] = new CataFile(
                 "id",
-                new JsonSchema("jsonschema_itemgroup.txt"));
+                new JsonSchema("schema_itemgroup.txt"));
             fileDef[(int)FileType.MATERIALS] = new CataFile("ident");
             fileDef[(int)FileType.MONSTER_GROUPS] = new CataFile("name");
             fileDef[(int)FileType.NAMES] = new CataFile("name");
             fileDef[(int)FileType.PROFESSIONS] = new CataFile(
                 "ident",
-                new JsonSchema("jsonschema_professions.txt"));
+                new JsonSchema("schema_professions.txt"));
             fileDef[(int)FileType.RECIPES] = new CataFile(
                 "result",
                 "id_suffix",
-                new JsonSchema("jsonschema_recipes.txt"));
+                new JsonSchema("schema_recipes.txt"));
             fileDef[(int)FileType.SKILLS] = new CataFile("ident");
             fileDef[(int)FileType.SNIPPETS] = null;
             fileDef[(int)FileType.NONE] = null;
@@ -458,11 +458,11 @@ public static void LoadFile(int index)
             else if (ftype == FileType.RECIPES)
             {
                 //Default parsing
-                foreach (Dictionary<string, object> item in (object[])((Dictionary<string, object>)json)["recipes"])
-                    newItems.Add(new ItemDataWrapper(item, index));
+                ////foreach (Dictionary<string, object> item in (object[])((Dictionary<string, object>)json)["recipes"])
+                ////    newItems.Add(new ItemDataWrapper(item, index));
 
                 //Remove categories
-                CraftCategories = (object[])((Dictionary<string, object>)json)["categories"];
+                ////CraftCategories = (object[])((Dictionary<string, object>)json)["categories"];
                 /*List<string> craftcats = new List<string>();
                 foreach (ItemDataWrapper c in newItems)
                 {
@@ -482,6 +482,7 @@ public static void LoadFile(int index)
             }
             else if (ftype == FileType.SKILLS)
             {
+                /*
                 foreach (object[] item in (object[])json)
                 {
                     Dictionary<string, object> dict = new Dictionary<string, object>();
@@ -492,6 +493,7 @@ public static void LoadFile(int index)
                         dict.Add("tags", item[3]);
                     newItems.Add(new ItemDataWrapper(dict, index));
                 }
+                */
             }
             else if (ftype != FileType.NONE)
             {
@@ -589,7 +591,7 @@ public static void SaveJsonItem(string file, object obj, JsonSchema schema, stri
 
                 sb.Append("]");
 
-                if (Options.DontFormatJson)
+                if (FormOptions.DontFormatJson)
                     write.Write(sb.ToString());
                 else
                     write.Write(SpaceJson(sb.ToString(), bracketBlockLevel));
@@ -636,7 +638,7 @@ public static void SaveJsonRecipes(string file, object obj, JsonSchema schema, s
 
                 sb.Append("]}");
 
-                if (Options.DontFormatJson)
+                if (FormOptions.DontFormatJson)
                     write.Write(sb.ToString());
                 else
                     write.Write(SpaceJson(sb.ToString(), bracketBlockLevel));
@@ -679,11 +681,11 @@ public static string SpaceJson(string json, int bracketBlockLevel = 1)
             string nlindent = "\n";
 
             string indent = "";
-            if (Options.IndentWithTabs)
+            if (FormOptions.IndentWithTabs)
                 indent = "\t";
             else
             {
-                for (int c = 0; c < Options.IndentSpaces; c++)
+                for (int c = 0; c < FormOptions.IndentSpaces; c++)
                     indent += " ";
             }