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

Merge branch 'tos' into release/1.5.4

Browse Source
This commit is contained in:
ntr 2019-10-10 15:33:24 +11:00
commit d8adff0203
7 changed files with 1127 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -7,6 +7,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
### Changed ### Changed
## [0.1.5] - YYYY-MM-DD
### Changed
`Recharge` Skill multiplier reduced 85/130/200 -> 70/110/170
`Absorption` Skill duration reduced 5/7/9 -> 3/5/7
## [0.1.4 2019-09-18] ## [0.1.4 2019-09-18]
### Changed ### Changed

1
WORKLOG.md
View File

@ -14,6 +14,7 @@
## SOON (Before or After PAX) ## SOON (Before or After PAX)
* Invert recharge
* bot game grind * bot game grind
* ACP * ACP
* essential * essential

2
bin/client.sh
View File

@ -13,6 +13,8 @@ rm -rf dist
npm i npm i
npm run build npm run build
cp tos.html dist/
# echo "Building acp version $VERSION" # echo "Building acp version $VERSION"
# cd $MNML_PATH/acp # cd $MNML_PATH/acp
# rm -rf dist # rm -rf dist

4
client/assets/styles/menu.less
View File

@ -137,6 +137,10 @@ section {
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
grid-template-rows: min-content 1fr; grid-template-rows: min-content 1fr;
button {
cursor: default;
}
.colour-info { .colour-info {
grid-area: vinfo; grid-area: vinfo;
display: flex; display: flex;

12
client/src/components/welcome.register.jsx
View File

@ -34,7 +34,7 @@ function Register(args) {
submitRegister, submitRegister,
} = args; } = args;
const { password, confirm, name } = this.state; const { password, confirm, name, terms } = this.state;
const registerSubmit = (event) => { const registerSubmit = (event) => {
event.preventDefault(); event.preventDefault();
@ -45,7 +45,7 @@ function Register(args) {
password === confirm; password === confirm;
const registerDisabled = () => { const registerDisabled = () => {
return !(registerConfirm() && password && name); return !(registerConfirm() && password && name && terms);
} }
return ( return (
@ -74,6 +74,14 @@ function Register(args) {
value={this.state.confirm} value={this.state.confirm}
onInput={linkState(this, 'confirm')} onInput={linkState(this, 'confirm')}
/> />
<div>
<input
type="checkbox"
onInput={linkState(this, 'terms')
}/>
&nbsp; Confirm agreement to terms of service &nbsp;
<button onClick={() => window.open('/tos.html')}>VIEW</button>
</div>
<button <button
class="login-btn" class="login-btn"
disabled={registerDisabled()} disabled={registerDisabled()}

1098
client/tos.html Normal file
View File

File diff suppressed because it is too large Load Diff

14
server/src/skill.rs
View File

@ -294,7 +294,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
match event { match event {
Event::Damage { amount, skill, mitigation: _, colour: c } => { Event::Damage { amount, skill, mitigation: _, colour: c } => {
if target.affected(Effect::Electric) { if target.affected(Effect::Electric) && !skill.is_tick() {
let ConstructEffect { effect: _, duration: _, meta, tick: _ } = target.effects.iter() let ConstructEffect { effect: _, duration: _, meta, tick: _ } = target.effects.iter()
.find(|e| e.effect == Effect::Electric).unwrap().clone(); .find(|e| e.effect == Effect::Electric).unwrap().clone();
match meta { match meta {
@ -786,9 +786,9 @@ impl Skill {
Skill::ReflectPlus => 70, Skill::ReflectPlus => 70,
Skill::ReflectPlusPlus => 100, Skill::ReflectPlusPlus => 100,
Skill::Recharge=> 85, //Recharge red and blue life (heal) Skill::Recharge=> 70, //Recharge red and blue life (heal)
Skill::RechargePlus => 130, Skill::RechargePlus => 110,
Skill::RechargePlusPlus => 200, Skill::RechargePlusPlus => 170,
Skill::Sustain => 120, // Recharge red life (heal) Skill::Sustain => 120, // Recharge red life (heal)
Skill::SustainPlus => 150, Skill::SustainPlus => 150,
@ -907,9 +907,9 @@ impl Skill {
Skill::AbsorbPlusPlus => vec![ConstructEffect {effect: Effect::Absorb, duration: 4, Skill::AbsorbPlusPlus => vec![ConstructEffect {effect: Effect::Absorb, duration: 4,
meta: Some(EffectMeta::Skill(Skill::AbsorptionPlusPlus)), tick: None}], meta: Some(EffectMeta::Skill(Skill::AbsorptionPlusPlus)), tick: None}],
Skill::Absorption => vec![ConstructEffect {effect: Effect::Absorption, duration: 5, meta: None, tick: None}], Skill::Absorption => vec![ConstructEffect {effect: Effect::Absorption, duration: 3, meta: None, tick: None}],
Skill::AbsorptionPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 7, meta: None, tick: None}], Skill::AbsorptionPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 5, meta: None, tick: None}],
Skill::AbsorptionPlusPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 9, meta: None, tick: None}], Skill::AbsorptionPlusPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 7, meta: None, tick: None}],
Skill::Hybrid => vec![ConstructEffect {effect: Effect::Hybrid, duration: 2, Skill::Hybrid => vec![ConstructEffect {effect: Effect::Hybrid, duration: 2,
meta: Some(EffectMeta::Multiplier(150)), tick: None }], meta: Some(EffectMeta::Multiplier(150)), tick: None }],