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

random fixes

Browse Source
This commit is contained in:
ntr 2019-01-07 19:55:46 +11:00
parent 82c89fb6bc
commit 23aafe1e80
7 changed files with 79 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/index.html
View File

@ -4,7 +4,6 @@
<title>cryps.gg - mnml pvp atbs</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<script defer src="https://use.fontawesome.com/releases/v5.1.0/js/all.js"></script>
<link rel="stylesheet" href="./node_modules/izitoast/dist/css/iziToast.min.css"></script>
</head>
<body>

151
client/src/scenes/constants.js
View File

@ -147,103 +147,58 @@ module.exports = {
},
SKILLS: {
LEARNABLE: [
{
name: 'Attack',
description: 'a fast physical attack with phys dmg',
},
{
name: 'Block',
description: 'decreases incoming physical damage for 1T',
},
{
name: 'Parry',
description: 'prevents all physical damage for 1T',
},
{
name: 'Evade',
description: 'gives a chance to evade physical damage for 1T',
},
{
name: 'Snare',
description: 'prevents physical skills from being used for 2T',
},
{
name: 'Stun',
description: 'physical skill that prevents target cryp from using any skills',
},
{
name: 'Evasion',
description: 'grants Evade effect to a cryp',
},
{
name: 'Heal',
description: 'heal a cryp with spell dmg',
},
{
name: 'Triage',
description: 'grants a spell dmg based healing over time buff',
},
{
name: 'Throw',
description: 'stuns and makes the target take increased physical damage',
},
{
name: 'Blast',
description: 'blast the target with magic damage',
},
{
name: 'Amplify',
description: 'increase the magic damage dealt by a cryp',
},
{
name: 'Decay',
description: 'afflict a cryp with a spell damage based damage over time debuff',
},
{
name: 'Drain',
description: 'drain hp from target cryp with a spell damage based debuff',
},
{
name: 'Curse',
description: 'target cryp takes increased magic damage',
},
{
name: 'Empower',
description: 'increase the physical damage dealt by a cryp',
},
{
name: 'Shield',
description: 'grants immunity to magical skills to target cryp',
},
{
name: 'Silence',
description: 'prevent target cryp from casting magical skills',
},
{
name: 'Purify',
description: 'remove magical debuffs from target cryp',
},
{
name: 'Purge',
description: 'remove magical buffs from target cryp',
},
{
name: 'Banish',
description: 'target cryp is prevented from casting any skills and taking any damage',
},
{
name: 'Hex',
description: 'magical based skill that prevents target cryp from using any skills',
},
{
name: 'Haste',
description: 'magical skill that increases speed of target cryp',
},
{
name: 'Slow',
description: 'magical skill that reduces speed of target cryp',
},
],
LEARNABLE:
[ { name: 'Amplify',
description: 'increase the magic damage dealt by a cryp' },
{ name: 'Attack',
description: 'a fast physical attack with phys dmg' },
{ name: 'Banish',
description:
'target cryp is prevented from casting any skills and taking any damage' },
{ name: 'Blast',
description: 'blast the target with magic damage' },
{ name: 'Block',
description: 'decreases incoming physical damage for 1T' },
{ name: 'Curse',
description: 'target cryp takes increased magic damage' },
{ name: 'Decay',
description:
'afflict a cryp with a spell damage based damage over time debuff' },
{ name: 'Drain',
description: 'drain hp from target cryp with a spell damage based debuff' },
{ name: 'Empower',
description: 'increase the physical damage dealt by a cryp' },
{ name: 'Evade',
description: 'gives a chance to evade physical damage for 1T' },
{ name: 'Evasion',
description: 'grants Evade effect to a cryp' },
{ name: 'Haste',
description: 'magical skill that increases speed of target cryp' },
{ name: 'Heal', description: 'heal a cryp with spell dmg' },
{ name: 'Hex',
description:
'magical based skill that prevents target cryp from using any skills' },
{ name: 'Parry',
description: 'prevents all physical damage for 1T' },
{ name: 'Purge',
description: 'remove magical buffs from target cryp' },
{ name: 'Purify',
description: 'remove magical debuffs from target cryp' },
{ name: 'Shield',
description: 'grants immunity to magical skills to target cryp' },
{ name: 'Silence',
description: 'prevent target cryp from casting magical skills' },
{ name: 'Slow',
description: 'magical skill that reduces speed of target cryp' },
{ name: 'Snare',
description: 'prevents physical skills from being used for 2T' },
{ name: 'Stun',
description:
'physical skill that prevents target cryp from using any skills' },
{ name: 'Throw',
description: 'stuns and makes the target take increased physical damage' },
{ name: 'Triage',
description: 'grants a spell dmg based healing over time buff' }
]
},
};

24
client/src/scenes/menu.cryps.list.js
View File

@ -119,20 +119,20 @@ class MenuCrypList extends Phaser.Scene {
this.game.events.emit('CRYP_SPAWN');
});
this.add
.text(spawn.getCenter().x, spawn.getCenter().y, 'Spawn Cryp', TEXT.HEADER)
.text(spawn.getCenter().x, spawn.getCenter().y, '+', TEXT.HEADER)
.setOrigin(0.5, 0.5);
// Dialog to view all cryps
const crypList = this.add
.rectangle(ROW_WIDTH * 0.55, ROW_HEIGHT * 3.5, ROW_WIDTH * 0.4, ROW_HEIGHT, 0xff9215)
.setInteractive()
.setOrigin(0)
.on('pointerdown', () => {
// this.game.events.emit('CRYP_LIST');
// Placeholder will give a full list of all cryps in the center
});
this.add
.text(crypList.getCenter().x, crypList.getCenter().y, 'Cryp List (soon)', TEXT.NORMAL)
.setOrigin(0.5, 0.5);
// const crypList = this.add
// .rectangle(ROW_WIDTH * 0.55, ROW_HEIGHT * 3.5, ROW_WIDTH * 0.4, ROW_HEIGHT, 0xff9215)
// .setInteractive()
// .setOrigin(0)
// .on('pointerdown', () => {
// // this.game.events.emit('CRYP_LIST');
// // Placeholder will give a full list of all cryps in the center
// });
// this.add
// .text(crypList.getCenter().x, crypList.getCenter().y, 'Cryp List (soon)', TEXT.NORMAL)
// .setOrigin(0.5, 0.5);
}
cleanUp() {

2
client/src/scenes/statsheet.js
View File

@ -63,7 +63,7 @@ class StatSheet extends Phaser.Scene {
this.stats.add(this.add
.text(STAT_X, STAT_Y, `${stat.stat}: ${stat.base}`, TEXT.NORMAL));
};
const CRYP_STATS = [cryp.stamina, cryp.phys_dmg, cryp.spell_dmg];
const CRYP_STATS = [cryp.stamina, cryp.phys_dmg, cryp.spell_dmg, cryp.speed];
CRYP_STATS.forEach(crypStat);
}

2
server/src/cryp.rs
View File

@ -115,7 +115,7 @@ impl Cryp {
account: id,
phys_dmg: CrypStat { base: 0, stat: Stat::PhysicalDamage },
spell_dmg: CrypStat { base: 0, stat: Stat::SpellDamage },
speed: CrypStat { base: 0, stat: Stat::SpellDamage },
speed: CrypStat { base: 0, stat: Stat::Speed },
stamina: CrypStat { base: 0, stat: Stat::Stamina },
hp: CrypStat { base: 0, stat: Stat::Hp },
lvl: 0,

2
server/src/item.rs
View File

@ -44,7 +44,7 @@ impl Item {
ItemAction::RerollStamina => reroll(self, tx, target, Stat::Stamina),
ItemAction::RerollPhysDamage => reroll(self, tx, target, Stat::PhysicalDamage),
ItemAction::RerollSpellDamage => reroll(self, tx, target, Stat::SpellDamage),
ItemAction::RerollSpeed => reroll(self, tx, target, Stat::SpellDamage),
ItemAction::RerollSpeed => reroll(self, tx, target, Stat::Speed),
}
}
}

11
server/src/skill.rs
View File

@ -188,6 +188,10 @@ impl Effect {
Effect::Amplify => vec![Stat::SpellDamage],
Effect::Curse => vec![Stat::SpellDamageTaken],
Effect::Haste => vec![Stat::Speed],
Effect::Slow => vec![Stat::Speed],
_ => vec![],
}
}
@ -203,6 +207,10 @@ impl Effect {
Effect::Amplify => value << 1,
Effect::Curse => value << 1,
Effect::Haste => value << 1,
Effect::Slow => value >> 1,
_ => {
println!("{:?} does not have a mod effect", self);
return value;
@ -275,6 +283,9 @@ impl Effect {
Effect::Amplify => 2,
Effect::Silence => 2,
Effect::Haste => 2,
Effect::Slow => 2,
_ => {
println!("{:?} does not have a duration", self);
return 1;