RustyStriker/open_tavern
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add onshowscene and get_current_scene functions

Browse source
This commit is contained in:
Rusty Striker 2025-06-16 20:57:51 +03:00
parent f59c06c348
commit 731f22a2c2
Signed by: RustyStriker
GPG key ID: 87E4D691632DFF15
7 changed files with 188 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

61
assets/web/app.js
View file

@ -7,26 +7,26 @@ var draggedToken = { token: null, offX: 0, offY: 0 };
var draggedDiv = { div: null, offX: 0, offY: 0 }; var draggedDiv = { div: null, offX: 0, offY: 0 };
function init() { function init() {
let view = document.getElementById('game-view'); let view = document.getElementById('game-view');
view.onwheel = onGameViewScroll; view.onwheel = onGameViewScroll;
view.onmousemove = onGameMouseMove; view.onmousemove = onGameMouseMove;
view.onmouseup = onGameMouseUp; view.onmouseup = onGameMouseUp;
view.oncontextmenu = () => false; view.oncontextmenu = () => false;
// allow sending chat message using enter (and shift-enter for new line) // allow sending chat message using enter (and shift-enter for new line)
document.getElementById('newmsg-content').onkeypress = (e) => { document.getElementById('newmsg-content').onkeypress = (e) => {
if(e.key == "Enter" && !e.shiftKey) { if (e.key == "Enter" && !e.shiftKey) {
sendChatMessage(); sendChatMessage();
return false; return false;
} }
} }
document.getElementById('login-username').onkeypress = (e) => { document.getElementById('login-username').onkeypress = (e) => {
if(e.key == 'Enter') { if (e.key == 'Enter') {
document.getElementById('login-pass').focus(); document.getElementById('login-pass').focus();
return false; return false;
} }
} }
document.getElementById('login-pass').onkeypress = (e) => { document.getElementById('login-pass').onkeypress = (e) => {
if(e.key == 'Enter') { if (e.key == 'Enter') {
onLoginClick(); onLoginClick();
return false; return false;
} }
@ -38,19 +38,17 @@ function init() {
} }
document.body.onmousemove = onMoveableDivDrag; document.body.onmousemove = onMoveableDivDrag;
document.body.onmouseup = onMoveableDivMouseUp; document.body.onmouseup = onMoveableDivMouseUp;
// TODO: Remove when done dev-ing
tavern.onmessage({ text: 'test', id: 1, source: 'rusty', character: 'bart' });
} }
tavern.onlogin = (s) => { tavern.onlogin = (s) => {
if(s) { if (s) {
let login = document.getElementById('login-screen'); let login = document.getElementById('login-screen');
let game = document.getElementById('game'); let game = document.getElementById('game');
login.style.display = 'none'; login.style.display = 'none';
game.style.display = 'flex'; game.style.display = 'flex';
// get last 50 msgs (i think that is enough for now) when we get in // get last 50 msgs (i think that is enough for now) when we get in
tavern.get_last_msgs(50); tavern.get_last_msgs(50);
tavern.get_tokens(); tavern.get_current_scene();
} }
else { else {
alert("Invalid username or password!"); alert("Invalid username or password!");
@ -72,15 +70,15 @@ tavern.onmessage = (m) => {
${m.text.replace('\n', '\n<br>\n')} ${m.text.replace('\n', '\n<br>\n')}
</p> </p>
` `
msg.oncontextmenu = (e) => { msg.oncontextmenu = (e) => {
if(e.shiftKey) { return true; } if (e.shiftKey) { return true; }
let cm = document.getElementById('msg-context-menu'); let cm = document.getElementById('msg-context-menu');
cm.style.display = 'flex'; cm.style.display = 'flex';
cm.style.top = `${e.pageY}px`; cm.style.top = `${e.pageY}px`;
cm.style.left = `${e.pageX}px`; cm.style.left = `${e.pageX}px`;
return false; return false;
} }
if(m.actions) { if (m.actions) {
let holder = document.createElement('div'); let holder = document.createElement('div');
holder.style.display = 'flex'; holder.style.display = 'flex';
holder.style.flexWrap = 'wrap'; holder.style.flexWrap = 'wrap';
@ -98,7 +96,7 @@ tavern.onmessage = (m) => {
let history = document.getElementById('chat-history'); let history = document.getElementById('chat-history');
// this is to force update everytime we get a duplicate msg to allow msg editing (yay) // this is to force update everytime we get a duplicate msg to allow msg editing (yay)
let exists = Array.from(history.children).filter(e => e.style.order == m.id)[0]; let exists = Array.from(history.children).filter(e => e.style.order == m.id)[0];
if(exists) { if (exists) {
history.removeChild(exists); history.removeChild(exists);
} }
history.appendChild(msg); history.appendChild(msg);
@ -126,15 +124,24 @@ tavern.onspawntoken = (t) => {
} }
tavern.onmovetoken = (m) => { tavern.onmovetoken = (m) => {
let token = Array.from(document.getElementsByClassName('token')).filter(t => t.token_id == m.token_id)[0] let token = Array.from(document.getElementsByClassName('token')).filter(t => t.token_id == m.token_id)[0]
if(token) { if (token) {
token.style.top = `${m.y * GRID_SIZE}px`; token.style.top = `${m.y * GRID_SIZE}px`;
token.style.left = `${m.x * GRID_SIZE}px`; token.style.left = `${m.x * GRID_SIZE}px`;
} }
} }
tavern.onshowscene = (show) => {
let map = document.getElementById('map');
// Remove existing tokens
Array.from(map.children).filter(c => c.classList.contains('token')).forEach(c => map.removeChild(c));
for (let token of show.tokens) {
tavern.onspawntoken(token);
}
}
function onLoginClick() { function onLoginClick() {
let username = document.getElementById('login-username').value; let username = document.getElementById('login-username').value;
let pass = document.getElementById('login-pass').value; let pass = document.getElementById('login-pass').value;
if(username == 'test') { if (username == 'test') {
// TODO: Remove this for when im done dev-ing with this file // TODO: Remove this for when im done dev-ing with this file
tavern.onlogin(true); tavern.onlogin(true);
} }
@ -143,11 +150,11 @@ function onLoginClick() {
function onGameViewScroll(event) { function onGameViewScroll(event) {
let map = document.getElementById('map'); let map = document.getElementById('map');
mapScale += (event.wheelDelta / 1800.0); mapScale += (event.wheelDelta / 1800.0);
if(mapScale < 0.1) { mapScale = 0.1; } if (mapScale < 0.1) { mapScale = 0.1; }
map.style.transform = `scale(${mapScale})`; map.style.transform = `scale(${mapScale})`;
} }
function onGameMouseMove(event) { function onGameMouseMove(event) {
if(event.buttons == 2) { if (event.buttons == 2) {
// right click // right click
let map = document.getElementById('map'); let map = document.getElementById('map');
let mult = event.ctrlKey ? 2.0 : 1.0; let mult = event.ctrlKey ? 2.0 : 1.0;
@ -156,7 +163,7 @@ function onGameMouseMove(event) {
map.style.left = `${mapOffsetX}px`; map.style.left = `${mapOffsetX}px`;
map.style.top = `${mapOffsetY}px`; map.style.top = `${mapOffsetY}px`;
} }
else if(draggedToken.token != null && event.buttons == 1) { else if (draggedToken.token != null && event.buttons == 1) {
let top = (event.clientY - mapOffsetY) / mapScale - draggedToken.offY; let top = (event.clientY - mapOffsetY) / mapScale - draggedToken.offY;
let left = (event.clientX - mapOffsetX) / mapScale - draggedToken.offX; let left = (event.clientX - mapOffsetX) / mapScale - draggedToken.offX;
draggedToken.token.style.top = `${top}px`; draggedToken.token.style.top = `${top}px`;
@ -164,7 +171,7 @@ function onGameMouseMove(event) {
} }
} }
function onGameMouseUp() { function onGameMouseUp() {
if(draggedToken.token != null) { if (draggedToken.token != null) {
let t = draggedToken.token; let t = draggedToken.token;
let x = Math.floor(0.5 + parseInt(t.style.left) / GRID_SIZE); let x = Math.floor(0.5 + parseInt(t.style.left) / GRID_SIZE);
let y = Math.floor(0.5 + parseInt(t.style.top) / GRID_SIZE); let y = Math.floor(0.5 + parseInt(t.style.top) / GRID_SIZE);
@ -186,7 +193,7 @@ function openRollsPopup(action) {
let holder = document.getElementById('dice-roll-holder'); let holder = document.getElementById('dice-roll-holder');
holder.innerHTML = ''; // remove all holder children holder.innerHTML = ''; // remove all holder children
holder.action = action; holder.action = action;
if(action.rolls != undefined && Array.isArray(action.rolls)) { if (action.rolls != undefined && Array.isArray(action.rolls)) {
for (const r of action.rolls) { for (const r of action.rolls) {
// name (extra) (dice_amount)d(dice_type) + constant | enabled // name (extra) (dice_amount)d(dice_type) + constant | enabled
console.log(r); console.log(r);
@ -211,8 +218,8 @@ function rollPopup() {
// get the holder and start rolling dice // get the holder and start rolling dice
let rolls = []; let rolls = [];
let holder = document.getElementById('dice-roll-holder'); let holder = document.getElementById('dice-roll-holder');
for(const h of holder.children) { for (const h of holder.children) {
if(h.roll && h.children[2].checked) { if (h.roll && h.children[2].checked) {
let roll = { name: h.roll.name, extra: h.roll.extra }; let roll = { name: h.roll.name, extra: h.roll.extra };
let msg = ''; let msg = '';
let sum = 0; let sum = 0;
@ -221,12 +228,12 @@ function rollPopup() {
let roll = Math.floor(Math.random() * h.roll.dice_type) + 1; let roll = Math.floor(Math.random() * h.roll.dice_type) + 1;
sum += roll; sum += roll;
msg += `${roll}`; msg += `${roll}`;
if(i != h.roll.dice_amount - 1 || h.roll.constant != 0) { if (i != h.roll.dice_amount - 1 || h.roll.constant != 0) {
msg += ' + '; msg += ' + ';
} }
} }
if(h.roll.constant != 0) { if (h.roll.constant != 0) {
sum += h.roll.constant; sum += h.roll.constant;
msg += `${h.roll.constant}`; msg += `${h.roll.constant}`;
} }
roll.result = sum; roll.result = sum;
@ -238,7 +245,7 @@ function rollPopup() {
tavern.action_result(holder.action.name, 'Louise', [], rolls); tavern.action_result(holder.action.name, 'Louise', [], rolls);
} }
function onMoveableDivMouseDown(e, id) { function onMoveableDivMouseDown(e, id) {
if(e.buttons == 1) { if (e.buttons == 1) {
let div = document.getElementById(id); let div = document.getElementById(id);
let rect = div.getBoundingClientRect(); let rect = div.getBoundingClientRect();
draggedDiv.div = div; draggedDiv.div = div;
@ -248,7 +255,7 @@ function onMoveableDivMouseDown(e, id) {
} }
} }
function onMoveableDivDrag(e) { function onMoveableDivDrag(e) {
if(draggedDiv.div) { if (draggedDiv.div) {
draggedDiv.div.style.right = ''; draggedDiv.div.style.right = '';
draggedDiv.div.style.top = `${e.clientY - draggedDiv.offY}px`; draggedDiv.div.style.top = `${e.clientY - draggedDiv.offY}px`;
draggedDiv.div.style.left = `${e.clientX - draggedDiv.offX}px`; draggedDiv.div.style.left = `${e.clientX - draggedDiv.offX}px`;

56
assets/web/style.css
View file

@ -1,33 +1,38 @@
html, body { html,
body {
margin: 0; margin: 0;
height: 100%; height: 100%;
} }
body{
body {
background-color: rgb(32, 35, 35); background-color: rgb(32, 35, 35);
color: white; color: white;
} }
#side-panel { #side-panel {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
resize: horizontal; resize: horizontal;
overflow: auto; overflow: auto;
border: 0px solid black; border: 0px solid black;
width: 20%; width: 20%;
min-width: 10%; min-width: 10%;
max-width: 50%; max-width: 50%;
background-image: linear-gradient(135deg, #0f0f2f 0px, #0f0f2f 99%, rgb(188, 255, 185) 100%); background-image: linear-gradient(135deg, #0f0f2f 0px, #0f0f2f 99%, rgb(188, 255, 185) 100%);
} }
#chat-history { #chat-history {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
height: 90%; height: 90%;
resize: none; resize: none;
overflow: auto; overflow: auto;
margin-top: 10px; margin-top: 10px;
background-color:#0f0f2f; background-color: #0f0f2f;
} }
.chat-message { .chat-message {
background-color: #ffffd6; background-color: #ffffd6;
color: #000000; color: #000000;
@ -40,33 +45,40 @@ body{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
#msg-context-menu { #msg-context-menu {
display: none; display: none;
position: absolute; position: absolute;
z-index: 1000; z-index: 1000;
padding: 4px; padding: 4px;
} }
#msg-context-menu ul { #msg-context-menu ul {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
list-style: none; list-style: none;
} }
#msg-context-menu ul li { #msg-context-menu ul li {
padding: 4px; padding: 4px;
} }
#msg-context-menu ul li:hover { #msg-context-menu ul li:hover {
background: darkgray; background: darkgray;
cursor: pointer; cursor: pointer;
} }
.token { .token {
position: absolute; position: absolute;
} }
.token-transition { .token-transition {
transition: transition:
top 0.5s ease-in, top 0.1s ease-in,
left 0.5s ease-in; left 0.1s ease-in;
} }
.token img { .token img {
cursor: grab; cursor: grab;
width: 200px; width: 200px;

61
assets/web/tavern.js
View file

@ -1,24 +1,25 @@
const tavern = { const tavern = {
socket: socket = new WebSocket('ws:/' + window.location.host + '/ws'), socket: socket = new WebSocket('ws:/' + window.location.host + '/ws'),
msgs: [], msgs: [],
connected: false, connected: false,
loggedIn: false, loggedIn: false,
currentScene: 0,
call: (f, ...args) => { call: (f, ...args) => {
if(typeof(f) == "function") { if (typeof (f) == "function") {
f(...args); f(...args);
} }
} }
}; };
tavern.add_msg_to_history = (m) => { tavern.add_msg_to_history = (m) => {
let id = m.id - 1; let id = m.id - 1;
if(id >= 0) { if (id >= 0) {
if(id < tavern.msgs.length) { if (id < tavern.msgs.length) {
if(tavern.msgs[id].id == id + 1) { if (tavern.msgs[id].id == id + 1) {
tavern.msgs[id] = m; tavern.msgs[id] = m;
} }
else { else {
for(let i = 0; i < tavern.msgs.length; i += 1) { for (let i = 0; i < tavern.msgs.length; i += 1) {
if(tavern.msgs[i].id > id) { if (tavern.msgs[i].id > id) {
tavern.msgs.splice(i, 0, m); tavern.msgs.splice(i, 0, m);
break; break;
} }
@ -35,59 +36,67 @@ tavern.socket.onopen = () => tavern.connected = true;
tavern.socket.onmessage = (m) => { tavern.socket.onmessage = (m) => {
m = JSON.parse(m.data); m = JSON.parse(m.data);
console.log(m); console.log(m);
if(m.login) { if (m.login) {
tavern.socket.loggedIn = m.login.success; tavern.socket.loggedIn = m.login.success;
tavern.call(tavern.onlogin, tavern.socket.loggedIn); tavern.call(tavern.onlogin, tavern.socket.loggedIn);
} }
if(m.message) { if (m.message) {
tavern.add_msg_to_history(m.message); tavern.add_msg_to_history(m.message);
tavern.call(tavern.onmessage, m.message); tavern.call(tavern.onmessage, m.message);
} }
if(m.get_chat_history) { if (m.get_chat_history) {
m.get_chat_history.forEach(msg => { m.get_chat_history.forEach(msg => {
tavern.add_msg_to_history(msg); tavern.add_msg_to_history(msg);
tavern.call(tavern.onmessage, msg); tavern.call(tavern.onmessage, msg);
}); });
} }
if(m.spawn_token) { if (m.spawn_token) {
tavern.call(tavern.onspawntoken, m.spawn_token); tavern.call(tavern.onspawntoken, m.spawn_token);
} }
if(m.move_token) { if (m.move_token) {
tavern.call(tavern.onmovetoken, m.move_token); tavern.call(tavern.onmovetoken, m.move_token);
} }
if (m.show_scene) {
tavern.currentScene = m.show_scene.scene;
tavern.call(tavern.onshowscene, m.show_scene);
}
} }
tavern.login = (username, password) => { tavern.login = (username, password) => {
if(!tavern.connected || tavern.loggedIn) { return false; } if (!tavern.connected || tavern.loggedIn) { return false; }
tavern.socket.send(JSON.stringify({ login: { username, password }})); tavern.socket.send(JSON.stringify({ login: { username, password } }));
} }
tavern.simple_msg = (msg, token) => { tavern.simple_msg = (msg, token) => {
if(!tavern.connected || tavern.loggedIn) { return false; } if (!tavern.connected || tavern.loggedIn) { return false; }
tavern.socket.send(JSON.stringify({ message: { text: msg, character: token ?? "" } })); tavern.socket.send(JSON.stringify({ message: { text: msg, character: token ?? "" } }));
} }
tavern.edit_msg = (new_text, id) => { tavern.edit_msg = (new_text, id) => {
if(id <= tavern.msgs.length && id > 0) { if (id <= tavern.msgs.length && id > 0) {
let msg = tavern.msgs[id - 1]; let msg = tavern.msgs[id - 1];
msg.text = new_text; msg.text = new_text;
tavern.socket.send(JSON.stringify({ message: msg })); tavern.socket.send(JSON.stringify({ message: msg }));
} }
} }
tavern.get_chat_history = (from, amount) => { tavern.get_chat_history = (from, amount) => {
if(!tavern.connected || tavern.loggedIn) { return false; } if (!tavern.connected || tavern.loggedIn) { return false; }
tavern.socket.send(JSON.stringify({ get_chat_history: { from: from, amount: amount } })) tavern.socket.send(JSON.stringify({ get_chat_history: { from: from, amount: amount } }))
} }
tavern.get_last_msgs = (amount) => { tavern.get_last_msgs = (amount) => {
if(!tavern.connected || tavern.loggedIn) { return false; } if (!tavern.connected || tavern.loggedIn) { return false; }
tavern.socket.send(JSON.stringify({ get_last_messages: { amount: amount } })) tavern.socket.send(JSON.stringify({ get_last_messages: { amount: amount } }))
} }
tavern.get_tokens = () => { tavern.get_tokens = (mapId) => {
if(!tavern.connected || tavern.loggedIn) { return false; } if (!tavern.connected || tavern.loggedIn) { return false; }
tavern.socket.send(JSON.stringify('get_tokens')); tavern.socket.send(JSON.stringify({ get_tokens: { scene: mapId } }));
} }
tavern.move_token = (id, x, y) => { tavern.move_token = (id, x, y) => {
if(!tavern.connected || tavern.loggedIn) { return false; } if (!tavern.connected || tavern.loggedIn) { return false; }
tavern.socket.send(JSON.stringify({ move_token: { token_id: id, x: x, y: y } })); tavern.socket.send(JSON.stringify({ move_token: { token_id: id, x: x, y: y } }));
} }
tavern.action_result = (name, source, targets, results) => { tavern.action_result = (name, source, targets, results) => {
if(!tavern.connected || tavern.loggedIn) { return false; } if (!tavern.connected || tavern.loggedIn) { return false; }
tavern.socket.send(JSON.stringify({ action_result: { name: name, source: source ?? '', targets: targets ?? [], results: results } })); tavern.socket.send(JSON.stringify({ action_result: { name: name, source: source ?? '', targets: targets ?? [], results: results } }));
}
tavern.get_current_scene = () => {
if (!tavern.connected || tavern.loggedIn) { return; }
tavern.socket.send(JSON.stringify('get_current_scene'))
} }

18
src/api/game_actions.rs
View file

@ -1,7 +1,5 @@
//! General game actions //! General game actions
use serde::{Serialize, Deserialize}; use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct Ping { pub struct Ping {
@ -14,23 +12,23 @@ pub struct Ping {
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct ShowImage { pub struct ShowImage {
/// Which texture to show /// Which texture to show
pub texture: String pub texture: String,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Serialize, Deserialize, Clone)]
pub struct SpawnToken { pub struct SpawnToken {
pub token_id: usize, pub token_id: usize,
pub x: f32, pub x: f32,
pub y: f32, pub y: f32,
pub img: String pub img: String,
} }
impl std::fmt::Debug for SpawnToken { impl std::fmt::Debug for SpawnToken {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
// I dont want it to print the `img` field because it VERY long :) // I dont want it to print the `img` field because it is VERY long :)
f.debug_struct("SpawnToken") f.debug_struct("SpawnToken")
.field("token_id", &self.token_id) .field("token_id", &self.token_id)
.field("x", &self.x) .field("x", &self.x)
.field("y", &self.y) .field("y", &self.y)
.finish() .finish()
} }
} }

62
src/api/mod.rs
View file

@ -1,5 +1,5 @@
pub mod login;
pub mod game_actions; pub mod game_actions;
pub mod login;
pub mod map_actions; pub mod map_actions;
use game_actions::SpawnToken; use game_actions::SpawnToken;
@ -12,28 +12,60 @@ use crate::game::{character_sheet::EntryType, chat_message::ChatMessage, entry::
pub enum Request { pub enum Request {
#[default] #[default]
Error, Error,
// Connection requests // Connection requests
Login(login::LoginRequest), Login(login::LoginRequest),
Quit, Quit,
Kick(String), Kick(String),
Shutdown, Shutdown,
// Character stuff // Character stuff
CreateCharacter, CreateCharacter,
CharacterDisplay { id: usize }, CharacterDisplay {
CharacterInputs { id: usize }, id: usize,
CharacterGetField { id: usize, field: String }, },
CharacterSetField { id: usize, field: String, val: EntryType }, CharacterInputs {
CharacterAssign { id: usize, user: String }, id: usize,
},
CharacterGetField {
id: usize,
field: String,
},
CharacterSetField {
id: usize,
field: String,
val: EntryType,
},
CharacterAssign {
id: usize,
user: String,
},
// Chat requests // Chat requests
Message(ChatMessage), Message(ChatMessage),
GetChatHistory { amount: usize, from: usize }, GetChatHistory {
GetLastMessages { amount: usize, }, amount: usize,
from: usize,
},
GetLastMessages {
amount: usize,
},
// Map requests // Map requests
GetTokens { scene: usize }, GetCurrentScene,
SpawnToken { map_id: usize, character: String, x: f32, y: f32, img_path: String }, GetTokens {
MoveToken { token_id: usize, x: f32, y: f32 }, scene: usize,
},
SpawnToken {
map_id: usize,
character: String,
x: f32,
y: f32,
img_path: String,
},
MoveToken {
token_id: usize,
x: f32,
y: f32,
},
// Actions requests // Actions requests
ActionResult(ActionResult) ActionResult(ActionResult),
} }
#[derive(Serialize, Clone, Debug)] #[derive(Serialize, Clone, Debug)]
@ -43,12 +75,12 @@ pub enum Response {
Login(login::LoginResult), Login(login::LoginResult),
Message(ChatMessage), Message(ChatMessage),
GetChatHistory(Vec<ChatMessage>), GetChatHistory(Vec<ChatMessage>),
ShowScene { scene: usize, tokens: Vec<SpawnToken> },
MoveToken { token_id: usize, x: f32, y: f32 }, MoveToken { token_id: usize, x: f32, y: f32 },
SpawnToken(SpawnToken), SpawnToken(SpawnToken),
CharacterCreated(usize), CharacterCreated(usize),
Quit { id: String }, Quit { id: String },
Shutdown, Shutdown,
} }
#[derive(Serialize, Debug, Clone)] #[derive(Serialize, Debug, Clone)]
@ -56,4 +88,4 @@ pub enum Response {
pub enum RequestError { pub enum RequestError {
InvalidRequest, InvalidRequest,
AlreadyLoggedIn, AlreadyLoggedIn,
} }

29
src/lib.rs
View file

@ -42,7 +42,7 @@ impl GameServer {
ActionDefinition::new("weapon/attack".to_string()) ActionDefinition::new("weapon/attack".to_string())
.display_name(Some("Attack +7".to_string())) .display_name(Some("Attack +7".to_string()))
.with_roll(DiceRoll::new("Pierce".to_string(), 12, 1).constant(1)) .with_roll(DiceRoll::new("Pierce".to_string(), 12, 1).constant(1))
.with_roll(DiceRoll::new("Fire".to_string(), 4, 2)), .with_roll(DiceRoll::new("Fire".to_string(), 4, 2).enabled(false)),
) )
.with_action(ActionDefinition::new("Attack +3".to_string()).with_roll(DiceRoll::new( .with_action(ActionDefinition::new("Attack +3".to_string()).with_roll(DiceRoll::new(
"Base".to_string(), "Base".to_string(),
@ -158,6 +158,33 @@ impl GameServer {
} }
} }
} }
api::Request::GetCurrentScene => {
let scene = self.game.current_scene();
let mut scene_tokens = self
.game
.available_tokens(scene)
.iter()
.map(|id| self.game.token_info(0, *id).map(|info| (id, info)))
.flatten()
.map(|(id, info)| SpawnToken {
token_id: *id,
x: info.x,
y: info.y,
img: info.img_source.clone(),
})
.collect::<Vec<_>>();
for spawn in scene_tokens.iter_mut() {
let bits = std::fs::read(&spawn.img).expect("FAILED READING TOKEN IMAGE");
spawn.img = base64::Engine::encode(&base64::prelude::BASE64_STANDARD, &bits);
}
_ = broadcast.send((
Some(id.clone()),
api::Response::ShowScene {
scene: scene,
tokens: scene_tokens,
},
));
}
api::Request::SpawnToken { api::Request::SpawnToken {
map_id, map_id,
character, character,

4
src/main.rs
View file

@ -111,9 +111,9 @@ async fn handle_socket(
b = brecv.recv() => { b = brecv.recv() => {
println!("{} trying to log in: {:?}", &temp_id, &b); println!("{} trying to log in: {:?}", &temp_id, &b);
if let Ok((to_id, msg)) = b { if let Ok((to_id, msg)) = b {
if let Response::Login(open_tavern::api::login::LoginResult { success, username }) = msg.clone() { if let Response::Login(open_tavern::api::login::LoginResult { success, username }) = &msg {
let to_id = to_id.map(|ti| ti == temp_id).unwrap_or(false); let to_id = to_id.map(|ti| ti == temp_id).unwrap_or(false);
if to_id && success && id.as_ref().map(|id| id == &username).unwrap_or(false) { if to_id && *success && id.as_ref().map(|id| id == username).unwrap_or(false) {
_ = socket.send(Message::Text(serde_json::to_string(&msg).unwrap_or_default().into())).await; _ = socket.send(Message::Text(serde_json::to_string(&msg).unwrap_or_default().into())).await;
break; break;
} }