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

add smile mtx

Browse Source
This commit is contained in:
ntr 2019-10-31 20:35:41 +11:00
parent 9d2da3249a
commit bfecea9a4e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/img.rs
View File

@ -258,7 +258,7 @@ fn _hieroglyph() -> String {
} }
pub fn smiley(id: Uuid) -> Result<Uuid, Error> { pub fn smile(id: Uuid) -> Result<Uuid, Error> {
let mut rng = thread_rng(); let mut rng = thread_rng();
let mut svg = Vec::new(); let mut svg = Vec::new();
@ -382,8 +382,8 @@ mod tests {
// } // }
#[test] #[test]
fn smiley_test() { fn smile_test() {
smiley(Uuid::new_v4()).unwrap(); smile(Uuid::new_v4()).unwrap();
} }
} }

9
server/src/mtx.rs
View File

@ -19,9 +19,10 @@ pub const FREE_MTX: [MtxVariant; 2] = [
MtxVariant::Shapes, MtxVariant::Shapes,
]; ];
pub const SHOP_LISTINGS: [Listing; 2] = [ pub const SHOP_LISTINGS: [Listing; 3] = [
Listing { variant: MtxVariant::Molecular, credits: 10 }, Listing { variant: MtxVariant::Molecular, credits: 10 },
Listing { variant: MtxVariant::Invader, credits: 10 }, Listing { variant: MtxVariant::Invader, credits: 10 },
Listing { variant: MtxVariant::Smile, credits: 10 },
]; ];
const NEW_IMAGE_COST: i64 = 1; const NEW_IMAGE_COST: i64 = 1;
@ -46,6 +47,7 @@ pub enum MtxVariant {
Molecular, Molecular,
Invader, Invader,
Shapes, Shapes,
Smile,
} }
impl MtxVariant { impl MtxVariant {
@ -63,6 +65,7 @@ impl TryFrom<String> for MtxVariant {
"Rename" => Ok(MtxVariant::Rename), "Rename" => Ok(MtxVariant::Rename),
"Molecular" => Ok(MtxVariant::Molecular), "Molecular" => Ok(MtxVariant::Molecular),
"Invader" => Ok(MtxVariant::Invader), "Invader" => Ok(MtxVariant::Invader),
"Smile" => Ok(MtxVariant::Smile),
"Shapes" => Ok(MtxVariant::Shapes), "Shapes" => Ok(MtxVariant::Shapes),
_ => Err(format_err!("mtx variant not found variant={:?}", v)), _ => Err(format_err!("mtx variant not found variant={:?}", v)),
} }
@ -159,7 +162,8 @@ pub fn apply(tx: &mut Transaction, account: &Account, variant: MtxVariant, const
match mtx.variant { match mtx.variant {
MtxVariant::Invader => img::invader_write(construct.img)?, MtxVariant::Invader => img::invader_write(construct.img)?,
MtxVariant::Molecular => img::molecular_write(construct.img)?, MtxVariant::Molecular => img::molecular_write(construct.img)?,
MtxVariant::Shapes => img::smiley(construct.img)?, MtxVariant::Shapes => img::shapes_write(construct.img)?,
MtxVariant::Smile => img::smile(construct.img)?,
_ => construct.img, _ => construct.img,
}; };
@ -181,6 +185,7 @@ pub fn account_apply(tx: &mut Transaction, account: &Account, variant: MtxVarian
MtxVariant::Invader => img::invader_write(account.img)?, MtxVariant::Invader => img::invader_write(account.img)?,
MtxVariant::Molecular => img::molecular_write(account.img)?, MtxVariant::Molecular => img::molecular_write(account.img)?,
MtxVariant::Shapes => img::shapes_write(account.img)?, MtxVariant::Shapes => img::shapes_write(account.img)?,
MtxVariant::Smile => img::smile(account.img)?,
_ => account.img, _ => account.img,
}; };