anna
/
megamappingway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(server): add current world

This commit is contained in:
Anna 2023-10-05 00:35:38 -04:00
parent d33eebdc20
commit 8ee73c70f0
Signed by: anna
GPG Key ID: D0943384CD9F87D1
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/migrations/1_initial_schema.up.sql
View File

@ -1,19 +1,20 @@
create table players
(
name text not null,
world int not null,
timestamp timestamp with time zone not null,
territory int not null,
x float not null,
y float not null,
z float not null,
w float not null,
customize blob not null,
level smallint not null,
job int not null,
free_company text,
current_hp int not null,
max_hp int not null,
name text not null,
world int not null,
timestamp timestamp with time zone not null,
territory int not null,
current_world int not null,
x float not null,
y float not null,
z float not null,
w float not null,
customize blob not null,
level smallint not null,
job int not null,
free_company text,
current_hp int not null,
max_hp int not null,
primary key (name, world)
);

32
server/src/main.rs
View File

@ -40,25 +40,27 @@ async fn upload(
sqlx::query!(
// language=sqlite
"
insert into players (name, world, timestamp, territory, x, y, z, w, customize, level, job, free_company, current_hp,
insert into players (name, world, timestamp, territory, current_world, x, y, z, w, customize, level, job, free_company, current_hp,
max_hp)
values (?, ?, current_timestamp, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
on conflict (name, world) do update set timestamp = current_timestamp,
territory = ?,
x = ?,
y = ?,
z = ?,
w = ?,
customize = ?,
level = ?,
job = ?,
free_company = ?,
current_hp = ?,
max_hp = ?
values (?, ?, current_timestamp, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
on conflict (name, world) do update set timestamp = current_timestamp,
territory = ?,
current_world = ?,
x = ?,
y = ?,
z = ?,
w = ?,
customize = ?,
level = ?,
job = ?,
free_company = ?,
current_hp = ?,
max_hp = ?
",
player.name,
player.world,
data.territory,
player.current_world,
player.x,
player.y,
player.z,
@ -71,6 +73,7 @@ async fn upload(
player.max_hp,
data.territory,
player.current_world,
player.x,
player.y,
player.z,
@ -100,6 +103,7 @@ struct Update {
struct PlayerInfo {
name: String,
world: u32,
current_world: u32,
x: f32,
y: f32,
z: f32,