From cc01b4c9ce4be09159dc48327d490a441516d9ea Mon Sep 17 00:00:00 2001 From: cha0s Date: Tue, 21 May 2019 21:07:56 -0500 Subject: [PATCH] feat: none affinity --- common/combat/constants.js | 5 +++-- resource/blue-fire.entity.json | 2 +- resource/fire.entity.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/combat/constants.js b/common/combat/constants.js index 3d76fc7..a8fb691 100644 --- a/common/combat/constants.js +++ b/common/combat/constants.js @@ -1,2 +1,3 @@ -export const AFFINITY_PHYSICAL = 0; -export const AFFINITY_FIRE = 1; +export const AFFINITY_NONE = 0; +export const AFFINITY_PHYSICAL = 1; +export const AFFINITY_FIRE = 2; diff --git a/resource/blue-fire.entity.json b/resource/blue-fire.entity.json index b1c45f7..f707471 100644 --- a/resource/blue-fire.entity.json +++ b/resource/blue-fire.entity.json @@ -1 +1 @@ -{"traits":{"animated":{"params":{"animations":{"idle":{"jitter":0.1,"offset":[0,0],"uri":"/blue-fire.animation.json"}}}},"audible":{"params":{"sounds":{"fire":{"uri":"/blue-fire.sound.json"}}}},"collider":{"params":{"isSensor":true}},"damaging":{"params":{"damagingSound":"fire","damageSpecs":[{"affinity":1,"lock":0.45,"power":-15,"variance":0.25}]}},"darkened":{"params":{"isDarkened":false}},"existent":{"state":{"name":"Blue fire"}},"layered":{},"listed":{},"physical":{},"positioned":{},"roomed":{},"shaped":{"params":{"shape":{"type":"rectangle","position":[0,0],"size":[16,16]}}},"visible":{"params":{"filter":"bloom"}}}} \ No newline at end of file +{"traits":{"animated":{"params":{"animations":{"idle":{"jitter":0.1,"offset":[0,0],"uri":"/blue-fire.animation.json"}}}},"audible":{"params":{"sounds":{"fire":{"uri":"/blue-fire.sound.json"}}}},"collider":{"params":{"isSensor":true}},"damaging":{"params":{"damagingSound":"fire","damageSpecs":[{"affinity":2,"lock":0.45,"power":-15,"variance":0.25}]}},"darkened":{"params":{"isDarkened":false}},"existent":{"state":{"name":"Blue fire"}},"layered":{},"listed":{},"physical":{},"positioned":{},"roomed":{},"shaped":{"params":{"shape":{"type":"rectangle","position":[0,0],"size":[16,16]}}},"visible":{"params":{"filter":"bloom"}}}} \ No newline at end of file diff --git a/resource/fire.entity.json b/resource/fire.entity.json index 86a1e0b..8d64b38 100644 --- a/resource/fire.entity.json +++ b/resource/fire.entity.json @@ -1 +1 @@ -{"traits":{"animated":{"params":{"animations":{"idle":{"jitter":0.1,"offset":[0,0],"uri":"/fire.animation.json"}}}},"audible":{"params":{"sounds":{"fire":{"uri":"/fire.sound.json"}}}},"collider":{"params":{"isSensor":true}},"damaging":{"params":{"damagingSound":"fire","damageSpecs":[{"affinity":1,"lock":0.45,"power":15,"variance":0.25}]}},"darkened":{"params":{"isDarkened":false}},"existent":{"state":{"name":"Fire"}},"layered":{},"listed":{},"physical":{},"positioned":{},"roomed":{},"shaped":{"params":{"shape":{"type":"rectangle","position":[0,0],"size":[16,16]}}},"visible":{"params":{"filter":"bloom"}}}} \ No newline at end of file +{"traits":{"animated":{"params":{"animations":{"idle":{"jitter":0.1,"offset":[0,0],"uri":"/fire.animation.json"}}}},"audible":{"params":{"sounds":{"fire":{"uri":"/fire.sound.json"}}}},"collider":{"params":{"isSensor":true}},"damaging":{"params":{"damagingSound":"fire","damageSpecs":[{"affinity":2,"lock":0.45,"power":15,"variance":0.25}]}},"darkened":{"params":{"isDarkened":false}},"existent":{"state":{"name":"Fire"}},"layered":{},"listed":{},"physical":{},"positioned":{},"roomed":{},"shaped":{"params":{"shape":{"type":"rectangle","position":[0,0],"size":[16,16]}}},"visible":{"params":{"filter":"bloom"}}}} \ No newline at end of file