Combined all of the basic stats modifier

assets/cubyz/blocks/amber_ore.zig.zon

@@ -13,7 +13,8 @@
 			.textureRoughness = 0.1,
 			.modifiers = .{
 				.{
-					.id = "light",
+					.id = "base_stat",
+					.targetProperty = "swingSpeed",
 					.strength = 0.5,
 					.restriction = .{
 						.id = .encased,

assets/cubyz/blocks/branch/baobab.zig.zon

@@ -20,7 +20,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/birch.zig.zon

@@ -23,7 +23,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/bolete.zig.zon

@@ -17,7 +17,8 @@
 			.textureRoughness = 0.5,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/cirrus.zig.zon

@@ -20,7 +20,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "light",
+					.id = "base_stat",
+					.targetProperty = "swingSpeed",
 					.strength = 0.15,
 				},
 			},

assets/cubyz/blocks/branch/glimmergill.zig.zon

@@ -17,7 +17,8 @@
 			.textureRoughness = 0.5,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.50,
 				},
 			},

assets/cubyz/blocks/branch/mahogany.zig.zon

@@ -20,7 +20,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/oak.zig.zon

@@ -20,7 +20,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/palm.zig.zon

@@ -20,7 +20,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/pine.zig.zon

@@ -20,7 +20,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/toadstool.zig.zon

@@ -17,7 +17,8 @@
 			.textureRoughness = 0.5,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/branch/willow.zig.zon

@@ -20,7 +20,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.45,
 				},
 			},

assets/cubyz/blocks/diamond_ore.zig.zon

@@ -25,8 +25,9 @@
 			.textureRoughness = 0.1,
 			.modifiers = .{
 				.{
-					.id = "fragile",
-					.strength = 0.5,
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
+					.strength = -0.5,
 					.restriction = .{
 						.id = .not,
 						.child = .{
@@ -37,7 +38,8 @@
 					},
 				},
 				.{
-					.id = "powerful",
+					.id = "base_stat",
+					.targetProperty = "damage",
 					.strength = 0.5,
 					.restriction = .{
 						.id = .encased,

assets/cubyz/blocks/jade_ore.zig.zon

@@ -13,7 +13,8 @@
 			.textureRoughness = 0.1,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 1.5,
 					.restriction = .{
 						.id = .encased,

assets/cubyz/blocks/obsidian.zig.zon

@@ -15,8 +15,9 @@
 			.textureRoughness = 0.1,
 			.modifiers = .{
 				.{
-					.id = "fragile",
-					.strength = 0.33,
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
+					.strength = -0.33,
 				},
 			},
 		},

assets/cubyz/blocks/planks/baobab.zig.zon

@@ -8,7 +8,8 @@
 			.swingSpeed = 4.2,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.4,
 				},
 			},

assets/cubyz/blocks/planks/birch.zig.zon

@@ -9,7 +9,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.4,
 				},
 			},

assets/cubyz/blocks/planks/cirrus.zig.zon

@@ -9,7 +9,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "light",
+					.id = "base_stat",
+					.targetProperty = "swingSpeed",
 					.strength = 0.1,
 				},
 			},

assets/cubyz/blocks/planks/mahogany.zig.zon

@@ -9,7 +9,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.4,
 				},
 			},

assets/cubyz/blocks/planks/oak.zig.zon

@@ -9,7 +9,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.4,
 				},
 			},

assets/cubyz/blocks/planks/palm.zig.zon

@@ -8,7 +8,8 @@
 			.swingSpeed = 5.2,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.4,
 				},
 			},

assets/cubyz/blocks/planks/pine.zig.zon

@@ -9,7 +9,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.4,
 				},
 			},

assets/cubyz/blocks/planks/willow.zig.zon

@@ -9,7 +9,8 @@
 			.textureRoughness = 0.7,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.4,
 				},
 			},

assets/cubyz/blocks/ruby_ore.zig.zon

@@ -13,8 +13,9 @@
 			.textureRoughness = 0.1,
 			.modifiers = .{
 				.{
-					.id = "fragile",
-					.strength = 0.45,
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
+					.strength = -0.45,
 					.restriction = .{
 						.id = .not,
 						.child = .{

assets/cubyz/blocks/sandstone/_defaults.zig.zon

@@ -14,8 +14,9 @@
 			.textureRoughness = 0.9,
 			.modifiers = .{
 				.{
-					.id = "fragile",
-					.strength = 0.20,
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
+					.strength = -0.20,
 					.restriction = .{
 						.id = .not,
 						.child = .{

assets/cubyz/blocks/voidstone/_defaults.zig.zon

@@ -15,7 +15,8 @@
 			.textureRoughness = 0.4,
 			.modifiers = .{
 				.{
-					.id = "durable",
+					.id = "base_stat",
+					.targetProperty = "maxDurability",
 					.strength = 0.1,
 				},
 				.{

src/items.zig

@@ -800,13 +800,13 @@ pub const ProceduralItemType = struct { // MARK: ProceduralItemType
 	pixelSourcesOverlay: [16][16]u8,
 };
 
-const ProceduralItemProperty = enum {
-	damage,
-	maxDurability,
+pub const ProceduralItemProperty = enum(u8) {
+	damage = 0,
+	maxDurability = 1,
 	/// how long it takes before the next swing happens
-	swingSpeed,
+	swingSpeed = 2,
 
-	fn fromString(string: []const u8) ?ProceduralItemProperty {
+	pub fn fromString(string: []const u8) ?ProceduralItemProperty {
 		return std.meta.stringToEnum(ProceduralItemProperty, string) orelse {
 			std.log.err("Couldn't find procedural Item property {s}.", .{string});
 			return null;

src/proceduralItem/modifiers/_list.zig

@@ -1,9 +1,4 @@
 pub const bad_at = @import("bad_at.zig");
-pub const durable = @import("durable.zig");
-pub const fragile = @import("fragile.zig");
 pub const good_at = @import("good_at.zig");
-pub const heavy = @import("heavy.zig");
-pub const light = @import("light.zig");
-pub const powerful = @import("powerful.zig");
 pub const single_use = @import("single_use.zig");
-pub const weak = @import("weak.zig");
+pub const base_stat = @import("base_stat.zig");

src/proceduralItem/modifiers/base_stat.zig

@@ -0,0 +1,54 @@
+const std = @import("std");
+
+const main = @import("main");
+const ProceduralItem = main.items.ProceduralItem;
+
+pub const Data = packed struct(u128) { strength: f32, targetProperty: main.items.ProceduralItemProperty, pad: u88 = undefined };
+
+pub const priority = 1;
+
+fn getModifierName(data: Data) []const u8 {
+	if (data.strength >= 0) {
+		switch (data.targetProperty) {
+			.damage => return "#f84a00**Powerful**",
+			.maxDurability => return "#500090**Durable**",
+			.swingSpeed => return "#9fffde**Light**",
+		}
+	} else {
+		switch (data.targetProperty) {
+			.damage => return "#fcb5e3**Weak**",
+			.maxDurability => return "#ccddff**Fragile**",
+			.swingSpeed => return "#ffcc30**Heavy**",
+		}
+	}
+}
+
+pub fn loadData(zon: main.ZonElement) Data {
+	return .{
+		.strength = zon.get(f32, "strength") orelse 0,
+		.targetProperty = main.items.ProceduralItemProperty.fromString(zon.get([]const u8, "targetProperty") orelse "missing .targetProperty field") orelse blk: {
+			std.log.err("replacing with .damage", .{});
+			break :blk .damage;
+		},
+	};
+}
+
+pub fn combineModifiers(data1: Data, data2: Data) ?Data {
+	if (data1.targetProperty != data2.targetProperty) return null;
+	return .{
+		.strength = std.math.hypot(data1.strength, data2.strength),
+		.targetProperty = data1.targetProperty,
+	};
+}
+
+pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Data) void {
+	proceduralItem.setProperty(data.targetProperty, proceduralItem.getProperty(data.targetProperty)*(1 + data.strength));
+}
+
+pub fn printTooltip(outString: *main.ListManaged(u8), data: Data) void {
+	if (data.strength >= 0) {
+		outString.print("{s} #808080(#30ca64+**{d:.0}% #808080{})", .{getModifierName(data), data.strength*100, data.targetProperty});
+	} else {
+		outString.print("{s} #808080(#fd3535**{d:.0}% #808080{})", .{getModifierName(data), data.strength*100, data.targetProperty});
+	}
+}