crichardson/enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Achievement & Event improvements

Browse Source 
* User stat set vs user stat increment system events
* Proper addMultipleEventListener() and removeMultipleEventListener() Events APIs
* userStatSet vs userStatInc user stat achievement types. userStatInc for example can be used for door minutes used
This commit is contained in:
Bryan Ashby
2019-01-06 21:56:12 -07:00
parent 925ca134c6
commit 34c9178099
6 changed files with 107 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/achievement.js
View File

@@ -45,7 +45,11 @@ class Achievement {
static factory(data) {
let achievement;
switch(data.type) {
case Achievement.Types.UserStat : achievement = new UserStatAchievement(data); break;
case Achievement.Types.UserStatSet :
case Achievement.Types.UserStatInc :
achievement = new UserStatAchievement(data);
break;
default : return;
}
@@ -56,13 +60,15 @@ class Achievement {
static get Types() {
return {
UserStat : 'userStat',
UserStatSet : 'userStatSet',
UserStatInc : 'userStatInc',
};
}
isValid() {
switch(this.data.type) {
case Achievement.Types.UserStat :
case Achievement.Types.UserStatSet :
case Achievement.Types.UserStatInc :
if(!_.isString(this.data.statName)) {
return false;
}
@@ -129,12 +135,12 @@ class Achievements {
const configLoaded = (achievementConfig) => {
if(true !== achievementConfig.enabled) {
Log.info('Achievements are not enabled');
this.stopMonitoringUserStatUpdateEvents();
this.stopMonitoringUserStatEvents();
delete this.achievementConfig;
} else {
Log.info('Achievements are enabled');
this.achievementConfig = achievementConfig;
this.monitorUserStatUpdateEvents();
this.monitorUserStatEvents();
}
};
@@ -240,18 +246,22 @@ class Achievements {
);
}
monitorUserStatUpdateEvents() {
if(this.userStatEventListener) {
monitorUserStatEvents() {
if(this.userStatEventListeners) {
return; // already listening
}
this.userStatEventListener = this.events.on(Events.getSystemEvents().UserStatUpdate, userStatEvent => {
const listenEvents = [
Events.getSystemEvents().UserStatSet,
Events.getSystemEvents().UserStatIncrement
];
this.userStatEventListeners = this.events.addMultipleEventListener(listenEvents, userStatEvent => {
if([ UserProps.AchievementTotalCount, UserProps.AchievementTotalPoints ].includes(userStatEvent.statName)) {
return;
}
const statValue = parseInt(userStatEvent.statValue, 10);
if(isNaN(statValue)) {
if(!_.isNumber(userStatEvent.statValue) && !_.isNumber(userStatEvent.statIncrementBy)) {
return;
}
@@ -262,7 +272,7 @@ class Achievements {
if(false === achievement.enabled) {
return false;
}
return Achievement.Types.UserStat === achievement.type &&
return [ Achievement.Types.UserStatSet, Achievement.Types.UserStatInc ].includes(achievement.type) &&
achievement.statName === userStatEvent.statName;
}
);
@@ -276,6 +286,14 @@ class Achievements {
return;
}
const statValue = parseInt(
Achievement.Types.UserStatSet === achievement.data.type ? userStatEvent.statValue : userStatEvent.statIncrementBy,
10
);
if(isNaN(statValue)) {
return;
}
const [ details, matchField, matchValue ] = achievement.getMatchDetails(statValue);
if(!details || _.isUndefined(matchField) || _.isUndefined(matchValue)) {
return;
@@ -345,10 +363,10 @@ class Achievements {
});
}
stopMonitoringUserStatUpdateEvents() {
if(this.userStatEventListener) {
this.events.removeListener(Events.getSystemEvents().UserStatUpdate, this.userStatEventListener);
delete this.userStatEventListener;
stopMonitoringUserStatEvents() {
if(this.userStatEventListeners) {
this.events.removeMultipleEventListener(this.userStatEventListeners);
delete this.userStatEventListeners;
}
}