diff --git a/CataclysmModder.sln b/CataclysmModder.sln deleted file mode 100644 index 4d38e7f..0000000 --- a/CataclysmModder.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CataclysmModder", "CataclysmModder\CataclysmModder.csproj", "{E3E8A156-EF49-46C9-9387-8FDA4F6ECAE6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E3E8A156-EF49-46C9-9387-8FDA4F6ECAE6}.Debug|x86.ActiveCfg = Debug|x86 - {E3E8A156-EF49-46C9-9387-8FDA4F6ECAE6}.Debug|x86.Build.0 = Debug|x86 - {E3E8A156-EF49-46C9-9387-8FDA4F6ECAE6}.Release|x86.ActiveCfg = Release|x86 - {E3E8A156-EF49-46C9-9387-8FDA4F6ECAE6}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/CataclysmModder/ClassDiagram1.cd b/CataclysmModder/ClassDiagram1.cd deleted file mode 100644 index 0519ecb..0000000 --- a/CataclysmModder/ClassDiagram1.cd +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/CataclysmModder/icons/ico32.ico b/CataclysmModder/icons/ico32.ico deleted file mode 100644 index 21fb3b7..0000000 Binary files a/CataclysmModder/icons/ico32.ico and /dev/null differ diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..5a4b0fc --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1 @@ +CataclysmModder is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. \ No newline at end of file diff --git a/README.md b/README.md index 8ae3099..18541de 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,31 @@ -CataModder -========== +# Cataclysm Modder +C# Winforms application for editing JSON files from the game [Cataclysm: Dark Days Ahead](http://www.cataclysmdda.com/). -C# Winforms application for editing JSON files from the game Cataclysm: Dark Days Ahead. +No warranty of usability or fitness for any purpose is given. + +**MAKE SURE YOU ARE USING THE RIGHT VERSION OF CATACLYSM!** + +You'll need the Microsoft .NET Redistributable 4.0 to run this version: http://www.microsoft.com/en-us/download/details.aspx?id=17851 + +# How to use this software + +* Back up the 'raw' folder that contains the game JSONs (it's in [Cataclysm Root]/data). +* Run CataclysmModder.exe +* Go to File->Open +* Select the 'raw' folder mentioned above + +Now the dropdown box in the top-left corner of the program contains all the JSON data files that define Cataclysm's content, though the program only supports editing "item_groups.json" and the "item/" files for now. + +Once you select a file from this box, the file's contents are loaded into the "Entries" box under it, and if the file can be edited, the editing area appears to the right. + +# Usability Tips +You can type in the "Quicksearch" bar at the top right to search the entries list by name or id. Press Enter to scan through the search results. + +You can use Ctrl+Up and Ctrl+Down at any time to navigate up and down the entries list. + +In list boxes with a lot of items, you can press a key on the keyboard to scroll through items starting with that letter. + +Whenever you select a field in the editor, a short helpful description of what that field means is shown in the very bottom-right. + +# Contribute +Cataclysm Modder is licensed under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details. Some code distributed with the project is not part of the project and is released under different software licenses, the files covered by different software licenses have their own license notices. \ No newline at end of file diff --git a/UserGuide.txt b/UserGuide.txt deleted file mode 100644 index efc460a..0000000 --- a/UserGuide.txt +++ /dev/null @@ -1,51 +0,0 @@ -CataModder -by Brian MacIntosh (BMacZero) - -No warranty of usability or fitness for any purpose -is given. - - -For version information, see Help->About. MAKE -SURE YOU ARE USING THE RIGHT VERSION OF CATACLYSM. - - -You'll need the Microsoft .NET Redistributable 4.0 to -run this version. -http://www.microsoft.com/en-us/download/details.aspx?id=17851 - - -HOW TO USE THIS SOFTWARE: =============================== - -- Back up the 'raw' folder that contains the game - JSONs (it's in [Cataclysm Root]/data). - -- Run CataclysmModder.exe -- Go to File->Open -- Select the 'raw' folder mentioned above - -Now the dropdown box in the top-left corner of the -program contains all the JSON data files that define -Cataclysm's content, though the program only supports -editing "item_groups.json" and the "item/" files for now. - -Once you select a file from this box, the file's contents -are loaded into the "Entries" box under it, and if the -file can be edited, the editing area appears to the right. - - -USABILITY TIPS: ========================================== - -You can type in the "Quicksearch" bar at the top right to -search the entries list by name or id. Press Enter to -scan through the search results. - -You can use Ctrl+Up and Ctrl+Down at any time to navigate -up and down the entries list. - -In list boxes with a lot of items, you can press a key on -the keyboard to scroll through items starting with that -letter. - -Whenever you select a field in the editor, a short helpful -description of what that field means is shown in the very -bottom-right. \ No newline at end of file diff --git a/CataclysmModder/icons/ico16.ico b/data/ico/ico16.ico similarity index 100% rename from CataclysmModder/icons/ico16.ico rename to data/ico/ico16.ico diff --git a/CataclysmModder/ico32.ico b/data/ico/ico32.ico similarity index 100% rename from CataclysmModder/ico32.ico rename to data/ico/ico32.ico diff --git a/CataclysmModder/icons/ico48.ico b/data/ico/ico48.ico similarity index 100% rename from CataclysmModder/icons/ico48.ico rename to data/ico/ico48.ico diff --git a/CataclysmModder/aboutbg.png b/data/img/aboutbg.png similarity index 100% rename from CataclysmModder/aboutbg.png rename to data/img/aboutbg.png diff --git a/CataclysmModder/schemas/item_group.txt b/data/jsonschema/jsonschema_itemgroup.txt similarity index 100% rename from CataclysmModder/schemas/item_group.txt rename to data/jsonschema/jsonschema_itemgroup.txt diff --git a/CataclysmModder/schemas/items.txt b/data/jsonschema/jsonschema_items.txt similarity index 100% rename from CataclysmModder/schemas/items.txt rename to data/jsonschema/jsonschema_items.txt diff --git a/CataclysmModder/schemas/professions.txt b/data/jsonschema/jsonschema_professions.txt similarity index 100% rename from CataclysmModder/schemas/professions.txt rename to data/jsonschema/jsonschema_professions.txt diff --git a/CataclysmModder/schemas/recipes.txt b/data/jsonschema/jsonschema_recipes.txt similarity index 100% rename from CataclysmModder/schemas/recipes.txt rename to data/jsonschema/jsonschema_recipes.txt diff --git a/CataclysmModder/schemas/vehicle_parts.txt b/data/jsonschema/jsonschema_vehicleparts.txt similarity index 100% rename from CataclysmModder/schemas/vehicle_parts.txt rename to data/jsonschema/jsonschema_vehicleparts.txt diff --git a/CataclysmModder/CataColor.cs b/src/CataclysmHelper/CataclysmColor.cs similarity index 100% rename from CataclysmModder/CataColor.cs rename to src/CataclysmHelper/CataclysmColor.cs diff --git a/CataclysmModder/CataFile.cs b/src/CataclysmHelper/CataclysmFile.cs similarity index 100% rename from CataclysmModder/CataFile.cs rename to src/CataclysmHelper/CataclysmFile.cs diff --git a/CataclysmModder/GroupedData.cs b/src/CataclysmHelper/GroupedData.cs similarity index 100% rename from CataclysmModder/GroupedData.cs rename to src/CataclysmHelper/GroupedData.cs diff --git a/CataclysmModder/IssueTracker.cs b/src/CataclysmHelper/IssueTracker.cs similarity index 100% rename from CataclysmModder/IssueTracker.cs rename to src/CataclysmHelper/IssueTracker.cs diff --git a/CataclysmModder/JsonSchema.cs b/src/CataclysmHelper/JsonSchema.cs similarity index 100% rename from CataclysmModder/JsonSchema.cs rename to src/CataclysmHelper/JsonSchema.cs diff --git a/CataclysmModder/Storage.cs b/src/CataclysmHelper/Storage.cs similarity index 99% rename from CataclysmModder/Storage.cs rename to src/CataclysmHelper/Storage.cs index c0e41b3..8e84211 100644 --- a/CataclysmModder/Storage.cs +++ b/src/CataclysmHelper/Storage.cs @@ -318,25 +318,25 @@ public static void InitializeFileDefs() { InitializeDataSources(); - //Editing control needs to be set in Form1 ctor using FileDefSetControl + //Editing control needs to be set in FormMain ctor using FileDefSetControl fileDef[(int)FileType.ITEMS] = new CataFile( "id", - new JsonSchema("CataclysmModder.schemas.items.txt")); + new JsonSchema("jsonschema_items.txt")); fileDef[(int)FileType.BIONICS] = new CataFile("id"); fileDef[(int)FileType.ITEM_GROUPS] = new CataFile( "id", - new JsonSchema("CataclysmModder.schemas.item_group.txt")); + new JsonSchema("jsonschema_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("CataclysmModder.schemas.professions.txt")); + new JsonSchema("jsonschema_professions.txt")); fileDef[(int)FileType.RECIPES] = new CataFile( "result", "id_suffix", - new JsonSchema("CataclysmModder.schemas.recipes.txt")); + new JsonSchema("jsonschema_recipes.txt")); fileDef[(int)FileType.SKILLS] = new CataFile("ident"); fileDef[(int)FileType.SNIPPETS] = null; fileDef[(int)FileType.NONE] = null; diff --git a/CataclysmModder/WinformsUtil.cs b/src/CataclysmHelper/WinformsUtil.cs similarity index 99% rename from CataclysmModder/WinformsUtil.cs rename to src/CataclysmHelper/WinformsUtil.cs index bbb5d9e..cce9607 100644 --- a/CataclysmModder/WinformsUtil.cs +++ b/src/CataclysmHelper/WinformsUtil.cs @@ -434,7 +434,7 @@ public static void ListChanged(object sender, EventArgs e) public static void DisplayHelp(object sender, EventArgs e) { - Form1.Instance.SetHelpText(((JsonFormTag)((Control)sender).Tag).help); + FormMain.Instance.SetHelpText(((JsonFormTag)((Control)sender).Tag).help); } /// diff --git a/CataclysmModder/CataclysmModder.csproj b/src/CataclysmModder.csproj similarity index 50% rename from CataclysmModder/CataclysmModder.csproj rename to src/CataclysmModder.csproj index 9697aa5..9cd297e 100644 --- a/CataclysmModder/CataclysmModder.csproj +++ b/src/CataclysmModder.csproj @@ -14,31 +14,49 @@ 512 + False + False + False + False + ..\obj\$(Configuration)\ x86 true - full - false - bin\Debug\ + Full + False + ..\bin\Debug\ DEBUG;TRACE prompt 4 x86 - pdbonly - true - bin\Release\ + PdbOnly + True + ..\bin\Release\ TRACE prompt 4 - ico32.ico + ..\data\ico\ico32.ico + + + False + ..\obj + Project + + + 4194304 + False + Auto + + + False + ..\obj - @@ -52,159 +70,166 @@ - + + + + + + Form - - About.cs + + ExportItemsForm.cs - + + Form + + + FormMain.cs + + + Form + + + Options.cs + + UserControl - + AmmoValues.cs - + UserControl - + ArmorValues.cs - + UserControl - + BookValues.cs - - - + UserControl - + ComestibleValues.cs - + UserControl - + ContainValues.cs - - Form - - - ExportItemsForm.cs - - - Form - - - Form1.cs - - + UserControl - + GenericItemValues.cs - + UserControl - + GunmodValues.cs - + UserControl - + GunValues.cs - - - + UserControl - + ItemGroupValues.cs - - - Form - - - Options.cs - - + UserControl - + ProfessionValues.cs - - - + UserControl + ToolValues.cs - + RecipeControl.cs - - + UserControl - + ToolValues.cs - + UserControl - + VehiclePartValues.cs - - + + + + + Form + + About.cs + + + + ExportItemsForm.cs + + + FormMain.cs - + + Options.cs + + AmmoValues.cs - + ArmorValues.cs - + BookValues.cs - + ComestibleValues.cs - + ContainValues.cs - - ExportItemsForm.cs - - - Form1.cs - - + GenericItemValues.cs - + GunmodValues.cs - + GunValues.cs - + ItemGroupValues.cs - - Options.cs - - + ProfessionValues.cs + + RecipeControl.cs + + + ToolValues.cs + + + VehiclePartValues.cs + ResXFileCodeGenerator Resources.Designer.cs @@ -215,14 +240,8 @@ Resources.resx True - - RecipeControl.cs - - - ToolValues.cs - - - VehiclePartValues.cs + + About.cs @@ -236,23 +255,26 @@ - - - - - - - - - - - - - - - - - + + jsonschema_items.txt + + + jsonschema_itemgroup.txt + + + jsonschema_recipes.txt + + + jsonschema_professions.txt + + + jsonschema_vehicleparts.txt + + + + + +