From 32133af2ec02919633f4ea615f29354adec10273 Mon Sep 17 00:00:00 2001 From: Deconstruction Date: Sun, 7 Jan 2018 21:46:35 +0100 Subject: [PATCH 1/3] add the ability to retreive orderid and ability id from channelabilitypreset --- .../objediting/presets/ChannelAbilityPreset.wurst | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/wurst/objediting/presets/ChannelAbilityPreset.wurst b/wurst/objediting/presets/ChannelAbilityPreset.wurst index 5a5b7312..2c6c3d44 100644 --- a/wurst/objediting/presets/ChannelAbilityPreset.wurst +++ b/wurst/objediting/presets/ChannelAbilityPreset.wurst @@ -5,6 +5,8 @@ import public ObjectIds import public ObjectIdGenerator import OrderStringFactory import BitSet +import HashMap +import TypeCasting OrderStringFactory odf = new OrderStringFactory() @compiletime function initOdf() @@ -41,12 +43,21 @@ public function Targettype.toString() returns string public class ChannelAbilityPreset extends AbilityDefinitionIllidanChannel private bitset optionSet = bitset(0) - + private string orderString + private int id + + function getOrderString() returns string + return orderString + + function getId() returns int + return id + construct(int newId, int lvls, boolean removeChannelProperties) super(newId) + id = newId this.lvls = lvls setLevels(lvls) - let orderString = odf.getOrderString(true) + orderString = odf.getOrderString(true) presetBaseOrderID((int _lvl) -> orderString) if removeChannelProperties removeChannelProperties(true) From 03e16697a8d21e4c0eb1c179ee52cba5c47ec551 Mon Sep 17 00:00:00 2001 From: Deconstruction Date: Sun, 7 Jan 2018 21:47:36 +0100 Subject: [PATCH 2/3] remove useless imports --- wurst/objediting/presets/ChannelAbilityPreset.wurst | 2 -- 1 file changed, 2 deletions(-) diff --git a/wurst/objediting/presets/ChannelAbilityPreset.wurst b/wurst/objediting/presets/ChannelAbilityPreset.wurst index 2c6c3d44..c4980835 100644 --- a/wurst/objediting/presets/ChannelAbilityPreset.wurst +++ b/wurst/objediting/presets/ChannelAbilityPreset.wurst @@ -5,8 +5,6 @@ import public ObjectIds import public ObjectIdGenerator import OrderStringFactory import BitSet -import HashMap -import TypeCasting OrderStringFactory odf = new OrderStringFactory() @compiletime function initOdf() From 08711958be8b1532e02533c7f8008f3a2d3b4a39 Mon Sep 17 00:00:00 2001 From: Deconstruction Date: Sun, 7 Jan 2018 21:50:14 +0100 Subject: [PATCH 3/3] remove more unnecessary stuff --- wurst/objediting/presets/ChannelAbilityPreset.wurst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/wurst/objediting/presets/ChannelAbilityPreset.wurst b/wurst/objediting/presets/ChannelAbilityPreset.wurst index c4980835..141288eb 100644 --- a/wurst/objediting/presets/ChannelAbilityPreset.wurst +++ b/wurst/objediting/presets/ChannelAbilityPreset.wurst @@ -42,17 +42,12 @@ public function Targettype.toString() returns string public class ChannelAbilityPreset extends AbilityDefinitionIllidanChannel private bitset optionSet = bitset(0) private string orderString - private int id function getOrderString() returns string return orderString - function getId() returns int - return id - construct(int newId, int lvls, boolean removeChannelProperties) super(newId) - id = newId this.lvls = lvls setLevels(lvls) orderString = odf.getOrderString(true)