From 884e634d5f8b9410498d23d606804b0d6572f7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Mon, 11 Sep 2017 00:40:59 +0200 Subject: [PATCH] Updated shield transfer (now a ranged effect) --- src/core/equipments/ShieldTransfer.spec.ts | 8 ++++---- src/core/equipments/ShieldTransfer.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/equipments/ShieldTransfer.spec.ts b/src/core/equipments/ShieldTransfer.spec.ts index 65169dc..0790865 100644 --- a/src/core/equipments/ShieldTransfer.spec.ts +++ b/src/core/equipments/ShieldTransfer.spec.ts @@ -6,22 +6,22 @@ module TS.SpaceTac.Equipments { let equipment = template.generate(1); expect(equipment.requirements).toEqual({ "skill_gravity": 1 }); expect(equipment.cooldown).toEqual(new Cooldown(3, 3)); - expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 150, 0, [new ValueTransferEffect("shield", -20)])); + expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 0, 250, [new ValueTransferEffect("shield", -40)])); equipment = template.generate(2); expect(equipment.requirements).toEqual({ "skill_gravity": 2 }); expect(equipment.cooldown).toEqual(new Cooldown(3, 3)); - expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 160, 0, [new ValueTransferEffect("shield", -22)])); + expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 0, 270, [new ValueTransferEffect("shield", -44)])); equipment = template.generate(3); expect(equipment.requirements).toEqual({ "skill_gravity": 3 }); expect(equipment.cooldown).toEqual(new Cooldown(3, 3)); - expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 170, 0, [new ValueTransferEffect("shield", -24)])); + expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 0, 290, [new ValueTransferEffect("shield", -48)])); equipment = template.generate(10); expect(equipment.requirements).toEqual({ "skill_gravity": 10 }); expect(equipment.cooldown).toEqual(new Cooldown(3, 3)); - expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 240, 0, [new ValueTransferEffect("shield", -38)])); + expect(equipment.action).toEqual(new FireWeaponAction(equipment, 3, 0, 430, [new ValueTransferEffect("shield", -76)])); }) }) } diff --git a/src/core/equipments/ShieldTransfer.ts b/src/core/equipments/ShieldTransfer.ts index fbb27a2..298e71e 100644 --- a/src/core/equipments/ShieldTransfer.ts +++ b/src/core/equipments/ShieldTransfer.ts @@ -7,8 +7,8 @@ module TS.SpaceTac.Equipments { this.setSkillsRequirements({ "skill_gravity": 1 }); this.setCooldown(irepeat(3), irepeat(3)); - this.addFireAction(irepeat(3), istep(150, irepeat(10)), 0, [ - new EffectTemplate(new ValueTransferEffect("shield"), { "amount": istep(-20, irepeat(-2)) }) + this.addFireAction(irepeat(3), 0, istep(250, irepeat(20)), [ + new EffectTemplate(new ValueTransferEffect("shield"), { "amount": istep(-40, irepeat(-4)) }) ]); } }