Skip to content

Add default implementation to some of the modifiers virtual functions #2812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IntegratedQuantum merged 5 commits into from
Apr 11, 2026
Merged

Add default implementation to some of the modifiers virtual functions #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd81ea9
Add default implementation to some of the modifiers virtual functions
Argmaster Apr 4, 2026
f0fe41b
I'm getting a segfault but I'm still going to update all the modifiers
Argmaster Apr 4, 2026
2df4540
Well I removed the segfault by making initFromModifierStruct very com…
Argmaster Apr 4, 2026
76b2ff7
Well I don't need the temporary variable anymore
Argmaster Apr 4, 2026
5e671f1
Resolve merge conflicts
Argmaster Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/items.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,24 @@ const Modifier = struct {
printTooltip: *const fn (outString: *main.List(u8), data: Data) void,
loadData: *const fn (zon: ZonElement) Data,
priority: f32,

const Defaults = struct {
pub fn changeProceduralItemParameters(_: *ProceduralItem, _: Data) void {}
pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}
};

inline fn initFromModifierStruct(comptime ModifierStruct: type) VTable {
return comptime .{
.changeProceduralItemParameters = @ptrCast(if (@hasDecl(ModifierStruct, "changeProceduralItemParameters")) &ModifierStruct.changeProceduralItemParameters else &VTable.Defaults.changeProceduralItemParameters),
.changeBlockDamage = @ptrCast(if (@hasDecl(ModifierStruct, "changeBlockDamage")) &ModifierStruct.changeBlockDamage else &VTable.Defaults.changeBlockDamage),
.combineModifiers = @ptrCast(&ModifierStruct.combineModifiers),
.printTooltip = @ptrCast(&ModifierStruct.printTooltip),
.loadData = @ptrCast(&ModifierStruct.loadData),
.priority = ModifierStruct.priority,
};
}
};
Comment thread
Argmaster marked this conversation as resolved.

pub fn combineModifiers(a: Modifier, b: Modifier) ?Modifier {
Expand Down Expand Up @@ -1167,15 +1185,8 @@ pub fn globalInit() void {
recipeList = .init(main.worldArena);
itemListSize = 0;
inline for (@typeInfo(modifierList).@"struct".decls) |decl| {
const ModifierStruct = @field(modifierList, decl.name);
modifiers.put(main.globalArena.allocator, decl.name, &.{
.changeProceduralItemParameters = @ptrCast(&ModifierStruct.changeProceduralItemParameters),
.changeBlockDamage = @ptrCast(&ModifierStruct.changeBlockDamage),
.combineModifiers = @ptrCast(&ModifierStruct.combineModifiers),
.printTooltip = @ptrCast(&ModifierStruct.printTooltip),
.loadData = @ptrCast(&ModifierStruct.loadData),
.priority = ModifierStruct.priority,
}) catch unreachable;
const ModifierStruct: type = @field(modifierList, decl.name);
modifiers.put(main.globalArena.allocator, decl.name, &Modifier.VTable.initFromModifierStruct(ModifierStruct)) catch unreachable;
}
inline for (@typeInfo(modifierRestrictionList).@"struct".decls) |decl| {
const ModifierRestrictionStruct = @field(modifierRestrictionList, decl.name);
Expand Down
2 changes: 0 additions & 2 deletions src/proceduralItem/modifiers/bad_at.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ pub fn combineModifiers(data1: Data, data2: Data) ?Data {
return .{.strength = 1.0 - 1.0/(1.0 + std.math.hypot(1.0/(1.0 - data1.strength) - 1.0, 1.0/(1.0 - data2.strength) - 1.0)), .tag = data1.tag};
}

pub fn changeProceduralItemParameters(_: *ProceduralItem, _: Data) void {}

pub fn changeBlockDamage(damage: f32, block: main.blocks.Block, data: Data) f32 {
for (block.blockTags()) |tag| {
if (tag == data.tag) return damage*(1 - data.strength);
Expand Down
4 changes: 0 additions & 4 deletions src/proceduralItem/modifiers/durable.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Dat
proceduralItem.maxDurability *= 1 + data.strength;
}

pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.print("#500090**Durable**#808080 *Increases durability by **{d:.0}%", .{data.strength*100});
}
4 changes: 0 additions & 4 deletions src/proceduralItem/modifiers/fragile.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Dat
proceduralItem.maxDurability *= 1 - data.strength;
}

pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.print("#ccddff**Fragile**#808080 *Decreases durability by **{d:.0}%", .{data.strength*100});
}
2 changes: 0 additions & 2 deletions src/proceduralItem/modifiers/good_at.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ pub fn combineModifiers(data1: Data, data2: Data) ?Data {
return .{.strength = std.math.hypot(data1.strength, data2.strength), .tag = data1.tag};
}

pub fn changeProceduralItemParameters(_: *ProceduralItem, _: Data) void {}

pub fn changeBlockDamage(damage: f32, block: main.blocks.Block, data: Data) f32 {
for (block.blockTags()) |tag| {
if (tag == data.tag) return damage*(1 + data.strength);
Expand Down
4 changes: 0 additions & 4 deletions src/proceduralItem/modifiers/heavy.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Dat
proceduralItem.swingSpeed *= 1 - data.strength;
}

pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.print("#ffcc30**Heavy**#808080 *Decreases swing speed by **{d:.0}%", .{data.strength*100});
}
4 changes: 0 additions & 4 deletions src/proceduralItem/modifiers/light.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Dat
proceduralItem.swingSpeed *= 1 + data.strength;
}

pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.print("#9fffde**Light**#808080 *Increases swing speed by **{d:.0}%", .{data.strength*100});
}
4 changes: 0 additions & 4 deletions src/proceduralItem/modifiers/powerful.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Dat
proceduralItem.damage *= 1 + data.strength;
}

pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.print("#f84a00**Powerful**#808080 *Increases damage by **{d:.0}%", .{data.strength*100});
}
4 changes: 0 additions & 4 deletions src/proceduralItem/modifiers/single_use.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Dat
proceduralItem.maxDurability = data.strength;
}

pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.print("#800000**Single-use**#808080 *Sets durability to **{d:.0}", .{data.strength});
}
4 changes: 0 additions & 4 deletions src/proceduralItem/modifiers/weak.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub fn changeProceduralItemParameters(proceduralItem: *ProceduralItem, data: Dat
proceduralItem.damage *= 1 - data.strength;
}

pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.print("#fcb5e3**Weak**#808080 *Decreases damage by **{d:.0}%", .{data.strength*100});
}
Loading