ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source
This commit is contained in:
Mashy 2019-11-12 16:42:47 +10:00
commit 9bcea878ec
7 changed files with 79 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/actions.jsx
View File

@ -41,6 +41,7 @@ export const setReclaiming = value => ({ type: 'SET_RECLAIMING', value });
export const setShowLog = value => ({ type: 'SET_SHOW_LOG', value });
export const setShop = value => ({ type: 'SET_SHOP', value });
export const setSubscription = value => ({ type: 'SET_SUBSCRIPTION', value });
export const setPvp = value => ({ type: 'SET_PVP', value });
export const setTeam = value => ({ type: 'SET_TEAM', value: Array.from(value) });
export const setTeamPage = value => ({ type: 'SET_TEAM_PAGE', value });

43
client/src/components/play.jsx
View File

@ -14,6 +14,7 @@ const addState = connect(
account,
instances,
invite,
pvp,
} = state;
function sendInstanceState(id) {
@ -32,15 +33,21 @@ const addState = connect(
ws.sendInstanceInvite();
}
function sendInstanceLeave() {
ws.sendInstanceLeave();
}
return {
account,
instances,
invite,
pvp,
sendInstanceState,
sendInstanceQueue,
sendInstancePractice,
sendInstanceInvite,
sendInstanceLeave,
};
},
@ -67,11 +74,13 @@ function Play(args) {
account,
instances,
invite,
pvp,
sendInstanceState,
sendInstanceQueue,
sendInstancePractice,
sendInstanceInvite,
sendInstanceLeave,
setNav,
} = args;
@ -125,6 +134,31 @@ function Play(args) {
);
};
const pvpBtn = () => {
if (pvp) return (
<figure>
<button
class="ready"
onClick={() => sendInstanceLeave()}
>
Cancel
</button>
<figcaption>Finding Opponent</figcaption>
</figure>
);
return (
<figure>
<button
class="ready"
onClick={() => sendInstanceQueue()}>
PVP
</button>
<figcaption>Matchmaking</figcaption>
</figure>
);
}
const subscription = account.subscribed
? <button
class="yellow-btn"
@ -142,14 +176,7 @@ function Play(args) {
if (!instances.length) {
return (
<div class='list play'>
<figure>
<button
class="ready"
onClick={() => sendInstanceQueue()}>
PVP
</button>
<figcaption>Matchmaking</figcaption>
</figure>
{pvpBtn()}
{inviteBtn()}
<figure>
<button

6
client/src/events.jsx
View File

@ -30,6 +30,10 @@ function registerEvents(store) {
store.dispatch(actions.setPing(ping));
}
function setPvp(v) {
store.dispatch(actions.setPvp(v));
}
function setNav(v) {
store.dispatch(actions.setNav(v));
}
@ -210,6 +214,7 @@ function registerEvents(store) {
const { account, instance, ws, tutorial } = store.getState();
if (v) {
setInvite(null);
setPvp(false);
const player = v.players.find(p => p.id === account.id);
store.dispatch(actions.setPlayer(player));
@ -371,6 +376,7 @@ function registerEvents(store) {
setItemInfo,
setInvite,
setPing,
setPvp,
setShop,
setTeam,
setSubscription,

1
client/src/reducers.jsx
View File

@ -48,6 +48,7 @@ module.exports = {
player: createReducer(null, 'SET_PLAYER'),
reclaiming: createReducer(false, 'SET_RECLAIMING'),
shop: createReducer(false, 'SET_SHOP'),
pvp: createReducer(null, 'SET_PVP'),
subscription: createReducer(null, 'SET_SUBSCRIPTION'),

19
client/src/socket.jsx
View File

@ -151,6 +151,10 @@ function createSocket(events) {
send(['InstanceQueue', {}]);
}
function sendInstanceLeave() {
send(['InstanceLeave', {}]);
}
function sendInstanceInvite() {
send(['InstanceInvite', {}]);
}
@ -274,8 +278,16 @@ function createSocket(events) {
Pong: onPong,
Demo: onDemo,
QueueRequested: () => events.notify('PVP queue request received.'),
QueueJoined: () => events.notify('You have joined the PVP queue.'),
// QueueRequested: () => events.notify('PVP queue request received.'),
QueueRequested: () => true,
QueueJoined: () => {
events.notify('You have joined the PVP queue.');
events.setPvp(true);
},
QueueLeft: () => {
events.notify('You have left the PVP queue.');
events.setPvp(false);
},
QueueFound: () => events.notify('Your PVP game has started.'),
InviteRequested: () => events.notify('PVP invite request received.'),
Invite: code => events.setInvite(code),
@ -343,7 +355,7 @@ function createSocket(events) {
message: 'disconnected',
position: 'topRight',
});
return setTimeout(connect, 2000);
return setTimeout(connect, 5000);
}
function connect() {
@ -390,6 +402,7 @@ function createSocket(events) {
sendInstanceInvite,
sendInstanceJoin,
sendInstanceChat,
sendInstanceLeave,
sendVboxAccept,
sendVboxAcceptEquip,

14
server/src/events.rs
View File

@ -60,6 +60,7 @@ pub enum Event {
Invite(Id),
Join(Id, String),
Joined(Id),
Leave(Id),
Chat(Id, Uuid, String),
ChatClear(Id, Uuid),
@ -249,6 +250,7 @@ impl Events {
// or flag the requester as pvp ready
let requester = self.clients.get_mut(&id).unwrap();
requester.pvp = true;
requester.tx.send(RpcMessage::QueueJoined(()))?;
info!("joined game queue id={:?} account={:?}", requester.id, requester.account);
return Ok(());
},
@ -305,6 +307,18 @@ impl Events {
return Ok(());
},
Event::Leave(id) => {
// check whether request is valid
let c = self.clients.get_mut(&id)
.ok_or(format_err!("connection not found id={:?}", id))?;
c.pvp = false;
c.tx.send(RpcMessage::QueueLeft(()))?;
info!("left game queue id={:?} account={:?}", c.id, c.account);
return Ok(());
},
Event::Chat(id, instance, msg) => {
// set the chat state of this connection
{

7
server/src/rpc.rs
View File

@ -63,7 +63,7 @@ pub enum RpcMessage {
QueueRequested(()),
QueueJoined(()),
QueueCancelled(()),
QueueLeft(()),
QueueFound(()),
InviteRequested(()),
@ -105,6 +105,7 @@ pub enum RpcRequest {
InstanceInvite {},
InstanceJoin { code: String },
InstanceQueue {},
InstanceLeave {},
InstancePractice {},
InstanceAbandon { instance_id: Uuid },
InstanceReady { instance_id: Uuid },
@ -168,6 +169,10 @@ impl Connection {
self.events.send(Event::Join(self.id, code))?;
Ok(RpcMessage::Joining(()))
},
RpcRequest::InstanceLeave {} => {
self.events.send(Event::Leave(self.id))?;
Ok(RpcMessage::Processing(()))
},
RpcRequest::InstanceChat { instance_id, index } => {
if !account.subscribed {