@reldens/skills 0.10.0-beta.22 → 0.10.0-beta.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,19 +26,19 @@ class ModelsManager
26
26
 
27
27
  async loadOwnerClassPath(ownerId)
28
28
  {
29
- return this.getEntity('ownersClassPath').loadOneByWithRelations('owner_id', ownerId, '[owner_full_class_path]');
29
+ return await this.getEntity('ownersClassPath').loadOneByWithRelations('owner_id', ownerId, '[owner_full_class_path]');
30
30
  }
31
31
 
32
32
  async updateLevel(levelsSet)
33
33
  {
34
- return this.getEntity('ownersClassClassPath')
34
+ return await this.getEntity('ownersClassPath')
35
35
  .updateBy('owner_id', levelsSet.getOwnerId(), {currentLevel: levelsSet.currentLevel})
36
36
  }
37
37
 
38
38
  async updateExperience(levelsSet)
39
39
  {
40
- return this.getEntity('ownersClassClassPath')
41
- .updateBy('owner_id', levelsSet.getOwnerId(), {currentExp: levelsSet.currentExp})
40
+ return await this.getEntity('ownersClassPath')
41
+ .updateBy('owner_id', levelsSet.getOwnerId(), {currentExp: levelsSet.currentExp});
42
42
  }
43
43
 
44
44
  // @TODO - BETA - Create a skills instances generator class to replace this function.
@@ -24,7 +24,12 @@ class StorageObserver
24
24
  }
25
25
  this.dataServer = DataServerValidator.getValidDataServer(props, this);
26
26
  modelsManagerConfig['dataServer'] = this.dataServer;
27
- this.modelsManager = sc.getDef(props, 'modelsManager', new ModelsManager(modelsManagerConfig));
27
+ this.modelsManager = sc.isTrue(props, 'modelsManager') // @NOTE: can't use getDef because it could be false.
28
+ ? props.modelsManager
29
+ : new ModelsManager(modelsManagerConfig);
30
+ if(!this.modelsManager){
31
+ Logger.error('ModelsManager undefined for Skills Storage Observer.');
32
+ }
28
33
  }
29
34
 
30
35
  registerListeners()
package/lib/server.js CHANGED
@@ -8,7 +8,7 @@ const ClassPath = require('./class-path');
8
8
  const Sender = require('./server/sender');
9
9
  const { StorageObserver } = require('./server/storage-observer');
10
10
  const { DataServerValidator } = require('./server/data-server-validator');
11
- const { ErrorManager, sc } = require('@reldens/utils');
11
+ const { ErrorManager, sc, Logger} = require('@reldens/utils');
12
12
 
13
13
  class SkillsServer
14
14
  {
@@ -25,17 +25,20 @@ class SkillsServer
25
25
  this.classPath.setOwner(props);
26
26
  // check if the storage was activated:
27
27
  if(sc.isTrue(props, 'persistence')){
28
- let modelsManager = sc.getDef(props, 'modelsManager', false);
29
28
  // check if the owner has the required persisData methods in the case the storage is active:
30
29
  if(!sc.hasOwn(props.owner, 'persistData') || typeof props.owner.persistData !== 'function'){
31
30
  ErrorManager.error('Required method "persistData" not found in SkillsServer props.owner.');
32
31
  }
33
32
  this.dataServer = DataServerValidator.getValidDataServer(props, this);
34
- this.storageObserver = new StorageObserver({
33
+ let storageObserverProps = {
35
34
  classPath: this.classPath,
36
- modelsManager,
37
35
  dataServer: this.dataServer
38
- });
36
+ };
37
+ let modelsManager = sc.getDef(props, 'modelsManager', false);
38
+ if(modelsManager){
39
+ storageObserverProps.modelsManager = modelsManager;
40
+ }
41
+ this.storageObserver = new StorageObserver(storageObserverProps);
39
42
  this.storageObserver.registerListeners();
40
43
  }
41
44
  if(sc.hasOwn(props, 'client')){
@@ -35,7 +35,9 @@ class PhysicalAttack extends Attack
35
35
 
36
36
  async executeOnHit(target)
37
37
  {
38
- return PhysicalSkillRunner.executeOnHit(target, this, SkillsEvents.SKILL_PHYSICAL_ATTACK_HIT);
38
+ return PhysicalSkillRunner.executeOnHit(target, this, SkillsEvents.SKILL_PHYSICAL_ATTACK_HIT, (target) => {
39
+ super.runSkillLogic(target);
40
+ });
39
41
  }
40
42
 
41
43
  }
@@ -6,9 +6,9 @@
6
6
  *
7
7
  */
8
8
 
9
+ const Effect = require('./effect');
9
10
  const { PhysicalPropertiesValidator } = require('./physical-properties-validator');
10
11
  const { PhysicalSkillRunner } = require('./physical-skill-runner');
11
- const Effect = require('./effect');
12
12
  const SkillsConst = require('../constants');
13
13
  const SkillsEvents = require('../skills-events');
14
14
  const { sc } = require('@reldens/utils');
@@ -35,7 +35,9 @@ class PhysicalEffect extends Effect
35
35
 
36
36
  async executeOnHit(target)
37
37
  {
38
- return PhysicalSkillRunner.executeOnHit(target, this, SkillsEvents.SKILL_PHYSICAL_EFFECT_HIT);
38
+ return PhysicalSkillRunner.executeOnHit(target, this, SkillsEvents.SKILL_PHYSICAL_EFFECT_HIT, (target) => {
39
+ super.runSkillLogic(target);
40
+ });
39
41
  }
40
42
 
41
43
  }
@@ -17,11 +17,14 @@ class PhysicalSkillRunner
17
17
  return false;
18
18
  }
19
19
 
20
- static async executeOnHit(target, skill, skillType)
20
+ static async executeOnHit(target, skill, skillType, runSkillLogicCallback)
21
21
  {
22
22
  await skill.fireEvent(skillType, skill, target);
23
23
  if(!skill.validateTargetOnHit || target === skill.target){
24
- return await super.runSkillLogic(target);
24
+ if('function' !== typeof runSkillLogicCallback){
25
+ return false;
26
+ }
27
+ return await runSkillLogicCallback(target);
25
28
  }
26
29
  return false;
27
30
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@reldens/skills",
3
3
  "scope": "@reldens",
4
- "version": "0.10.0-beta.22",
4
+ "version": "0.10.0-beta.26",
5
5
  "description": "Reldens - Skills",
6
6
  "author": "Damian A. Pastorini",
7
7
  "license": "MIT",
@@ -41,7 +41,7 @@
41
41
  },
42
42
  "dependencies": {
43
43
  "@reldens/modifiers": "^0.5.0",
44
- "@reldens/storage": "^0.10.0-beta.22",
45
- "@reldens/utils": "^0.5.0"
44
+ "@reldens/storage": "^0.10.0-beta.27",
45
+ "@reldens/utils": "^0.10.0-beta.1"
46
46
  }
47
47
  }