Skip to content
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

Switch to eolib #46

Merged
merged 33 commits into from
Jan 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e63bf1b
switch to eolib crate
sorokya Dec 28, 2023
0cb383f
Change instances of EOByte to u8
sorokya Dec 28, 2023
91b78d5
Replace instances of EOChar with i32
sorokya Dec 28, 2023
0c0c5bb
Replace instances of EOShort with i32
sorokya Dec 28, 2023
bd6f1a7
Replace instances of EOThree with i32
sorokya Dec 28, 2023
b351083
Replace instances of EOInt to i32
sorokya Dec 28, 2023
b801b9b
remove useless check
sorokya Dec 31, 2023
14b1b7a
add some error handling for serialize
sorokya Dec 31, 2023
a5d2610
Fix sequencing, guild tag, range packets
sorokya Dec 31, 2023
166ff9f
Fix guild padding on welcome
sorokya Dec 31, 2023
8e261ec
Fix door close timer
sorokya Dec 31, 2023
943b0eb
Fix scroll items
sorokya Dec 31, 2023
5eacb44
Fix eolib to encode negative ints
sorokya Dec 31, 2023
7b932bd
Report player now uses protocol struct
sorokya Dec 31, 2023
ece5d0c
Speak to admin now uses protocol struct
sorokya Dec 31, 2023
104be6f
Login reply packets now use protocol struct
sorokya Dec 31, 2023
8cb33d2
Inn packets now use protocol structs
sorokya Dec 31, 2023
35f38f5
Trade packets using protocol structs
sorokya Dec 31, 2023
934a0ed
Locker packets using protocol structs
sorokya Dec 31, 2023
0495395
Spike packets using protocol structs
sorokya Dec 31, 2023
e9294e2
Quake packet now uses protocol struct
sorokya Dec 31, 2023
0340953
NPC damage/death packets now using protocol structs
sorokya Dec 31, 2023
b8def08
Admin hide now using protocol structs
sorokya Dec 31, 2023
8517ff4
Chest packets now using protocol structs
sorokya Dec 31, 2023
b10e125
Drain packets now use protocol structs
sorokya Dec 31, 2023
409e4ea
Party packets now using protocol structs
sorokya Dec 31, 2023
9d0a477
Arena packets now use protocol structs
sorokya Dec 31, 2023
f0d2a29
Fix remaining warnings
sorokya Dec 31, 2023
4f69fa0
Changed old stats/paperdoll names to match protocol
sorokya Jan 1, 2024
0dd00dd
Implement refresh request
sorokya Jan 1, 2024
29a6914
Implement online list
sorokya Jan 1, 2024
7b33c76
Implement #find command
sorokya Jan 1, 2024
de61609
use git eolib
sorokya Jan 1, 2024
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
141 changes: 51 additions & 90 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ console-subscriber = { version = "0.2", optional = true }
mysql_common = { version = "0.31", features = ["chrono"] }
mysql_async = { version = "0.33", default-features = false, features = ["default-rustls"] }
argon2 = "0.5.2"
eo = { git = "https://github.com/sorokya/eo", features = ["use_serde", "generate_protocol"] }
eolib = { git = "https://github.com/sorokya/eolib-rs", features = ["use_serde"] }
rand = "0.8"
evalexpr = "11.3.0"
duration-str = "0.7.1"
Expand Down
2 changes: 1 addition & 1 deletion Config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ quakes = [

# Number of ticks before a door is closed
# This should be a multiple of world.door_close_rate
door_close_rate = 24
door_close_rate = 3

[npcs]
# Should NPCs spawn immediately when the server starts?
Expand Down
11 changes: 5 additions & 6 deletions src/arenas.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
use config::{Config, ConfigError, File};
use eo::data::{EOChar, EOInt, EOShort};

#[derive(Debug, Deserialize)]
pub struct Arena {
pub map: EOShort,
pub rate: EOInt,
pub block: EOChar,
pub map: i32,
pub rate: i32,
pub block: i32,
pub spawns: Vec<ArenaSpawn>,
}

Expand All @@ -17,8 +16,8 @@ pub struct ArenaSpawn {

#[derive(Debug, Deserialize)]
pub struct ArenaCoords {
pub x: EOChar,
pub y: EOChar,
pub x: i32,
pub y: i32,
}

#[derive(Debug, Deserialize)]
Expand Down
Loading
Loading