Skip to content

Show total damage for good-at modifier #1886

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show total damage for good-at modifier #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/items.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,19 @@ const Material = struct { // MARK: Material
}
}

pub fn printTooltip(self: Material, outString: *main.List(u8)) void {
pub fn printTooltip(self: Material, outString: *main.List(u8), item: Item) void {
if(self.modifiers.len == 0) {
outString.appendSlice("§#808080Material\n");
}
for(self.modifiers) |modifier| {
if(modifier.restriction.vTable == modifierRestrictions.get("always") orelse unreachable) {
modifier.printTooltip(outString);
modifier.printTooltip(outString, item);
outString.appendSlice("\n");
} else {
outString.appendSlice("§#808080if ");
modifier.restriction.printTooltip(outString);
outString.appendSlice("\n ");
modifier.printTooltip(outString);
modifier.printTooltip(outString, item);
outString.appendSlice("\n");
}
}
Expand Down Expand Up @@ -157,7 +157,7 @@ const Modifier = struct {
combineModifiers: *const fn(data1: Data, data2: Data) ?Data,
changeToolParameters: *const fn(tool: *Tool, data: Data) void,
changeBlockDamage: *const fn(damage: f32, block: main.blocks.Block, data: Data) f32,
printTooltip: *const fn(outString: *main.List(u8), data: Data) void,
printTooltip: *const fn(outString: *main.List(u8), data: Data, item: Item) void,
loadData: *const fn(zon: ZonElement) Data,
priority: f32,
};
Expand All @@ -179,8 +179,8 @@ const Modifier = struct {
return self.vTable.changeBlockDamage(damage, block, self.data);
}

pub fn printTooltip(self: Modifier, outString: *main.List(u8)) void {
self.vTable.printTooltip(outString, self.data);
pub fn printTooltip(self: Modifier, outString: *main.List(u8), item: Item) void {
self.vTable.printTooltip(outString, self.data, item);
}
};

Expand Down Expand Up @@ -296,7 +296,7 @@ pub const BaseItem = struct { // MARK: BaseItem
tooltip.appendSlice(self.name);
tooltip.append('\n');
if(self.material) |mat| {
mat.printTooltip(&tooltip);
mat.printTooltip(&tooltip, Item{.baseItem = @enumFromInt(itemListSize)});
}
if(self.tags.len != 0) {
tooltip.appendSlice("§#808080");
Expand Down Expand Up @@ -841,7 +841,7 @@ pub const Tool = struct { // MARK: Tool
if(self.modifiers.len != 0) {
self.tooltip.appendSlice("\nModifiers:\n");
for(self.modifiers) |modifier| {
modifier.printTooltip(&self.tooltip);
modifier.printTooltip(&self.tooltip, Item{.tool = self});
self.tooltip.appendSlice("§\n");
}
_ = self.tooltip.pop();
Expand Down
3 changes: 2 additions & 1 deletion src/tool/modifiers/bad_at.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, tag: main.Tag, pad: u64 = undefined};

Expand All @@ -25,6 +26,6 @@ pub fn changeBlockDamage(damage: f32, block: main.blocks.Block, data: Data) f32
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
pub fn printTooltip(outString: *main.List(u8), data: Data, _: Item) void {
outString.writer().print("#a00050**Bad at**#808080 *Decreases damage by **{d:.0}%** on \n***#a00050{s}#808080*** blocks", .{data.strength*100, data.tag.getName()}) catch unreachable;
}
3 changes: 2 additions & 1 deletion src/tool/modifiers/durable.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined};

Expand All @@ -23,6 +24,6 @@ pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
pub fn printTooltip(outString: *main.List(u8), data: Data, _: Item) void {
outString.writer().print("#500090**Durable**#808080 *Increases durability by **{d:.0}%", .{data.strength*100}) catch unreachable;
}
3 changes: 2 additions & 1 deletion src/tool/modifiers/fragile.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined};

Expand All @@ -23,6 +24,6 @@ pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
pub fn printTooltip(outString: *main.List(u8), data: Data, _: Item) void {
outString.writer().print("#ccddff**Fragile**#808080 *Decreases durability by **{d:.0}%", .{data.strength*100}) catch unreachable;
}
8 changes: 6 additions & 2 deletions src/tool/modifiers/good_at.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, tag: main.Tag, pad: u64 = undefined};

Expand All @@ -25,6 +26,9 @@ pub fn changeBlockDamage(damage: f32, block: main.blocks.Block, data: Data) f32
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
outString.writer().print("#80ff40**Good at**#808080 *Increases damage by **{d:.0}%** on \n***#80ff40{s}#808080*** blocks", .{data.strength*100, data.tag.getName()}) catch unreachable;
pub fn printTooltip(outString: *main.List(u8), data: Data, item: Item) void {
switch(item) {
.tool => |tool| outString.writer().print("#80ff40**Good at**#808080 *Increases damage by **{d:.0}%** ({d:.2}) on ***#80ff40{s}#808080*** blocks", .{data.strength*100, tool.damage*data.strength, data.tag.getName()}) catch unreachable,
else => outString.writer().print("#80ff40**Good at**#808080 *Increases damage by **{d:.0}%** on ***#80ff40{s}#808080*** blocks", .{data.strength*100, data.tag.getName()}) catch unreachable,
}
}
3 changes: 2 additions & 1 deletion src/tool/modifiers/heavy.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined};

Expand All @@ -23,6 +24,6 @@ pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
pub fn printTooltip(outString: *main.List(u8), data: Data, _: Item) void {
outString.writer().print("#ffcc30**Heavy**#808080 *Increases swing time by **{d:.0}%", .{data.strength*100}) catch unreachable;
}
3 changes: 2 additions & 1 deletion src/tool/modifiers/light.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined};

Expand All @@ -23,6 +24,6 @@ pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
pub fn printTooltip(outString: *main.List(u8), data: Data, _: Item) void {
outString.writer().print("#9fffde**Light**#808080 *Decreases swing time by **{d:.0}%", .{data.strength*100}) catch unreachable;
}
3 changes: 2 additions & 1 deletion src/tool/modifiers/powerful.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined};

Expand All @@ -23,6 +24,6 @@ pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
pub fn printTooltip(outString: *main.List(u8), data: Data, _: Item) void {
outString.writer().print("#f84a00**Powerful**#808080 *Increases damage by **{d:.0}%", .{data.strength*100}) catch unreachable;
}
3 changes: 2 additions & 1 deletion src/tool/modifiers/single_use.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined};

Expand All @@ -23,6 +24,6 @@ pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

pub fn printTooltip(outString: *main.List(u8), data: Data) void {
pub fn printTooltip(outString: *main.List(u8), data: Data, _: Item) void {
outString.writer().print("#800000**Single-use**#808080 *Sets durability to **{d:.0}", .{data.strength}) catch unreachable;
}
3 changes: 2 additions & 1 deletion src/tool/modifiers/weak.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const std = @import("std");

const main = @import("main");
const Tool = main.items.Tool;
const Item = main.items.Item;

pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined};

Expand All @@ -23,6 +24,6 @@ pub fn changeBlockDamage(damage: f32, _: main.blocks.Block, _: Data) f32 {
return damage;
}

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