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-05 10:01:25 +10:00
commit e5314a2257
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/buttons.jsx
View File

@ -8,7 +8,7 @@ module.exports = {
Slay: () => 'red-green-border', Slay: () => 'red-green-border',
Siphon: () => 'blue-green-border', Siphon: () => 'blue-green-border',
// Stun // Stun
Link: () => 'blue-greenborder', Link: () => 'blue-green-border',
Bash: () => 'red-border', Bash: () => 'red-border',
Sleep: () => 'green-border', Sleep: () => 'green-border',
Ruin: () => 'blue-border', Ruin: () => 'blue-border',

1
client/src/components/vbox.component.jsx
View File

@ -29,6 +29,7 @@ const addState = connect(
} }
function sendVboxAccept(group, index) { function sendVboxAccept(group, index) {
document.activeElement.blur();
return ws.sendVboxAccept(instance.id, group, index); return ws.sendVboxAccept(instance.id, group, index);
} }

8
server/src/account.rs
View File

@ -67,13 +67,13 @@ pub fn select(db: &Db, id: Uuid) -> Result<Account, Error> {
pub fn chat_wheel(_db: &Db, _id: Uuid) -> Result<Vec<String>, Error> { pub fn chat_wheel(_db: &Db, _id: Uuid) -> Result<Vec<String>, Error> {
return Ok(vec![ return Ok(vec![
"gl".to_string(),
"hf".to_string(),
"gg".to_string(), "gg".to_string(),
"thx".to_string(), "glhf".to_string(),
"nice".to_string(),
"hmm".to_string(), "hmm".to_string(),
"ok".to_string(), "ok".to_string(),
"rekt".to_string(),
"thx".to_string(),
"nice".to_string(),
"...".to_string(), "...".to_string(),
]) ])
} }

17
server/src/img.rs
View File

@ -274,6 +274,10 @@ pub fn smile(id: Uuid) -> Result<Uuid, Error> {
("M0,0 L50,25 M50,0 L0,25", 1), // x ("M0,0 L50,25 M50,0 L0,25", 1), // x
("M0,0 L50,12.5 L0,25", 1), // > ("M0,0 L50,12.5 L0,25", 1), // >
("M50,0 L0,12.5 L50,25", 1), // < ("M50,0 L0,12.5 L50,25", 1), // <
("M0,0 L0,25 L50,25", 1), // L
("M50,0 L50,25 L0,25", 1), // J
("M0,0 L50,0 M50,6.25 L50,12.5 M50,18.75 L50,25", 1), // ;
("M12.5,0 L37.5,0 L37.5,25 L12.5,25 L12.5,0", 1), // o
]; ];
let eye_left_dist = WeightedIndex::new(eyes_left.iter().map(|v| v.1))?; let eye_left_dist = WeightedIndex::new(eyes_left.iter().map(|v| v.1))?;
@ -283,10 +287,14 @@ pub fn smile(id: Uuid) -> Result<Uuid, Error> {
("M150,0 L175,25 L200,0", 1), // v ("M150,0 L175,25 L200,0", 1), // v
("M150,25 L175,0 L200,25", 1), // ^ ("M150,25 L175,0 L200,25", 1), // ^
("M150,0 L200,0", 1), // - ("M150,0 L200,0", 1), // -
("M150,25 L200,25", 1), // - ("M150,25 L200,25", 1), // _
("M150,0 L200,25 M200,0 L150,25", 1), // x ("M150,0 L200,25 M200,0 L150,25", 1), // x
("M150,0 L200,12.5 L150,25", 1), // > ("M150,0 L200,12.5 L150,25", 1), // >
("M200,0 L150,12.5 L200,25", 1), // < ("M200,0 L150,12.5 L200,25", 1), // <
("M150,0 L150,25 L200,25", 1), // L
("M200,0 L200,25 L150,25", 1), // J
("M150,0 L200,0 M150,6.25 L150,12.5 M150,18.75 L150,25", 1), // ;
("M162.5,0 L187.5,0 L187.5,25 L162.5,25 L162.5,0", 1), // o
]; ];
let eye_right_dist= WeightedIndex::new(eyes_right.iter().map(|v| v.1))?; let eye_right_dist= WeightedIndex::new(eyes_right.iter().map(|v| v.1))?;
@ -297,8 +305,15 @@ pub fn smile(id: Uuid) -> Result<Uuid, Error> {
("M50,75 L150,75 L150,100 L50,100 L50,75", 1), // box ("M50,75 L150,75 L150,100 L50,100 L50,75", 1), // box
("M50,75 L75,100 L100,75 L125,100 L150,75", 1), // w ("M50,75 L75,100 L100,75 L125,100 L150,75", 1), // w
("M50,75 L75,75 L75,87.5 M75,75 L125,75 L125,87.5 M125,75 L150,75", 1), // vamp ("M50,75 L75,75 L75,87.5 M75,75 L125,75 L125,87.5 M125,75 L150,75", 1), // vamp
("M50,75 L150,75 M50,75 L50,87.5 M75,75 L75,87.5 M100,75 L100,87.5 M125,75 L125,87.5 M150,75 L150,87.5", 1), // mm
("M75,75 L125,75 L125,100 L75,100 L75,75", 1), // o ("M75,75 L125,75 L125,100 L75,100 L75,75", 1), // o
("M50,75 L150,100 M150,75 L50,100", 1), // x ("M50,75 L150,100 M150,75 L50,100", 1), // x
("M50,75 L150,75 L150,100 L125,100 L125,75", 1), // p
("M50,75 L150,75 M50,75 L50,100 L75,100 L75,75", 1), // d
// ("M50,75 L50,100 L150,100 L150,75", 1), // u
("M50,100 L50,75 L150,75 L150,100", 1), // n
("M50,75 L50,100 L150,75 L150,100", 1), // Z
("M50,87.5 L100,75 L150,87.5 L100,100 L50,87.5", 1), // Z
]; ];
let mouth_dist = WeightedIndex::new(mouths.iter().map(|v| v.1))?; let mouth_dist = WeightedIndex::new(mouths.iter().map(|v| v.1))?;