Skip to content
This repository has been archived by the owner on Sep 7, 2021. It is now read-only.

Commit

Permalink
Engine category generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Crzyrndm
Crzyrndm committed Mar 18, 2015
1 parent 9365c5c commit eafa747
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 66 deletions.
60 changes: 48 additions & 12 deletions FilterExtension/ConfigNodes/customCategory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,45 @@ namespace FilterExtensions.ConfigNodes
{
using Utility;

public enum categoryTypeAndBehaviour
{
None,
Engines,
StockAdd,
StockReplace
}

public class customCategory : IEquatable<customCategory>
{
public string categoryName { get; set; }
public string iconName { get; set; }
public Color colour { get; set; }
public string type { get; set; } // procedural categories
public string value { get; set; } // mod folder name for mod type categories
public categoryTypeAndBehaviour behaviour { get; set; }
public bool all { get; set; } // has an all parts subCategory
public string[] subCategories { get; set; } // array of subcategories
public bool stockCategory { get; set; } // editing a stock category or creating a completely new one
public List<Check> template { get; set; } // Checks to add to every Filter in a category with the template tag

private static readonly List<string> categoryNames = new List<string> { "Pods", "Engines", "Fuel Tanks", "Command and Control", "Structural", "Aerodynamics", "Utility", "Science" };

public customCategory(ConfigNode node)
{
bool tmp;
categoryName = node.GetValue("name");
iconName = node.GetValue("icon");
colour = convertToColor(node.GetValue("colour"));

type = node.GetValue("type");
value = node.GetValue("value");

typeSwitch();

makeTemplate(node);

bool tmp;
bool.TryParse(node.GetValue("all"), out tmp);
this.all = tmp;

bool.TryParse(node.GetValue("stock"), out tmp);
this.stockCategory = tmp;

ConfigNode subcategoryList = node.GetNode("SUBCATEGORIES", 0);
if (subcategoryList != null)
{
Expand Down Expand Up @@ -87,6 +93,11 @@ public void initialise()
else
{
category = PartCategorizer.Instance.filters.Find(c => c.button.categoryName == categoryName);
if (category == null)
{
Core.Log("No Stock category of this name was found: " + categoryName);
return;
}
}

for (int i = 0; i < subCategories.Length; i++)
Expand Down Expand Up @@ -118,7 +129,8 @@ public void initialise()

try
{
sC.initialise(category);
if (Core.checkSubCategoryHasParts(sC))
sC.initialise(category);
}
catch (Exception ex)
{
Expand All @@ -137,12 +149,23 @@ private void typeSwitch()
{
case "engine":
generateEngineTypes();
behaviour = categoryTypeAndBehaviour.Engines;
break;
case "stock":
if (value == "replace")
behaviour = categoryTypeAndBehaviour.StockReplace;
else
behaviour = categoryTypeAndBehaviour.StockAdd;
break;
default:
behaviour = categoryTypeAndBehaviour.None;
break;
}
}

private void generateEngineTypes()
{
List<string> engines = new List<string>();
foreach (List<string> ls in Core.propellantCombos)
{
List<Check> checks = new List<Check>();
Expand All @@ -155,15 +178,20 @@ private void generateEngineTypes()
checks.Add(new Check("propellant", s));
props += s;
}
checks.Add(new Check("propellant", props, true, false)); // exact match to propellant list. Nothing extra, nothing less
if (!Core.Instance.subCategoriesDict.ContainsKey(props))
{
checks.Add(new Check("propellant", props, true, false)); // exact match to propellant list. Nothing extra, nothing less

customSubCategory sC = new customSubCategory(props, "stock_Engines");
customSubCategory sC = new customSubCategory(props, "stock_Engines");

Filter f = new Filter(false);
f.checks = checks;
sC.filters.Add(f);
Core.Instance.subCategoriesDict.Add(sC.subCategoryTitle, sC);
Filter f = new Filter(false);
f.checks = checks;
sC.filters.Add(f);
Core.Instance.subCategoriesDict.Add(props, sC);
}
engines.Add(props);
}
subCategories.AddUniqueRange(engines);
}

private void makeTemplate(ConfigNode node)
Expand Down Expand Up @@ -236,5 +264,13 @@ public override int GetHashCode()
{
return categoryName.GetHashCode();
}

public bool stockCategory
{
get
{
return this.behaviour == categoryTypeAndBehaviour.StockAdd || this.behaviour == categoryTypeAndBehaviour.StockReplace;
}
}
}
}
27 changes: 0 additions & 27 deletions FilterExtension/ConfigNodes/customSubCategory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,6 @@ public bool checkFilters(AvailablePart part)
return false; // part passed no filter(s), not compatible with this subcategory
}

//public void initialise()
//{
// PartCategorizer.Icon icon = Core.getIcon(iconName);
// if (icon == null)
// {
// Core.Log(this.subCategoryTitle + " no icon found");
// icon = PartCategorizer.Instance.fallbackIcon;
// }

// if (hasFilters)
// {
// PartCategorizer.Category category = PartCategorizer.Instance.filters.FirstOrDefault(f => f.button.categoryName == this.category);
// if (category == null)
// return;

// PartCategorizer.AddCustomSubcategoryFilter(category, this.subCategoryTitle, icon, p => checkFilters(p));
// }
// //else if (!string.IsNullOrEmpty(oldTitle) && string.IsNullOrEmpty(subCategoryTitle))
// // Delete(oldTitle); // if there is an old title and no new title we are deleting
// else if (!string.IsNullOrEmpty(subCategoryTitle))
// Edit(subCategoryTitle, icon);
// else
// Core.Log("Invalid subCategory definition");
//}

public void initialise(PartCategorizer.Category cat)
{
PartCategorizer.Icon icon = Core.getIcon(iconName);
Expand All @@ -104,8 +79,6 @@ public void initialise(PartCategorizer.Category cat)
return;
PartCategorizer.AddCustomSubcategoryFilter(cat, this.subCategoryTitle, icon, p => checkFilters(p));
}
//else if (!string.IsNullOrEmpty(subCategoryTitle))
// Edit(subCategoryTitle, icon);
else
Core.Log("Invalid subCategory definition");
}
Expand Down
36 changes: 14 additions & 22 deletions FilterExtension/Core.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ private void processFilterByManufacturer(List<string> modNames)

ConfigNode filterByManufacturer = new ConfigNode("CATEGORY");
filterByManufacturer.AddValue("name", "Filter by Manufacturer");
filterByManufacturer.AddValue("stock", "true");
filterByManufacturer.AddValue("type", "stock");
filterByManufacturer.AddValue("value", "replace");
filterByManufacturer.AddNode(manufacturerSubs);
Categories.Add(new customCategory(filterByManufacturer));
}
Expand Down Expand Up @@ -415,27 +416,18 @@ private void RepairAvailablePartUrl(AvailablePart ap)
ap.partUrl = url.url;
}

//private void checkForEmptySubCategories()
//{
// List<customSubCategory> notEmpty = new List<customSubCategory>();
// foreach (customSubCategory sC in subCategories)
// {
// if (!sC.hasFilters)
// notEmpty.Add(sC);
// else
// {
// foreach (AvailablePart p in PartLoader.Instance.parts)
// {
// if (sC.checkFilters(p))
// {
// notEmpty.Add(sC);
// break;
// }
// }
// }
// }
// subCategories = notEmpty;
//}
public static bool checkSubCategoryHasParts(customSubCategory sC)
{
foreach (AvailablePart p in PartLoader.Instance.parts)
{
if (sC.checkFilters(p))
{
return true;
}
}
Log(sC.subCategoryTitle + " has no valid parts and was not initialised");
return false;
}

internal static void Log(object o)
{
Expand Down
3 changes: 2 additions & 1 deletion FilterExtension/Editor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ IEnumerator editorInit()
customCategory cat = Core.Instance.Categories.FirstOrDefault(c => c.categoryName == C.button.categoryName);
if (cat != null && cat.hasSubCategories() && cat.stockCategory)
{
C.subcategories.Clear();
if (cat.behaviour == categoryTypeAndBehaviour.StockReplace)
C.subcategories.Clear();
cat.initialise();
}
}
Expand Down
4 changes: 2 additions & 2 deletions FilterExtension/Utility/PartType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,14 @@ internal static bool checkFolder(AvailablePart part, string[] values)

internal static bool checkPath(AvailablePart part, string value)
{
string[] values = value.Split(',');
string[] values = value.Replace('\\', '/').Split(',');
return checkPath(part, values);
}

internal static bool checkPath(AvailablePart part, string[] values)
{
if (Core.partPathDict.ContainsKey(part.name))
return values.Any(s => Core.partPathDict[part.name].StartsWith(s, StringComparison.InvariantCultureIgnoreCase));
return values.Any(s => Core.partPathDict[part.name].StartsWith(s.Trim(), StringComparison.InvariantCultureIgnoreCase));

return false;
}
Expand Down
17 changes: 16 additions & 1 deletion ...onfigs/SubCategories_FilterbyFunction.cfg → ...ategories/Categories_FilterbyFunction.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
CATEGORY
{
name = Filter by Function
stock = true
type = stock
value = replace

SUBCATEGORIES
{
Expand All @@ -13,6 +14,7 @@ CATEGORY
list = 5,Aerodynamics
list = 6,Utility
list = 7,Science
list = 8,SPP
}
}

Expand Down Expand Up @@ -127,4 +129,17 @@ SUBCATEGORY
value = Science
}
}
}
SUBCATEGORY
{
name = SPP

FILTER
{
CHECK
{
type = path
value = Squad/SPP
}
}
}
3 changes: 2 additions & 1 deletion ...onfigs/SubCategories_FilterbyResource.cfg → ...ategories/Categories_FilterbyResource.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
CATEGORY
{
name = Filter by Resource
stock = true
type = stock
value = replace

SUBCATEGORIES
{
Expand Down
Binary file modified GameData/000_FilterExtensions/FilterExtensions.dll
View file
Binary file not shown.

0 comments on commit eafa747

Please sign in to comment.