-
Notifications
You must be signed in to change notification settings - Fork 187
Eating is actually doable (no raymarching) #2381
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.
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
base: master
Are you sure you want to change the base?
Changes from 5 commits
d83ae73
34b5175
09bd2d9
a9e25be
a383c6a
b3d86d0
09e6044
86f786e
3a6eda4
32c7e94
2bacc52
ab703a9
31a19dd
6ac782b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| .{ | ||
| .texture = "apple.png", | ||
| .food = 4, | ||
| .onUse = .{ | ||
| .type = .eat, | ||
| .food = 0.5, | ||
| }, | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| .{ | ||
| .texture = "raw_meat.png", | ||
| .food = 3, | ||
| .onUse = .{ | ||
| .type = .eat, | ||
| .food = 3, | ||
| }, | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ const ToolTypeIndex = main.items.ToolTypeIndex; | |
|
|
||
| const Gamemode = main.game.Gamemode; | ||
|
|
||
| const Side = enum {client, server}; | ||
| pub const Side = enum {client, server}; | ||
|
|
||
| pub const InventoryId = enum(u32) {_}; | ||
|
|
||
|
|
@@ -507,6 +507,20 @@ pub const Sync = struct { // MARK: Sync | |
| Sync.ServerSide.executeCommand(.{.addHealth = .{.target = userId, .health = health, .cause = cause}}, null); | ||
| } | ||
| } | ||
| pub fn addEnergy(energy: f32, side: Side, userId: u32) void { | ||
| if(side == .client) { | ||
| Sync.ClientSide.executeCommand(.{.addEnergy = .{.target = userId, .energy = energy}}); | ||
| } else { | ||
| Sync.ServerSide.executeCommand(.{.addEnergy = .{.target = userId, .energy = energy}}, null); | ||
| } | ||
| } | ||
tillpp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| pub fn useItem(source: Command.InventoryAndSlot, side: Side) void { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since this function is only used on the client, it should only exist in |
||
| if(side == .client) { | ||
| Sync.ClientSide.executeCommand(.{.useItem = .{.source = source}}); | ||
| } else { | ||
| Sync.ServerSide.executeCommand(.{.useItem = .{.source = source}}, null); | ||
| } | ||
| } | ||
|
|
||
| pub fn getInventory(id: InventoryId, side: Side, user: ?*main.server.User) ?Inventory { | ||
| return switch(side) { | ||
|
|
@@ -538,6 +552,8 @@ pub const Command = struct { // MARK: Command | |
| clear = 8, | ||
| updateBlock = 9, | ||
| addHealth = 10, | ||
| addEnergy = 13, | ||
| useItem = 12, | ||
| }; | ||
| pub const Payload = union(PayloadType) { | ||
| open: Open, | ||
|
|
@@ -552,6 +568,8 @@ pub const Command = struct { // MARK: Command | |
| clear: Clear, | ||
| updateBlock: UpdateBlock, | ||
| addHealth: AddHealth, | ||
| addEnergy: AddEnergy, | ||
| useItem: UseItem, | ||
| }; | ||
|
|
||
| const BaseOperationType = enum(u8) { | ||
|
|
@@ -564,7 +582,7 @@ pub const Command = struct { // MARK: Command | |
| addEnergy = 6, | ||
| }; | ||
|
|
||
| const InventoryAndSlot = struct { | ||
| pub const InventoryAndSlot = struct { | ||
| inv: Inventory, | ||
| slot: u32, | ||
|
|
||
|
|
@@ -979,7 +997,7 @@ pub const Command = struct { // MARK: Command | |
| } | ||
| } | ||
|
|
||
| fn executeBaseOperation(self: *Command, allocator: NeverFailingAllocator, _op: BaseOperation, side: Side) void { // MARK: executeBaseOperation() | ||
| pub fn executeBaseOperation(self: *Command, allocator: NeverFailingAllocator, _op: BaseOperation, side: Side) void { // MARK: executeBaseOperation() | ||
| var op = _op; | ||
| switch(op) { | ||
| .move => |info| { | ||
|
|
@@ -1947,6 +1965,79 @@ pub const Command = struct { // MARK: Command | |
| return result; | ||
| } | ||
| }; | ||
| const AddEnergy = struct { // MARK: AddEnergy | ||
tillpp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| target: u32, | ||
| energy: f32, | ||
|
|
||
| pub fn run(self: AddEnergy, allocator: NeverFailingAllocator, cmd: *Command, side: Side, _: ?*main.server.User, _: Gamemode) error{serverFailure}!void { | ||
| var target: ?*main.server.User = null; | ||
|
|
||
| if(side == .server) { | ||
| const userList = main.server.getUserListAndIncreaseRefCount(main.stackAllocator); | ||
| defer main.server.freeUserListAndDecreaseRefCount(main.stackAllocator, userList); | ||
| for(userList) |user| { | ||
| if(user.id == self.target) { | ||
| target = user; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if(target == null) return error.serverFailure; | ||
|
|
||
| if(target.?.gamemode.raw == .creative) return; | ||
| } else { | ||
| if(main.game.Player.gamemode.raw == .creative) return; | ||
| } | ||
|
|
||
| cmd.executeBaseOperation(allocator, .{.addEnergy = .{ | ||
| .target = target, | ||
| .energy = self.energy, | ||
| .previous = if(side == .server) target.?.player.energy else main.game.Player.super.energy, | ||
| }}, side); | ||
| } | ||
|
|
||
| fn serialize(self: AddEnergy, writer: *utils.BinaryWriter) void { | ||
| writer.writeInt(u32, self.target); | ||
| writer.writeInt(u32, @bitCast(self.energy)); | ||
| } | ||
|
|
||
| fn deserialize(reader: *utils.BinaryReader, side: Side, user: ?*main.server.User) !AddEnergy { | ||
| const result: AddEnergy = .{ | ||
| .target = try reader.readInt(u32), | ||
| .energy = @bitCast(try reader.readInt(u32)), | ||
| }; | ||
| if(user.?.id != result.target or side != .server) return error.Invalid; | ||
| return result; | ||
| } | ||
| }; | ||
|
|
||
| const UseItem = struct { // MARK: UseItem | ||
| source: InventoryAndSlot, | ||
|
|
||
| pub fn run(self: UseItem, allocator: NeverFailingAllocator, cmd: *Command, side: Side, user: ?*main.server.User, gamemode: Gamemode) error{serverFailure}!void { | ||
| if(self.source.inv.type != .normal) return; | ||
| const stack = self.source.ref(); | ||
|
|
||
| switch(stack.item) { | ||
| .baseItem => |baseItem| { | ||
| _ = baseItem.onUse().run(.{.stack = stack, .source = self.source, .allocator = allocator, .cmd = cmd, .side = side, .user = user, .gamemode = gamemode}); | ||
tillpp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }, | ||
| .tool => {}, | ||
| .null => {}, | ||
| } | ||
| } | ||
|
|
||
| fn serialize(self: UseItem, writer: *utils.BinaryWriter) void { | ||
| self.source.write(writer); | ||
| } | ||
|
|
||
| fn deserialize(reader: *utils.BinaryReader, side: Side, user: ?*main.server.User) !UseItem { | ||
| const result: UseItem = .{ | ||
| .source = try InventoryAndSlot.read(reader, side, user), | ||
| }; | ||
| return result; | ||
| } | ||
| }; | ||
| }; | ||
|
|
||
| const SourceType = enum(u8) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| pub const eat = @import("eat.zig"); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| const std = @import("std"); | ||
|
|
||
| const main = @import("main"); | ||
|
|
||
| food: f32, | ||
tillpp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| pub fn init(zon: main.ZonElement) ?*@This() { | ||
| const result = main.worldArena.create(@This()); | ||
| result.* = .{ | ||
| .food = zon.get(f32, "food", 1.0), | ||
| }; | ||
| return result; | ||
| } | ||
|
|
||
| pub fn run(self: *@This(), params: main.callbacks.UseItemCallback.Params) main.callbacks.Result { | ||
| const cmd = params.cmd; | ||
| const allocator = params.allocator; | ||
| const user = params.user; | ||
| const side = params.side; | ||
| const gamemode = params.gamemode; | ||
| const source = params.source; | ||
| const stack = params.stack; | ||
tillpp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| // enough items there? | ||
| if(stack.amount < 1) | ||
| return .ignored; | ||
|
|
||
| const previous = if(side == .server) user.?.player.energy else main.game.Player.super.energy; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please check that user is not null, because in fact in this PR you added code that passes null for this (see comment above) |
||
| const maxEnergy = if(side == .server) user.?.player.maxEnergy else main.game.Player.super.maxEnergy; | ||
| if(self.food > 0 and previous >= maxEnergy) | ||
| return .ignored; | ||
|
|
||
| cmd.executeBaseOperation(allocator, .{.addEnergy = .{ | ||
| .target = user, | ||
| .energy = self.food, | ||
| .previous = previous, | ||
| }}, side); | ||
|
|
||
| // Apply inventory changes: | ||
| if(gamemode == .creative) return .handled; | ||
|
|
||
| cmd.executeBaseOperation(allocator, .{.delete = .{ | ||
| .source = source, | ||
| .amount = 1, | ||
| }}, side); | ||
| return .handled; | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.