Augment consistency tweaks

Author: TFlippy

content/Augments/Augments.Armor.cs

@@ -140,54 +140,6 @@ private static void RegisterArmorAugments(ref List<Augment.Definition> definitio
 					context.requirements_new.Add(Crafting.Requirement.Resource("smirgl_ingot", 2.00f));
 				}
 			));
-
-			definitions.Add(Augment.Definition.New<Armor.Data>
-			(
-				identifier: "armor.cloth_padded",
-				category: "Protection",
-				name: "Cloth Padding",
-				description: "Pads the inner side of the armor with cloth.",
-
-				can_add: static (ref Augment.Context context, in Armor.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
-				{
-					return !augments.HasAugment(handle);
-				},
-
-				apply_0: static (ref Augment.Context context, ref Armor.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
-				{
-					data.knockback_modifier *= 0.65f;
-					data.pain_modifier *= 0.80f;
-				},
-
-				apply_1: static (ref Augment.Context context, ref Armor.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
-				{
-					context.requirements_new.Add(Crafting.Requirement.Resource("cloth", 5.00f));
-				}
-			));
-
-			definitions.Add(Augment.Definition.New<Armor.Data>
-			(
-				identifier: "armor.mushroom_stuffed",
-				category: "Protection",
-				name: "Mushroom Stuffing",
-				description: "Stuffs the inner side of the armor with soft mushroom bits.",
-
-				can_add: static (ref Augment.Context context, in Armor.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
-				{
-					return !augments.HasAugment(handle);
-				},
-
-				apply_0: static (ref Augment.Context context, ref Armor.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
-				{
-					data.knockback_modifier = MathF.Max(data.knockback_modifier - 0.30f, data.knockback_modifier * 0.25f);
-					data.pain_modifier = MathF.Max((data.pain_modifier * 0.90f) - 0.30f, data.pain_modifier * 0.10f);
-				},
-
-				apply_1: static (ref Augment.Context context, ref Armor.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
-				{
-					context.requirements_new.Add(Crafting.Requirement.Resource("mushroom", 20.00f));
-				}
-			));
 		}
 	}
 }

content/Augments/Augments.cs

@@ -67,7 +67,7 @@ private static void RegisterAugments(ref List<Augment.Definition> definitions)
 
 			definitions.Add(Augment.Definition.New<Body.Data>
 			(
-				identifier: "health.mushroom_glow",
+				identifier: "utility.mushroom_glow",
 				category: "Utility",
 				name: "Mushroom Glow",
 				description: "Glows in the dark.",
@@ -826,7 +826,7 @@ private static void RegisterAugments(ref List<Augment.Definition> definitions)
 			definitions.Add(Augment.Definition.New<Equipment.Data>
 			(
 				identifier: "equipment.cursed",
-				category: "Utility",
+				category: "Equipment",
 				name: "Cursed",
 				description: "Covers the inner parts with tar, making it impossible to be unequipped.",
 
@@ -846,6 +846,62 @@ private static void RegisterAugments(ref List<Augment.Definition> definitions)
 				}
 			));
 
+			definitions.Add(Augment.Definition.New<Equipment.Data>
+			(
+				identifier: "equipment.cloth_padded",
+				category: "Equipment",
+				name: "Cloth Padding",
+				description: "Pads the inner side of the armor with cloth.",
+
+				can_add: static (ref Augment.Context context, in Equipment.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
+				{
+					return !augments.HasAugment(handle);
+				},
+
+				apply_0: static (ref Augment.Context context, ref Equipment.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
+				{
+					ref var armor = ref context.GetComponent<Armor.Data>();
+					if (armor.IsNotNull())
+					{
+						armor.knockback_modifier *= 0.65f;
+						armor.pain_modifier *= 0.80f;
+					}
+				},
+
+				apply_1: static (ref Augment.Context context, ref Equipment.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
+				{
+					context.requirements_new.Add(Crafting.Requirement.Resource("cloth", 5.00f));
+				}
+			));
+
+			definitions.Add(Augment.Definition.New<Equipment.Data>
+			(
+				identifier: "equipment.mushroom_stuffed",
+				category: "Equipment",
+				name: "Mushroom Stuffing",
+				description: "Stuffs the inner side of the armor with soft mushroom bits.",
+
+				can_add: static (ref Augment.Context context, in Equipment.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
+				{
+					return !augments.HasAugment(handle);
+				},
+
+				apply_0: static (ref Augment.Context context, ref Equipment.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
+				{
+					ref var armor = ref context.GetComponent<Armor.Data>();
+					if (armor.IsNotNull())
+					{
+						armor.knockback_modifier = MathF.Max(armor.knockback_modifier - 0.30f, armor.knockback_modifier * 0.25f);
+						armor.pain_modifier = MathF.Max((armor.pain_modifier * 0.90f) - 0.30f, armor.pain_modifier * 0.10f);
+					}
+				},
+
+				apply_1: static (ref Augment.Context context, ref Equipment.Data data, ref Augment.Handle handle, Span<Augment.Handle> augments) =>
+				{
+					context.requirements_new.Add(Crafting.Requirement.Resource("mushroom", 20.00f));
+				}
+			));
+
 			definitions.Add(Augment.Definition.New<Consumable.Data>
 			(
 				identifier: "consumable.alcohol",